diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2013-07-18 16:37:30 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2013-08-01 09:46:44 -0700 |
commit | b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c (patch) | |
tree | 1033ee02b2d8f873f3ae1b00eddcc0f1c7219921 /src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java | |
parent | 8f442fae60e0154867d2a6927eb9a35bcb7014e6 (diff) | |
download | android_packages_apps_Gallery2-b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c.tar.gz android_packages_apps_Gallery2-b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c.tar.bz2 android_packages_apps_Gallery2-b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c.zip |
Refactoring Geometry handling.
Bug: 9170644
Bug: 9366654
Bug: 9366263
- Consolidates all the geometry transforms in GeometryMathUtils and
significantly reduces complexity.
- Removes GeometryMetadata object and dependent code.
- Removes ImageGeometry and geometry update callbacks.
Change-Id: I59add51907459593244c9ebaadef585efc7486d5
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java index 22a15f27e..8dcff0d16 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java @@ -21,7 +21,7 @@ import android.util.JsonWriter; import android.util.Log; import com.android.gallery3d.R; -import com.android.gallery3d.filtershow.editors.EditorFlip; +import com.android.gallery3d.filtershow.editors.EditorMirror; import java.io.IOException; @@ -30,7 +30,7 @@ public class FilterMirrorRepresentation extends FilterRepresentation { private static final String SERIALIZATION_MIRROR_VALUE = "value"; private static final String TAG = FilterMirrorRepresentation.class.getSimpleName(); - Mirror mMirror = Mirror.NONE; + Mirror mMirror; public enum Mirror { NONE('N'), VERTICAL('V'), HORIZONTAL('H'), BOTH('B'); @@ -67,7 +67,7 @@ public class FilterMirrorRepresentation extends FilterRepresentation { setFilterClass(FilterMirrorRepresentation.class); setFilterType(FilterRepresentation.TYPE_GEOMETRY); setTextId(R.string.mirror); - setEditorId(EditorFlip.ID); + setEditorId(EditorMirror.ID); setMirror(mirror); } @@ -76,7 +76,7 @@ public class FilterMirrorRepresentation extends FilterRepresentation { } public FilterMirrorRepresentation() { - this(Mirror.NONE); + this(getNil()); } @Override @@ -85,7 +85,7 @@ public class FilterMirrorRepresentation extends FilterRepresentation { return false; } FilterMirrorRepresentation mirror = (FilterMirrorRepresentation) rep; - if (mirror.mMirror.value() != mirror.mMirror.value()) { + if (mMirror != mirror.mMirror) { return false; } return true; @@ -106,6 +106,23 @@ public class FilterMirrorRepresentation extends FilterRepresentation { mMirror = mirror; } + public void cycle() { + switch (mMirror) { + case NONE: + mMirror = Mirror.HORIZONTAL; + break; + case HORIZONTAL: + mMirror = Mirror.VERTICAL; + break; + case VERTICAL: + mMirror = Mirror.BOTH; + break; + case BOTH: + mMirror = Mirror.NONE; + break; + } + } + @Override public boolean allowsSingleInstanceOnly() { return true; @@ -135,7 +152,11 @@ public class FilterMirrorRepresentation extends FilterRepresentation { @Override public boolean isNil() { - return mMirror == Mirror.NONE; + return mMirror == getNil(); + } + + public static Mirror getNil() { + return Mirror.NONE; } @Override |