1 files changed, 24 insertions, 27 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
index 1ea0da700..48aa5925a 100644
--- a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
@@ -17,15 +17,15 @@
 package com.android.gallery3d.filtershow.editors;
 
 import com.android.gallery3d.R;
-import com.android.gallery3d.filtershow.filters.ImageFilter;
+import com.android.gallery3d.filtershow.filters.*;
 
 import android.content.Context;
-import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;
+import com.android.gallery3d.filtershow.presets.ImagePreset;
 
 /**
  * The basic editor that all the one parameter filters
@@ -47,8 +47,8 @@ public class BasicEditor extends Editor implements OnSeekBarChangeListener {
 
     protected BasicEditor(int id, int layoutID, int viewID) {
         super(id);
-        int mLayoutID = layoutID;
-        int mViewID = viewID;
+        mLayoutID = layoutID;
+        mViewID = viewID;
     }
 
     @Override
@@ -61,35 +61,32 @@ public class BasicEditor extends Editor implements OnSeekBarChangeListener {
 
     @Override
     public void reflectCurrentFilter() {
-        ImageFilter filter = mImageShow.getCurrentFilter();
-        if (filter == null) {
-            return;
+        super.reflectCurrentFilter();
+        if (getLocalRepresentation() != null && getLocalRepresentation() instanceof FilterBasicRepresentation) {
+            FilterBasicRepresentation interval = (FilterBasicRepresentation) getLocalRepresentation();
+            boolean f = interval.showParameterValue();
+            mSeekBar.setVisibility((f) ? View.VISIBLE : View.GONE);
+            int value = interval.getValue();
+            int min = interval.getMinimum();
+            int max = interval.getMaximum();
+            mSeekBar.setMax(max - min);
+            mSeekBar.setProgress(value - min);
         }
-        boolean f = filter.showParameterValue();
-        mSeekBar.setVisibility((f) ? View.VISIBLE : View.INVISIBLE);
-        int parameter = filter.getParameter();
-        int maxp = filter.getMaxParameter();
-        int minp = filter.getMinParameter();
-        mSeekBar.setMax(maxp - minp);
-        mSeekBar.setProgress(parameter - minp);
     }
 
     @Override
     public void onProgressChanged(SeekBar sbar, int progress, boolean arg2) {
-        ImageFilter filter = mImageShow.getCurrentFilter();
-        if (filter == null) {
-            return;
+        if (getLocalRepresentation() != null && getLocalRepresentation() instanceof FilterBasicRepresentation) {
+            FilterBasicRepresentation interval = (FilterBasicRepresentation) getLocalRepresentation();
+            int value = progress + interval.getMinimum();
+            interval.setValue(value);
+            mImageShow.onNewValue(value);
+            mView.invalidate();
+            if (interval.showParameterValue()) {
+                mPanelController.onNewValue(value);
+            }
+            commitLocalRepresentation();
         }
-        int minp = filter.getMinParameter();
-        int value = progress + minp;
-        mImageShow.onNewValue(value);
-        mView.invalidate();
-        if (filter.showParameterValue()) {
-            mPanelController.onNewValue(value);
-        }
-
-        Log.v(LOGTAG, "    #### progress=" + value);
-        MasterImage.getImage().updateBuffers();
     }
 
     @Override