diff options
author | John Hoford <hoford@google.com> | 2013-02-11 20:55:45 -0800 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-02-11 20:57:18 -0800 |
commit | 2d445b63f5d4d3204374a1955a4a679023362c96 (patch) | |
tree | f53a89f9adbfe19b5e9458c20914def253fb36fa /src | |
parent | 1d160fd11e594a7ae77ae09d9f561b02cc9030a0 (diff) | |
download | android_packages_apps_Snap-2d445b63f5d4d3204374a1955a4a679023362c96.tar.gz android_packages_apps_Snap-2d445b63f5d4d3204374a1955a4a679023362c96.tar.bz2 android_packages_apps_Snap-2d445b63f5d4d3204374a1955a4a679023362c96.zip |
fixes the draw and clean up the UI
Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
Diffstat (limited to 'src')
3 files changed, 41 insertions, 22 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDraw.java b/src/com/android/gallery3d/filtershow/editors/EditorDraw.java index ff4018501..128af8ec7 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorDraw.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorDraw.java @@ -111,11 +111,12 @@ public class EditorDraw extends Editor { showColorGrid(item); } else if (item.getItemId() == R.id.draw_menu_size) { showSizeDialog(item); - } else if (item.getItemId() == R.id.draw_menu_style_brush) { + } else if (item.getItemId() == R.id.draw_menu_style_brush_marker) { ImageDraw idraw = (ImageDraw) mImageShow; - idraw.setStyle((byte) (idraw.getStyle() + 1)); - item.setIcon(idraw.getIcon(mContext)); - popupMenu.show(); + idraw.setStyle(ImageFilterDraw.BRUSH_STYLE_MARKER); + } else if (item.getItemId() == R.id.draw_menu_style_brush_spatter) { + ImageDraw idraw = (ImageDraw) mImageShow; + idraw.setStyle(ImageFilterDraw.BRUSH_STYLE_SPATTER); } else if (item.getItemId() == R.id.draw_menu_style_line) { ImageDraw idraw = (ImageDraw) mImageShow; idraw.setStyle(ImageFilterDraw.SIMPLE_STYLE); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java index ed02c1de4..d2b5507a1 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java @@ -16,7 +16,6 @@ package com.android.gallery3d.filtershow.filters; -import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; @@ -28,10 +27,9 @@ import android.graphics.Path; import android.graphics.PathMeasure; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; +import android.util.Log; import com.android.gallery3d.R; -import com.android.gallery3d.filtershow.FilterShowActivity; -import com.android.gallery3d.filtershow.editors.EditorDraw; import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation.StrokeData; import com.android.gallery3d.filtershow.imageshow.MasterImage; @@ -40,7 +38,8 @@ import java.util.Vector; public class ImageFilterDraw extends ImageFilter { private static final String LOGTAG = "ImageFilterDraw"; public final static byte SIMPLE_STYLE = 0; - public final static byte BRUSH_STYLE = 1; + public final static byte BRUSH_STYLE_SPATTER = 1; + public final static byte BRUSH_STYLE_MARKER = 2; public final static int NUMBER_OF_STYLES = 3; Bitmap mOverlayBitmap; // this accelerates interaction int mCachedStrokes = -1; @@ -53,7 +52,10 @@ public class ImageFilterDraw extends ImageFilter { } DrawStyle[] mDrawingsTypes = new DrawStyle[] { - new SimpleDraw(), new Brush(R.drawable.brush1), new Brush(R.drawable.brush2) }; + new SimpleDraw(), + new Brush(R.drawable.brush_marker), + new Brush(R.drawable.brush_spatter) + }; { for (int i = 0; i < mDrawingsTypes.length; i++) { mDrawingsTypes[i].setType((byte) i); @@ -109,7 +111,7 @@ public class ImageFilterDraw extends ImageFilter { paint.setColor(sd.mColor); paint.setStrokeWidth(toScrMatrix.mapRadius(sd.mRadius)); - // don this way because of a bug in path.transform(matrix) + // done this way because of a bug in path.transform(matrix) Path mCacheTransPath = new Path(); mCacheTransPath.addPath(sd.mPath, toScrMatrix); @@ -118,7 +120,7 @@ public class ImageFilterDraw extends ImageFilter { } class Brush implements DrawStyle { - int mBrushID = R.drawable.brush2; + int mBrushID; Bitmap mBrush; byte mType; @@ -138,23 +140,32 @@ public class ImageFilterDraw extends ImageFilter { @Override public void paint(FilterDrawRepresentation.StrokeData sd, Canvas canvas, Matrix toScrMatrix, boolean highQuality) { - if (sd == null) { - return; - } - if (sd == null || sd.mPath == null) { return; } Paint paint = new Paint(); paint.setStyle(Style.STROKE); - - float scale = toScrMatrix.mapRadius(1); + paint.setAntiAlias(true); Path mCacheTransPath = new Path(); mCacheTransPath.addPath(sd.mPath, toScrMatrix); - draw(canvas, paint, sd.mColor, toScrMatrix.mapRadius(sd.mRadius), + draw(canvas, paint, sd.mColor, toScrMatrix.mapRadius(sd.mRadius) * 2, mCacheTransPath); } + public Bitmap createScaledBitmap(Bitmap src, int dstWidth, int dstHeight, boolean filter) + { + Matrix m = new Matrix(); + m.setScale(dstWidth / (float) src.getWidth(), dstHeight / (float) src.getHeight()); + Bitmap result = Bitmap.createBitmap(dstWidth, dstHeight, src.getConfig()); + Canvas canvas = new Canvas(result); + + Paint paint = new Paint(); + paint.setFilterBitmap(filter); + canvas.drawBitmap(src, m, paint); + + return result; + + } void draw(Canvas canvas, Paint paint, int color, float size, Path path) { PathMeasure mPathMeasure = new PathMeasure(); float[] mPosition = new float[2]; @@ -164,11 +175,15 @@ public class ImageFilterDraw extends ImageFilter { paint.setAntiAlias(true); paint.setColor(color); + paint.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY)); - Bitmap brush = Bitmap.createScaledBitmap(getBrush(), (int) size, (int) size, true); + Bitmap brush; + // done this way because of a bug in + // Bitmap.createScaledBitmap(getBrush(),(int) size,(int) size,true); + brush = createScaledBitmap(getBrush(), (int) size, (int) size, true); float len = mPathMeasure.getLength(); float s2 = size / 2; - float step = s2 / 6; + float step = s2 / 8; for (float i = 0; i < len; i += step) { mPathMeasure.getPosTan(i, mPosition, mTan); // canvas.drawCircle(pos[0], pos[1], size, paint); @@ -196,7 +211,7 @@ public class ImageFilterDraw extends ImageFilter { paint.setColor(Color.RED); paint.setStrokeWidth(40); - if (mParameters.getDrawing().isEmpty()) { + if (mParameters.getDrawing().isEmpty() && mParameters.getCurrentDrawing() == null) { return; } if (highQuality) { @@ -252,9 +267,9 @@ public class ImageFilterDraw extends ImageFilter { Matrix m = new Matrix(); m.setScale(scaleFactor, scaleFactor); - drawData(new Canvas(bitmap), m, highQuality); + return bitmap; } diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java index 65ccf1f7a..2dc0221e4 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java @@ -5,8 +5,11 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Matrix; +import android.graphics.Rect; +import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.util.AttributeSet; +import android.util.Log; import android.view.MotionEvent; import com.android.gallery3d.filtershow.editors.EditorDraw; |