diff options
-rw-r--r-- | res/layout/filtershow_activity.xml | 2 | ||||
-rw-r--r-- | res/values/filtershow_ids.xml | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java | 103 |
3 files changed, 105 insertions, 1 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 4417cf607..e42839b03 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -100,7 +100,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.imageshow.ImageRedEyes + <com.android.gallery3d.filtershow.imageshow.ImageRedEye android:id="@+id/imageRedEyes" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index a6d223b1f..786d7ee7d 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -38,5 +38,6 @@ <item type="id" name="imageCurves" /> <item type="id" name="imageZoom" /> <item type="id" name="editorDraw" /> + <item type="id" name="editorRedEye" /> <item type="id" name="imageOnlyEditor" /> </resources> diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java new file mode 100644 index 000000000..38d3a696f --- /dev/null +++ b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.gallery3d.filtershow.filters; + +import android.graphics.RectF; +import android.util.Log; + +import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.editors.EditorRedEye; + +import java.util.Vector; + +public class FilterRedEyeRepresentation extends FilterRepresentation { + private static final String LOGTAG = "FilterRedEyeRepresentation"; + private Vector<RedEyeCandidate> mCandidates = new Vector<RedEyeCandidate>(); + + public FilterRedEyeRepresentation() { + super("RedEye"); + setFilterClass(ImageFilterRedEye.class); + setFilterType(FilterRepresentation.TYPE_NORMAL); + setButtonId(R.id.redEyeButton); + setTextId(R.string.redeye); + setEditorId(EditorRedEye.ID); + } + + @Override + public FilterRepresentation clone() throws CloneNotSupportedException { + FilterRedEyeRepresentation representation = (FilterRedEyeRepresentation) super + .clone(); + representation.mCandidates = (Vector<RedEyeCandidate>) mCandidates.clone(); + return representation; + } + + public boolean hasCandidates() { + return mCandidates != null; + } + + public Vector<RedEyeCandidate> getCandidates() { + return mCandidates; + } + + public void setCandidates(Vector<RedEyeCandidate> mCandidates) { + this.mCandidates = mCandidates; + } + + public RedEyeCandidate getCandidate(int index) { + return this.mCandidates.get(index); + } + + public void addCandidate(RedEyeCandidate c) { + this.mCandidates.add(c); + } + + public void removeCandidate(RedEyeCandidate c) { + this.mCandidates.remove(c); + } + + public void clearCandidates() { + this.mCandidates.clear(); + } + + public int getNumberOfCandidates() { + if (mCandidates == null) { + return 0; + } + return mCandidates.size(); + } + + public void addRect(RectF rect, RectF bounds) { + if (!hasCandidates()) { + setCandidates(new Vector<RedEyeCandidate>()); + } + Vector<RedEyeCandidate> intersects = new Vector<RedEyeCandidate>(); + for (int i = 0; i < getCandidates().size(); i++) { + RedEyeCandidate r = getCandidate(i); + if (r.intersect(rect)) { + intersects.add(r); + } + } + for (int i = 0; i < intersects.size(); i++) { + RedEyeCandidate r = intersects.elementAt(i); + rect.union(r.mRect); + bounds.union(r.mBounds); + removeCandidate(r); + } + addCandidate(new RedEyeCandidate(rect, bounds)); + } + +} |