diff options
author | John Hoford <google.com> | 2013-01-25 13:28:34 -0800 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-01-30 18:57:44 -0800 |
commit | 9beac537774310fc435bc513ba25a8230b14f0e4 (patch) | |
tree | 9cede5c32d88e18916c82f59af90756fb1789d7c /src/com/android/gallery3d/filtershow/imageshow | |
parent | d08e8639ce9a0088a34d6fb9630e4fb8b4f9e035 (diff) | |
download | android_packages_apps_Snap-9beac537774310fc435bc513ba25a8230b14f0e4.tar.gz android_packages_apps_Snap-9beac537774310fc435bc513ba25a8230b14f0e4.tar.bz2 android_packages_apps_Snap-9beac537774310fc435bc513ba25a8230b14f0e4.zip |
add color selection ui to draw
Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java index 16c2422c2..16076fde9 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java @@ -18,6 +18,9 @@ import com.android.gallery3d.filtershow.filters.RedEyeCandidate; public class ImageDraw extends ImageShow { private static final String LOGTAG = "ImageDraw"; + private int mCurrentColor = Color.RED; + final static float INITAL_STROKE_RADIUS = 40; + private float mCurrentSize = INITAL_STROKE_RADIUS; public ImageDraw(Context context, AttributeSet attrs) { super(context, attrs); @@ -33,8 +36,23 @@ public class ImageDraw extends ImageShow { if (filter != null) { filter.clear(); } + } - invalidate(); + public void setColor(int color) { + mCurrentColor = color; + } + + public void setSize(int size) { + mCurrentSize = size; + } + + public void setStyle(char style) { + ImageFilterDraw filter = (ImageFilterDraw) getCurrentFilter(); + filter.setStyle(style); + } + + public int getSize() { + return (int) mCurrentSize; } @Override @@ -57,12 +75,7 @@ public class ImageDraw extends ImageShow { mTmpPoint[0] = event.getX(); mTmpPoint[1] = event.getY(); mToOrig.mapPoints(mTmpPoint); - float[] hsv = new float[3]; - hsv[0] = (float) (360 * Math.random()); - hsv[1] = 1; - hsv[2] = 1; - int col = Color.HSVToColor(0x88, hsv); - filter.startSection(col, mTmpPoint[0], mTmpPoint[1]); + filter.startSection(mCurrentColor, mCurrentSize, mTmpPoint[0], mTmpPoint[1]); } if (event.getAction() == MotionEvent.ACTION_MOVE) { @@ -109,10 +122,11 @@ public class ImageDraw extends ImageShow { @Override public void onDraw(Canvas canvas) { super.onDraw(canvas); - - calcScreenMapping(); - ImageFilterDraw filter = (ImageFilterDraw) getCurrentFilter(); - filter.draw(canvas, mRotateToScreen); + if (filter != null) { + calcScreenMapping(); + filter.draw(canvas, mRotateToScreen); + } } + } |