fix draw and curves to use FilterRepresentation

Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349

2 files changed, 22 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index 88e756ac6..ec2df6c08 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -35,6 +35,8 @@ import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 
 import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.editors.EditorCurves;
+import com.android.gallery3d.filtershow.filters.FilterCurvesRepresentation;
 import com.android.gallery3d.filtershow.filters.FiltersManager;
 import com.android.gallery3d.filtershow.filters.ImageFilterCurves;
 import com.android.gallery3d.filtershow.imageshow.ImageShow;
@@ -58,6 +60,8 @@ public class ImageCurves extends ImageShow {
     Path gHistoPath = new Path();
 
     boolean mDoingTouchMove = false;
+    private EditorCurves mEditorCurves;
+    private FilterCurvesRepresentation mFilterCurvesRepresentation;
 
     public ImageCurves(Context context) {
         super(context);
@@ -285,9 +289,11 @@ public class ImageCurves extends ImageShow {
     }
 
     public synchronized void updateCachedImage() {
-        // update image
         if (getImagePreset() != null) {
             resetImageCaches(this);
+            if (mEditorCurves != null) {
+                mEditorCurves.commitLocalRepresentation();
+            }
             invalidate();
         }
     }
@@ -392,6 +398,15 @@ public class ImageCurves extends ImageShow {
                 break;
             }
         }
+        mEditorCurves.commitLocalRepresentation();
         invalidate();
     }
+
+    public void setEditor(EditorCurves editorCurves) {
+        mEditorCurves = editorCurves;
+    }
+
+    public void setFilterDrawRepresentation(FilterCurvesRepresentation drawRep) {
+        mFilterCurvesRepresentation = drawRep;
+    }
 }
diff --git a/src/com/android/gallery3d/filtershow/ui/Spline.java b/src/com/android/gallery3d/filtershow/ui/Spline.java
index 83341772b..2cfbd807f 100644
--- a/src/com/android/gallery3d/filtershow/ui/Spline.java
+++ b/src/com/android/gallery3d/filtershow/ui/Spline.java
@@ -110,6 +110,12 @@ public class Spline {
         return true;
     }
 
+    public void reset() {
+        mPoints.clear();
+        addPoint(0.0f, 1.0f);
+        addPoint(1.0f, 0.0f);
+    }
+
     private void drawHandles(Canvas canvas, Drawable indicator, float centerX, float centerY) {
         int left = (int) centerX - mCurveHandleSize / 2;
         int top = (int) centerY - mCurveHandleSize / 2;