Cleanup in ImagePreset

Move GeometryMetadata to the list of filters

Change-Id: I0bef13ca0d9cb41e68eddd108000ff7bd426b313

3 files changed, 14 insertions, 13 deletions

diff --git a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
index 77dbd5e7b..af18372eb 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
@@ -38,7 +38,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 
 public class GeometryMetadata extends FilterRepresentation {
-    private static final String SERIALIZATION_NAME = "GEOM";
+    public static final String SERIALIZATION_NAME = "GEOM";
     private static final String LOGTAG = "GeometryMetadata";
     private float mScaleFactor = 1.0f;
     private float mRotation = 0;
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 1b9398397..13f18dc45 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -89,7 +89,7 @@ public class ImageShow extends View implements OnGestureListener,
     InteractionMode mInteractionMode = InteractionMode.NONE;
 
     protected GeometryMetadata getGeometry() {
-        return new GeometryMetadata(getImagePreset().mGeoData);
+        return new GeometryMetadata(getImagePreset().getGeometry());
     }
 
     private FilterShowActivity mActivity = null;
@@ -161,12 +161,12 @@ public class ImageShow extends View implements OnGestureListener,
 
     public Rect getImageBounds() {
         Rect dst = new Rect();
-        getImagePreset().mGeoData.getPhotoBounds().roundOut(dst);
+        getImagePreset().getGeometry().getPhotoBounds().roundOut(dst);
         return dst;
     }
 
     public Rect getImageCropBounds() {
-        return GeometryMath.roundNearest(getImagePreset().mGeoData.getPreviewCropBounds());
+        return GeometryMath.roundNearest(getImagePreset().getGeometry().getPreviewCropBounds());
     }
 
     /* consider moving the following 2 methods into a subclass */
@@ -177,7 +177,7 @@ public class ImageShow extends View implements OnGestureListener,
      * @return Image to Screen transformation matrix
      */
     protected Matrix getImageToScreenMatrix(boolean reflectRotation) {
-        GeometryMetadata geo = getImagePreset().mGeoData;
+        GeometryMetadata geo = getImagePreset().getGeometry();
         if (geo == null || mImageLoader == null
                 || mImageLoader.getOriginalBounds() == null) {
             return new Matrix();
@@ -377,15 +377,15 @@ public class ImageShow extends View implements OnGestureListener,
             return;
         float w = image.getWidth();
         float h = image.getHeight();
-        GeometryMetadata geo = getImagePreset().mGeoData;
+        GeometryMetadata geo = getImagePreset().getGeometry();
         RectF pb = geo.getPhotoBounds();
         if (w == pb.width() && h == pb.height()) {
             return;
         }
         RectF r = new RectF(0, 0, w, h);
-        getImagePreset().mGeoData.setPhotoBounds(r);
-        getImagePreset().mGeoData.setCropBounds(r);
-
+        geo.setPhotoBounds(r);
+        geo.setCropBounds(r);
+        getImagePreset().setGeometry(geo);
     }
 
     public void updateImage() {
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 4ea944b7b..839f638c1 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -151,7 +151,7 @@ public class MasterImage implements RenderingRequestCaller {
             mHistory.addHistoryItem(mPreset);
         }
         updatePresets(true);
-        GeometryMetadata geo = mPreset.mGeoData;
+        GeometryMetadata geo = mPreset.getGeometry();
         if (!geo.equals(mPreviousGeometry)) {
             notifyGeometryChange();
         }
@@ -182,7 +182,7 @@ public class MasterImage implements RenderingRequestCaller {
         }
         float w = image.getWidth();
         float h = image.getHeight();
-        GeometryMetadata geo = mPreset.mGeoData;
+        GeometryMetadata geo = mPreset.getGeometry();
         RectF pb = geo.getPhotoBounds();
         if (w == pb.width() && h == pb.height()) {
             return;
@@ -190,6 +190,7 @@ public class MasterImage implements RenderingRequestCaller {
         RectF r = new RectF(0, 0, w, h);
         geo.setPhotoBounds(r);
         geo.setCropBounds(r);
+        mPreset.setGeometry(geo);
     }
 
     public void onHistoryItemClick(int position) {
@@ -242,7 +243,7 @@ public class MasterImage implements RenderingRequestCaller {
     }
 
     public void setOriginalGeometry(Bitmap originalBitmapLarge) {
-        GeometryMetadata geo = getPreset().mGeoData;
+        GeometryMetadata geo = getPreset().getGeometry();
         float w = originalBitmapLarge.getWidth();
         float h = originalBitmapLarge.getHeight();
         RectF r = new RectF(0, 0, w, h);
@@ -349,7 +350,7 @@ public class MasterImage implements RenderingRequestCaller {
     }
 
     private Matrix getImageToScreenMatrix(boolean reflectRotation) {
-        GeometryMetadata geo = mPreset.mGeoData;
+        GeometryMetadata geo = mPreset.getGeometry();
         if (geo == null || mLoader == null
                 || mLoader.getOriginalBounds() == null
                 || mImageShowSize.x == 0) {