Fix Fx filters

Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea

4 files changed, 117 insertions, 5 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
index 9e9c57ac5..f6f308dba 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
@@ -60,7 +60,7 @@ public class FilterBasicRepresentation extends FilterRepresentation {
 
     @Override
     public boolean equals(FilterRepresentation representation) {
-        if (super.equals(representation)) {
+        if (!super.equals(representation)) {
             return false;
         }
         if (representation instanceof FilterBasicRepresentation) {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
new file mode 100644
index 000000000..b778c9398
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gallery3d.filtershow.filters;
+
+import android.graphics.Bitmap;
+import com.android.gallery3d.app.Log;
+
+public class FilterFxRepresentation extends FilterRepresentation {
+    private Bitmap mFxBitmap = null;
+    private int mBitmapResource = 0;
+    private int mNameResource = 0;
+
+    public FilterFxRepresentation(String name, int bitmapResource, int nameResource) {
+        super(name);
+        mBitmapResource = bitmapResource;
+        mNameResource = nameResource;
+        setFilterClass(ImageFilterFx.class);
+    }
+
+    public String toString() {
+        return "FilterFx: " + getName();
+    }
+
+    @Override
+    public FilterRepresentation clone() throws CloneNotSupportedException {
+        FilterFxRepresentation representation = (FilterFxRepresentation) super.clone();
+        representation.setName(getName());
+        representation.setBitmapResource(getBitmapResource());
+        representation.setNameResource(getNameResource());
+        representation.setFxBitmap(getFxBitmap());
+        return representation;
+    }
+
+    public void useParametersFrom(FilterRepresentation a) {
+        if (a instanceof FilterFxRepresentation) {
+            FilterFxRepresentation representation = (FilterFxRepresentation) a;
+            setName(representation.getName());
+            setBitmapResource(representation.getBitmapResource());
+            setNameResource(representation.getNameResource());
+            setFxBitmap(representation.getFxBitmap());
+        }
+    }
+
+    @Override
+    public boolean equals(FilterRepresentation representation) {
+        if (!super.equals(representation)) {
+            return false;
+        }
+        if (representation instanceof FilterFxRepresentation) {
+            FilterFxRepresentation fx = (FilterFxRepresentation) representation;
+            if (fx.mNameResource == mNameResource
+                    && fx.mBitmapResource == mBitmapResource) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public Bitmap getFxBitmap() {
+        return mFxBitmap;
+    }
+
+    public void setFxBitmap(Bitmap fxBitmap) {
+        mFxBitmap = fxBitmap;
+    }
+
+    public int getNameResource() {
+        return mNameResource;
+    }
+
+    public void setNameResource(int nameResource) {
+        mNameResource = nameResource;
+    }
+
+    public int getBitmapResource() {
+        return mBitmapResource;
+    }
+
+    public void setBitmapResource(int bitmapResource) {
+        mBitmapResource = bitmapResource;
+    }
+}
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index afa6ad18d..1415f14ad 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -40,6 +40,7 @@ public class FilterRepresentation implements Cloneable {
         FilterRepresentation representation = (FilterRepresentation) super.clone();
         representation.setName(getName());
         representation.setPriority(getPriority());
+        representation.setFilterClass(getFilterClass());
         Log.v(LOGTAG, "cloning from <" + this + "> to <" + representation + ">");
         return representation;
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
index f5dff5ed6..8a50ca960 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
@@ -22,6 +22,11 @@ public class ImageFilterFx extends ImageFilter {
     private static final String TAG = "ImageFilterFx";
     Bitmap fxBitmap;
     int mNameResource = 0;
+    private FilterFxRepresentation mParameters = null;
+
+    public ImageFilterFx() {
+
+    }
 
     public ImageFilterFx(Bitmap fxBitmap, String name, int nameResource) {
         setFilterType(TYPE_FX);
@@ -30,6 +35,15 @@ public class ImageFilterFx extends ImageFilter {
         mNameResource = nameResource;
     }
 
+    public void useRepresentation(FilterRepresentation representation) {
+        FilterFxRepresentation parameters = (FilterFxRepresentation) representation;
+        mParameters = parameters;
+    }
+
+    public FilterFxRepresentation getParameters() {
+        return mParameters;
+    }
+
     @Override
     public int getTextId() {
         return mNameResource;
@@ -68,16 +82,17 @@ public class ImageFilterFx extends ImageFilter {
 
     @Override
     public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
-        if (fxBitmap==null)
+        if (getParameters() == null || getParameters().getFxBitmap() ==null) {
             return bitmap;
+        }
 
         int w = bitmap.getWidth();
         int h = bitmap.getHeight();
 
-        int fxw = fxBitmap.getWidth();
-        int fxh = fxBitmap.getHeight();
+        int fxw = getParameters().getFxBitmap().getWidth();
+        int fxh = getParameters().getFxBitmap().getHeight();
 
-        nativeApplyFilter(bitmap, w, h,   fxBitmap,  fxw,  fxh);
+        nativeApplyFilter(bitmap, w, h,   getParameters().getFxBitmap(),  fxw,  fxh);
         return bitmap;
     }
 }