From 2b74cb3e2fbdde0a818eca06645b4a55553e371e Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Fri, 8 Feb 2013 18:13:24 -0800 Subject: Move filter type to representations Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b --- .../filters/FilterColorBorderRepresentation.java | 2 +- .../filtershow/filters/FilterFxRepresentation.java | 1 + .../filters/FilterImageBorderRepresentation.java | 2 +- .../filtershow/filters/FilterRepresentation.java | 16 ++++++++++++++++ .../gallery3d/filtershow/filters/ImageFilter.java | 15 --------------- .../gallery3d/filtershow/filters/ImageFilterDraw.java | 2 +- .../gallery3d/filtershow/filters/ImageFilterFx.java | 19 +++---------------- .../filters/ImageFilterParametricBorder.java | 1 - .../filtershow/filters/ImageFilterTinyPlanet.java | 2 +- .../filtershow/filters/ImageFilterVignette.java | 3 +-- .../filtershow/filters/ImageFilterWBalance.java | 2 +- .../gallery3d/filtershow/presets/ImagePreset.java | 12 ++++++------ 12 files changed, 32 insertions(+), 45 deletions(-) (limited to 'src/com/android') diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java index 3ea678c44..0c0791ae4 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java @@ -27,7 +27,7 @@ public class FilterColorBorderRepresentation extends FilterRepresentation { mBorderSize = size; mBorderRadius = radius; setFilterClass(ImageFilterParametricBorder.class); - setPriority(ImageFilter.TYPE_BORDER); + setPriority(FilterRepresentation.TYPE_BORDER); } public String toString() { diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java index 5aff39df4..1234767c4 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java @@ -31,6 +31,7 @@ public class FilterFxRepresentation extends FilterRepresentation { mBitmapResource = bitmapResource; mNameResource = nameResource; setFilterClass(ImageFilterFx.class); + setFilterType(FilterRepresentation.TYPE_FX); } public String toString() { diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java index 2b40fccc0..7c9f58faa 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java @@ -23,7 +23,7 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { super("ImageBorder"); mDrawableResource = drawableResource; setFilterClass(ImageFilterBorder.class); - setPriority(ImageFilter.TYPE_BORDER); + setPriority(FilterRepresentation.TYPE_BORDER); // load the drawable at init as we are in a background thread // (see FilterShowActivity's LoadBordersTask) ImageFilterBorder filter = (ImageFilterBorder) FiltersManager.getManager().getFilter(getFilterClass()); diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index 7d9d7f923..7d162f087 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -29,6 +29,14 @@ public class FilterRepresentation implements Cloneable { private boolean mShowParameterValue; private Class mFilterClass; + 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; + public static final byte TYPE_TINYPLANET = 6; + private byte filterType = TYPE_NORMAL; + public FilterRepresentation(String name) { mName = name; } @@ -60,6 +68,14 @@ public class FilterRepresentation implements Cloneable { return mName; } + public byte getFilterType() { + return filterType; + } + + protected void setFilterType(byte type) { + filterType = type; + } + public void setName(String name) { mName = name; } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java index 5039da739..9ee62417e 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java @@ -28,21 +28,6 @@ public class ImageFilter implements Cloneable { 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; - public static final byte TYPE_TINYPLANET = 6; - private byte filterType = TYPE_NORMAL; - - public byte getFilterType() { - return filterType; - } - - protected void setFilterType(byte type) { - filterType = type; - } public int getButtonId() { return 0; diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java index 3613cb893..c1535fece 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java @@ -50,7 +50,6 @@ public class ImageFilterDraw extends ImageFilter { public ImageFilterDraw() { mName = "Image Draw"; - setFilterType(TYPE_VIGNETTE); } DrawStyle[] mDrawingsTypes = new DrawStyle[] { @@ -72,6 +71,7 @@ public class ImageFilterDraw extends ImageFilter { FilterDrawRepresentation representation = new FilterDrawRepresentation(); representation.setName("Draw"); representation.setFilterClass(ImageFilterDraw.class); + representation.setFilterType(FilterRepresentation.TYPE_VIGNETTE); return representation; } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java index ebc08f0b4..df5ec47ca 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java @@ -23,21 +23,12 @@ import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; 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); - mName = name; - this.fxBitmap = fxBitmap; - mNameResource = nameResource; - } - public void useRepresentation(FilterRepresentation representation) { FilterFxRepresentation parameters = (FilterFxRepresentation) representation; mParameters = parameters; @@ -49,14 +40,10 @@ public class ImageFilterFx extends ImageFilter { @Override public int getTextId() { - return mNameResource; - } - - public boolean isNil() { - if (fxBitmap != null) { - return false; + if (getParameters() == null) { + return 0; } - return true; + return getParameters().getNameResource(); } @Override diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java index f0fbc3172..4c185b521 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java @@ -29,7 +29,6 @@ public class ImageFilterParametricBorder extends ImageFilter { private FilterColorBorderRepresentation mParameters = null; public ImageFilterParametricBorder() { - setFilterType(TYPE_BORDER); mName = "Border"; } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java index 558af8730..535a39d1a 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java @@ -53,7 +53,6 @@ public class ImageFilterTinyPlanet extends SimpleImageFilter { "CroppedAreaTopPixels"; public ImageFilterTinyPlanet() { - setFilterType(TYPE_TINYPLANET); mName = "TinyPlanet"; } @@ -78,6 +77,7 @@ public class ImageFilterTinyPlanet extends SimpleImageFilter { FilterTinyPlanetRepresentation representation = new FilterTinyPlanetRepresentation(); representation.setName("TinyPlanet"); representation.setFilterClass(ImageFilterTinyPlanet.class); + representation.setFilterType(FilterRepresentation.TYPE_TINYPLANET); return representation; } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java index 1cc93596f..b14ee5578 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java @@ -26,7 +26,6 @@ public class ImageFilterVignette extends SimpleImageFilter { private static final String LOGTAG = "ImageFilterVignette"; public ImageFilterVignette() { - setFilterType(TYPE_VIGNETTE); mName = "Vignette"; } @@ -34,7 +33,7 @@ public class ImageFilterVignette extends SimpleImageFilter { FilterBasicRepresentation representation = (FilterBasicRepresentation) super.getDefaultRepresentation(); representation.setName("Vignette"); representation.setFilterClass(ImageFilterVignette.class); - representation.setPriority(TYPE_VIGNETTE); + representation.setPriority(FilterRepresentation.TYPE_VIGNETTE); return representation; } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java index 05f5124ae..8b6c87b84 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java @@ -24,13 +24,13 @@ public class ImageFilterWBalance extends ImageFilter { private static final String TAG = "ImageFilterWBalance"; public ImageFilterWBalance() { - setFilterType(TYPE_WBALANCE); mName = "WBalance"; } public FilterRepresentation getDefaultRepresentation() { FilterRepresentation representation = new FilterDirectRepresentation("WBalance"); representation.setFilterClass(ImageFilterWBalance.class); + representation.setFilterType(FilterRepresentation.TYPE_WBALANCE); return representation; } diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index fb58d1ff9..c7d14e80b 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -172,11 +172,11 @@ public class ImagePreset { return false; } for (FilterRepresentation representation : mFilters) { - if (representation.getPriority() == ImageFilter.TYPE_VIGNETTE + if (representation.getPriority() == FilterRepresentation.TYPE_VIGNETTE && !representation.isNil()) { return false; } - if (representation.getPriority() == ImageFilter.TYPE_TINYPLANET + if (representation.getPriority() == FilterRepresentation.TYPE_TINYPLANET && !representation.isNil()) { return false; } @@ -323,20 +323,20 @@ public class ImagePreset { public void addFilter(FilterRepresentation representation) { Log.v(LOGTAG, "*** Add Filter *** " + representation); - if (representation.getPriority() == ImageFilter.TYPE_BORDER) { + if (representation.getPriority() == FilterRepresentation.TYPE_BORDER) { setHistoryName(representation.getName()); setBorder(representation); - } else if (representation.getPriority() == ImageFilter.TYPE_FX) { + } else if (representation.getPriority() == FilterRepresentation.TYPE_FX) { boolean found = false; for (int i = 0; i < mFilters.size(); i++) { int type = mFilters.elementAt(i).getPriority(); if (found) { - if (type != ImageFilter.TYPE_VIGNETTE) { + if (type != FilterRepresentation.TYPE_VIGNETTE) { mFilters.remove(i); continue; } } - if (type == ImageFilter.TYPE_FX) { + if (type == FilterRepresentation.TYPE_FX) { mFilters.remove(i); mFilters.add(i, representation); setHistoryName(representation.getName()); -- cgit v1.2.3