Pass the ImagePreset to ImageFilter

[android-x86/packages-apps-Camera2.git] / src / com / android / gallery3d / filtershow / filters / ImageFilter.java

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index 78a8351..256f5d6 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -1,49 +1,33 @@
+/*
+ * Copyright (C) 2012 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.R;
+import com.android.gallery3d.filtershow.editors.BasicEditor;
+import com.android.gallery3d.filtershow.presets.ImagePreset;
+
 public class ImageFilter implements Cloneable {
 
-    protected int mMaxParameter = 100;
-    protected int mMinParameter = -100;
-    protected int mDefaultParameter = 0;
-    protected int mParameter = 0;
+    private ImagePreset mImagePreset;
+
     protected String mName = "Original";
     private final String LOGTAG = "ImageFilter";
-    public static final byte TYPE_BORDER =1;
-    public static final byte TYPE_FX  = 2;
-    public static final byte TYPE_WBALANCE = 3;
-    public static final byte TYPE_VIGNETTE = 4;
-    public static final byte TYPE_NORMAL = 5;
-    private byte filterType = TYPE_NORMAL;
-
-    public byte getFilterType(){
-        return filterType;
-    }
-
-    protected void setFilterType(byte type){
-        filterType = type;
-    }
-
-    @Override
-    public ImageFilter clone() throws CloneNotSupportedException {
-        ImageFilter filter = (ImageFilter) super.clone();
-        filter.setName(getName());
-        filter.setParameter(getParameter());
-        filter.setFilterType(filterType);
-        filter.mMaxParameter = mMaxParameter;
-        filter.mMinParameter = mMinParameter;
-        filter.mDefaultParameter = mDefaultParameter;
-        return filter;
-    }
-
-    public boolean isNil() {
-        if (mParameter == mDefaultParameter) {
-            return true;
-        }
-        return false;
-    }
 
     public void setName(String name) {
         mName = name;
@@ -53,51 +37,35 @@ public class ImageFilter implements Cloneable {
         return mName;
     }
 
-    public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
+    public Bitmap apply(Bitmap bitmap, float scaleFactor, int quality) {
         // do nothing here, subclasses will implement filtering here
         return bitmap;
     }
 
-    public int getParameter() {
-        return mParameter;
-    }
-
-    public void setParameter(int value) {
-        mParameter = value;
-    }
-
     /**
-     * The maximum allowed value (inclusive)
-     * @return maximum value allowed as input to this filter
+     * Called on small bitmaps to create button icons for each filter.
+     * Override this to provide filter-specific button icons.
      */
-    public int getMaxParameter(){
-        return mMaxParameter;
+    public Bitmap iconApply(Bitmap bitmap, float scaleFactor, int quality) {
+        return apply(bitmap, scaleFactor, quality);
     }
 
-    /**
-     * The minimum allowed value (inclusive)
-     * @return minimum value allowed as input to this filter
-     */
-    public int getMinParameter(){
-        return mMinParameter;
+    public ImagePreset getImagePreset() {
+        return mImagePreset;
     }
 
-    /**
-     * Returns the default value returned by this filter.
-     * @return default value
-     */
-    public int getDefaultParameter(){
-        return mDefaultParameter;
+    public void setImagePreset(ImagePreset imagePreset) {
+        mImagePreset = imagePreset;
     }
 
-    public boolean same(ImageFilter filter) {
-        if (!filter.getName().equalsIgnoreCase(getName())) {
-            return false;
-        }
-        return true;
+    public void useRepresentation(FilterRepresentation representation) {
     }
 
     native protected void nativeApplyGradientFilter(Bitmap bitmap, int w, int h,
             int[] redGradient, int[] greenGradient, int[] blueGradient);
 
+    public FilterRepresentation getDefaultRepresentation() {
+        return null;
+    }
+
 }