diff options
3 files changed, 21 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 700828863..4354914ee 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -59,6 +59,7 @@ import android.widget.Toast; import com.android.gallery3d.R; import com.android.gallery3d.data.LocalAlbum; import com.android.gallery3d.filtershow.cache.ImageLoader; +import com.android.gallery3d.filtershow.editors.BasicEditor; import com.android.gallery3d.filtershow.editors.EditorDraw; import com.android.gallery3d.filtershow.editors.EditorManager; import com.android.gallery3d.filtershow.filters.FiltersManager; @@ -224,6 +225,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mEditorPlaceHolder.setContainer((FrameLayout) findViewById(R.id.editorContainer)); mEditorPlaceHolder.addEditor(new EditorDraw()); + mEditorPlaceHolder.addEditor(new BasicEditor()); EditorManager.addEditors(mEditorPlaceHolder); mEditorPlaceHolder.setOldViews(mImageViews); mEditorPlaceHolder.setImageLoader(mImageLoader); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java index ba49a8fcb..b7e5c2ae6 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java @@ -17,6 +17,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; +import android.util.Log; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.ui.Spline; @@ -24,7 +25,7 @@ import com.android.gallery3d.filtershow.ui.Spline; public class ImageFilterCurves extends ImageFilter { private static final String LOGTAG = "ImageFilterCurves"; - private final Spline[] mSplines = new Spline[4]; + private Spline[] mSplines = new Spline[4]; public ImageFilterCurves() { mName = "Curves"; @@ -57,8 +58,14 @@ public class ImageFilterCurves extends ImageFilter { } @Override + public boolean equals(ImageFilter filter) { + return same(filter); + } + + @Override public ImageFilter clone() throws CloneNotSupportedException { ImageFilterCurves filter = (ImageFilterCurves) super.clone(); + filter.mSplines = new Spline[4]; for (int i = 0; i < 4; i++) { if (mSplines[i] != null) { filter.setSpline(mSplines[i], i); @@ -141,6 +148,7 @@ public class ImageFilterCurves extends ImageFilter { return mSplines[splineIndex]; } + @Override public void reset() { Spline spline = new Spline(); @@ -151,4 +159,14 @@ public class ImageFilterCurves extends ImageFilter { mSplines[i] = new Spline(spline); } } + + @Override + public void useFilter(ImageFilter a) { + ImageFilterCurves c = (ImageFilterCurves) a; + for (int i = 0; i < 4; i++) { + if (c.mSplines[i] != null) { + setSpline(c.mSplines[i], i); + } + } + } } diff --git a/src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java b/src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java index 68fefa1f5..5c1d004b6 100644 --- a/src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java +++ b/src_pd/com/android/gallery3d/filtershow/editors/EditorManager.java @@ -26,7 +26,6 @@ public class EditorManager { public static void addEditors(EditorPlaceHolder editorPlaceHolder) { editorPlaceHolder.addEditor(new EditorZoom()); editorPlaceHolder.addEditor(new EditorCurves()); - editorPlaceHolder.addEditor(new BasicEditor()); editorPlaceHolder.addEditor(new EditorDraw()); } |