diff options
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/ImageShow.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageShow.java | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index 93c4622fa..463756839 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -50,7 +50,6 @@ public class ImageShow extends View implements OnGestureListener, SliderListener, OnSeekBarChangeListener { - protected MasterImage mMasterImage = MasterImage.getImage(); private static final String LOGTAG = "ImageShow"; protected Paint mPaint = new Paint(); @@ -141,12 +140,6 @@ public class ImageShow extends View implements OnGestureListener, if (mSeekBar != null) { mSeekBar.setOnSeekBarChangeListener(this); } - if (getCurrentFilter() != null) { - int parameter = getCurrentFilter().getParameter(); - int maxp = getCurrentFilter().getMaxParameter(); - int minp = getCurrentFilter().getMinParameter(); - updateSeekBar(parameter, minp, maxp); - } } private int parameterToUI(int parameter, int minp, int maxp, int uimax) { @@ -178,11 +171,7 @@ public class ImageShow extends View implements OnGestureListener, } public void resetParameter() { - ImageFilter currentFilter = getCurrentFilter(); - if (currentFilter != null) { - updateSeekBar(currentFilter.getDefaultParameter(), - getCurrentFilter().getMinParameter(), getCurrentFilter().getMaxParameter()); - } + // TODO: implement reset } public void setPanelController(PanelController controller) { @@ -195,18 +184,8 @@ public class ImageShow extends View implements OnGestureListener, @Override public void onNewValue(int parameter) { - int maxp = ImageFilter.DEFAULT_MAX_PARAMETER; - int minp = ImageFilter.DEFAULT_MIN_PARAMETER; - if (getCurrentFilter() != null) { - if (getCurrentFilter().getParameter() == parameter) { - return; - } - getCurrentFilter().setParameter(parameter); - maxp = getCurrentFilter().getMaxParameter(); - minp = getCurrentFilter().getMinParameter(); - } if (getImagePreset() != null) { - getImagePreset().fillImageStateAdapter(mMasterImage.getState()); + getImagePreset().fillImageStateAdapter(MasterImage.getImage().getState()); } if (getPanelController() != null) { getPanelController().onNewValue(parameter); @@ -231,7 +210,7 @@ public class ImageShow extends View implements OnGestureListener, setupGestureDetector(context); mActivity = (FilterShowActivity) context; - mMasterImage.addObserver(this); + MasterImage.getImage().addObserver(this); } public ImageShow(Context context) { @@ -239,7 +218,7 @@ public class ImageShow extends View implements OnGestureListener, setupGestureDetector(context); mActivity = (FilterShowActivity) context; - mMasterImage.addObserver(this); + MasterImage.getImage().addObserver(this); } public void setupGestureDetector(Context context) { @@ -258,7 +237,7 @@ public class ImageShow extends View implements OnGestureListener, } public ImageFilter getCurrentFilter() { - return mMasterImage.getCurrentFilter(); + return MasterImage.getImage().getCurrentFilter(); } public void showToast(String text) { @@ -295,7 +274,7 @@ public class ImageShow extends View implements OnGestureListener, } public ImagePreset getImagePreset() { - return mMasterImage.getPreset(); + return MasterImage.getImage().getPreset(); } public void drawToast(Canvas canvas) { @@ -350,19 +329,19 @@ public class ImageShow extends View implements OnGestureListener, if (mImageLoader == null) { return; } - mMasterImage.updatePresets(true); + MasterImage.getImage().updatePresets(true); } public Bitmap getFiltersOnlyImage() { - return mMasterImage.getFiltersOnlyImage(); + return MasterImage.getImage().getFiltersOnlyImage(); } public Bitmap getGeometryOnlyImage() { - return mMasterImage.getGeometryOnlyImage(); + return MasterImage.getImage().getGeometryOnlyImage(); } public Bitmap getFilteredImage() { - return mMasterImage.getFilteredImage(); + return MasterImage.getImage().getFilteredImage(); } public void drawImage(Canvas canvas, Bitmap image) { @@ -427,8 +406,12 @@ public class ImageShow extends View implements OnGestureListener, paint.setTextSize(mOriginalTextSize); paint.getTextBounds(mOriginalText, 0, mOriginalText.length(), bounds); paint.setColor(Color.BLACK); - canvas.drawText(mOriginalText, mImageBounds.left + mOriginalTextMargin + 1, - mImageBounds.top + bounds.height() + mOriginalTextMargin + 1, paint); + paint.setStyle(Paint.Style.STROKE); + paint.setStrokeWidth(3); + canvas.drawText(mOriginalText, mImageBounds.left + mOriginalTextMargin, + mImageBounds.top + bounds.height() + mOriginalTextMargin, paint); + paint.setStyle(Paint.Style.FILL); + paint.setStrokeWidth(1); paint.setColor(Color.WHITE); canvas.drawText(mOriginalText, mImageBounds.left + mOriginalTextMargin, mImageBounds.top + bounds.height() + mOriginalTextMargin, paint); @@ -484,7 +467,7 @@ public class ImageShow extends View implements OnGestureListener, mImageLoader = loader; if (mImageLoader != null) { mImageLoader.addListener(this); - mMasterImage.setImageLoader(mImageLoader); + MasterImage.getImage().setImageLoader(mImageLoader); } } @@ -616,12 +599,6 @@ public class ImageShow extends View implements OnGestureListener, @Override public void onProgressChanged(SeekBar arg0, int progress, boolean arg2) { int parameter = progress; - if (getCurrentFilter() != null) { - int maxp = getCurrentFilter().getMaxParameter(); - int minp = getCurrentFilter().getMinParameter(); - parameter = uiToParameter(progress, minp, maxp, arg0.getMax()); - } - onNewValue(parameter); } |