import android.app.Dialog;
import android.content.Context;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.WindowManager;
import android.view.WindowManager.LayoutParams;
import android.widget.Button;
import android.widget.FrameLayout;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.colorpicker.ColorGridDialog;
import com.android.gallery3d.filtershow.colorpicker.RGBListener;
+import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation;
+import com.android.gallery3d.filtershow.filters.FilterRepresentation;
import com.android.gallery3d.filtershow.filters.ImageFilterDraw;
import com.android.gallery3d.filtershow.imageshow.ImageDraw;
import com.android.gallery3d.filtershow.ui.FramedTextButton;
-/**
- * TODO: Insert description here. (generated by hoford)
- */
public class EditorDraw extends Editor {
private static final String LOGTAG = "EditorDraw";
public static final int ID = R.id.editorDraw;
+ public ImageDraw mImageDraw;
public EditorDraw() {
super(ID);
@Override
public void createEditor(Context context, FrameLayout frameLayout) {
super.createEditor(context, frameLayout);
- mView = mImageShow = new ImageDraw(context);
+ mView = mImageShow = mImageDraw = new ImageDraw(context);
+ mImageDraw.setEditor(this);
+
}
@Override
}
@Override
+ public void reflectCurrentFilter() {
+ super.reflectCurrentFilter();
+ FilterRepresentation rep = getLocalRepresentation();
+
+ if (rep != null && getLocalRepresentation() instanceof FilterDrawRepresentation) {
+ FilterDrawRepresentation drawRep = (FilterDrawRepresentation) getLocalRepresentation();
+ mImageDraw.setFilterDrawRepresentation(drawRep);
+ }
+ }
+
+ @Override
public void openUtilityPanel(final LinearLayout accessoryViewList) {
View view = accessoryViewList.findViewById(R.id.drawUtilityButton);
if (view == null) {
view = inflater.inflate(R.layout.filtershow_draw_button, accessoryViewList, false);
accessoryViewList.addView(view, view.getLayoutParams());
view.setOnClickListener(new OnClickListener() {
- @Override
+
+ @Override
public void onClick(View arg0) {
showPopupMenu(accessoryViewList);
}
if (button == null) {
return;
}
- PopupMenu popupMenu = new PopupMenu(mImageShow.getActivity(), button);
+ final PopupMenu popupMenu = new PopupMenu(mImageShow.getActivity(), button);
popupMenu.getMenuInflater().inflate(R.menu.filtershow_menu_draw, popupMenu.getMenu());
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+
@Override
public boolean onMenuItemClick(MenuItem item) {
ImageFilterDraw filter = (ImageFilterDraw) mImageShow.getCurrentFilter();
showSizeDialog(item);
} else if (item.getItemId() == R.id.draw_menu_style_brush) {
ImageDraw idraw = (ImageDraw) mImageShow;
- idraw.setStyle(ImageFilterDraw.BRUSH_STYLE);
+ idraw.setStyle((byte) (idraw.getStyle() + 1));
+ item.setIcon(idraw.getIcon(mContext));
+ popupMenu.show();
} else if (item.getItemId() == R.id.draw_menu_style_line) {
ImageDraw idraw = (ImageDraw) mImageShow;
idraw.setStyle(ImageFilterDraw.SIMPLE_STYLE);
-
}
mView.invalidate();
return true;
Button button = (Button) dialog.findViewById(R.id.sizeAcceptButton);
button.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View arg0) {
int p = bar.getProgress();
ImageDraw idraw = (ImageDraw) mImageShow;
});
dialog.show();
}
+
public void showColorGrid(final MenuItem item) {
RGBListener cl = new RGBListener() {
- @Override
+ @Override
public void setColor(int rgb) {
ImageDraw idraw = (ImageDraw) mImageShow;
idraw.setColor(rgb);
cpd.show();
LayoutParams params = cpd.getWindow().getAttributes();
}
-
}
public class ImageFilterCurves extends ImageFilter {
private static final String LOGTAG = "ImageFilterCurves";
- private Spline[] mSplines = new Spline[4];
+ FilterCurvesRepresentation mParameters = new FilterCurvesRepresentation();
+
+ @Override
+ public boolean hasDefaultRepresentation() {
+ return true;
+ }
+
+ @Override
+ public FilterRepresentation getDefaultRepresentation() {
+ FilterCurvesRepresentation representation = new FilterCurvesRepresentation();
+ representation.setName("Draw");
+ representation.setFilterClass(ImageFilterCurves.class);
+ return representation;
+ }
+
+ @Override
+ public void useRepresentation(FilterRepresentation representation) {
+ FilterCurvesRepresentation parameters = (FilterCurvesRepresentation) representation;
+ mParameters = parameters;
+ }
public ImageFilterCurves() {
mName = "Curves";
@Override
public ImageFilter clone() throws CloneNotSupportedException {
ImageFilterCurves filter = (ImageFilterCurves) super.clone();
- filter.mSplines = new Spline[4];
- for (int i = 0; i < 4; i++) {
- if (mSplines[i] != null) {
- filter.setSpline(mSplines[i], i);
- }
- }
+ filter.mParameters = (FilterCurvesRepresentation) mParameters.clone();
+
return filter;
}
public boolean isNil() {
for (int i = 0; i < 4; i++) {
- if (mSplines[i] != null && !mSplines[i].isOriginal()) {
+ if (mParameters.getSpline(i) != null && !mParameters.getSpline(i).isOriginal()) {
return false;
}
}
}
ImageFilterCurves curve = (ImageFilterCurves) filter;
for (int i = 0; i < 4; i++) {
- if (mSplines[i] != curve.mSplines[i]) {
+ if (mParameters.getSpline(i) != curve.mParameters.getSpline(i)) {
return false;
}
}
}
public void populateArray(int[] array, int curveIndex) {
- Spline spline = mSplines[curveIndex];
+ Spline spline = mParameters.getSpline(curveIndex);
if (spline == null) {
return;
}
@Override
public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
- if (!mSplines[Spline.RGB].isOriginal()) {
+ if (!mParameters.getSpline(Spline.RGB).isOriginal()) {
int[] rgbGradient = new int[256];
populateArray(rgbGradient, Spline.RGB);
nativeApplyGradientFilter(bitmap, bitmap.getWidth(), bitmap.getHeight(),
}
int[] redGradient = null;
- if (!mSplines[Spline.RED].isOriginal()) {
+ if (!mParameters.getSpline(Spline.RED).isOriginal()) {
redGradient = new int[256];
populateArray(redGradient, Spline.RED);
}
int[] greenGradient = null;
- if (!mSplines[Spline.GREEN].isOriginal()) {
+ if (!mParameters.getSpline(Spline.GREEN).isOriginal()) {
greenGradient = new int[256];
populateArray(greenGradient, Spline.GREEN);
}
int[] blueGradient = null;
- if (!mSplines[Spline.BLUE].isOriginal()) {
+ if (!mParameters.getSpline(Spline.BLUE).isOriginal()) {
blueGradient = new int[256];
populateArray(blueGradient, Spline.BLUE);
}
}
public void setSpline(Spline spline, int splineIndex) {
- mSplines[splineIndex] = new Spline(spline);
+ mParameters.setSpline(splineIndex, new Spline(spline));
}
public Spline getSpline(int splineIndex) {
- return mSplines[splineIndex];
+ return mParameters.getSpline(splineIndex);
}
public void reset() {
spline.addPoint(1.0f, 0.0f);
for (int i = 0; i < 4; i++) {
- mSplines[i] = new Spline(spline);
+ mParameters.setSpline(i, new Spline(spline));
}
}
- // TODO: fix useFilter
public void useFilter(ImageFilter a) {
ImageFilterCurves c = (ImageFilterCurves) a;
for (int i = 0; i < 4; i++) {
- if (c.mSplines[i] != null) {
- setSpline(c.mSplines[i], i);
+ if (c.mParameters.getSpline(i) != null) {
+ setSpline(c.mParameters.getSpline(i), i);
}
}
}
package com.android.gallery3d.filtershow.filters;
+import android.content.Context;
import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Paint.Style;
import android.graphics.Path;
import android.graphics.PathMeasure;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
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;
-import java.util.Arrays;
+import java.util.Vector;
public class ImageFilterDraw extends ImageFilter {
private static final String LOGTAG = "ImageFilterDraw";
- public final static char SIMPLE_STYLE = 0;
- public final static char BRUSH_STYLE = 1;
+ public final static byte SIMPLE_STYLE = 0;
+ public final static byte BRUSH_STYLE = 1;
+ public final static int NUMBER_OF_STYLES = 3;
Bitmap mOverlayBitmap; // this accelerates interaction
int mCachedStrokes = -1;
int mCurrentStyle = 0;
- DrawStyle[] mDrawings = new DrawStyle[] {
- new SimpleDraw(), new Brush() };
- public void setStyle(char style) {
- mCurrentStyle = style;
+ FilterDrawRepresentation mParameters = new FilterDrawRepresentation();
+
+ public ImageFilterDraw() {
+ mName = "Image Draw";
+ setFilterType(TYPE_VIGNETTE);
}
- public static interface DrawStyle {
- public DrawStyle clone();
- public void setSize(float radius);
- public void setColor(int color);
- public void startStroke(float x, float y);
- public void stroke(float x, float y);
- public void endStroke(float x, float y);
- public int getNumberOfStrokes();
- public void clearCurren();
- public void paintCurrentStroke(Canvas canvas, Matrix toScrMatrix, boolean highQuality);
- public int paintLast(int from, Canvas canvas, Matrix toScrMatrix, boolean highQuality);
- public boolean same(DrawStyle o);
- public boolean empty();
- };
+ DrawStyle[] mDrawingsTypes = new DrawStyle[] {
+ new SimpleDraw(), new Brush(R.drawable.brush1), new Brush(R.drawable.brush2) };
+ {
+ for (int i = 0; i < mDrawingsTypes.length; i++) {
+ mDrawingsTypes[i].setType((byte) i);
+ }
- class SimpleDraw implements DrawStyle {
- private Path[] mPaths = new Path[0];
- private int[] mColors = new int[0];
- private float[] mRadius = new float[0];
- private int mStrokeCnt = 0;
+ }
- private Path mCurrentPath;
- private float mCurrentRadius;
- private int mCurrentColor;
+ @Override
+ public boolean hasDefaultRepresentation() {
+ return true;
+ }
+ @Override
+ public FilterRepresentation getDefaultRepresentation() {
+ FilterDrawRepresentation representation = new FilterDrawRepresentation();
+ representation.setName("Draw");
+ representation.setFilterClass(ImageFilterDraw.class);
+ return representation;
+ }
- @Override
- public DrawStyle clone() {
- SimpleDraw ret = new SimpleDraw();
- ret.mPaths = new Path[mPaths.length];
- for (int i = 0; i < ret.mPaths.length; i++) {
- ret.mPaths[i] = new Path(mPaths[i]);
- }
- ret.mColors = Arrays.copyOf(mColors, mColors.length);
- ret.mRadius = Arrays.copyOf(mRadius, mRadius.length);
- ret.mStrokeCnt = mStrokeCnt;
- return ret;
- }
+ @Override
+ public void useRepresentation(FilterRepresentation representation) {
+ FilterDrawRepresentation parameters = (FilterDrawRepresentation) representation;
+ mParameters = parameters;
+ }
- @Override
- public boolean empty() {
- return mStrokeCnt == -1;
- }
+ public void setStyle(byte style) {
+ mCurrentStyle = style % mDrawingsTypes.length;
+ }
- @Override
- public void setSize(float radius) {
- mCurrentRadius = radius;
- }
+ public int getStyle() {
+ return mCurrentStyle;
+ }
- @Override
- public void setColor(int color) {
- mCurrentColor = color;
- }
+ public static interface DrawStyle {
+ public void setType(byte type);
+ public void paint(FilterDrawRepresentation.StrokeData sd, Canvas canvas, Matrix toScrMatrix,
+ boolean highQuality);
+ }
- @Override
- public void startStroke(float x, float y) {
- mCurrentPath = new Path();
- mCurrentPath.moveTo(x, y);
- }
+ class SimpleDraw implements DrawStyle {
+ byte mType;
@Override
- public void stroke(float x, float y) {
- if (mCurrentPath != null) {
- mCurrentPath.lineTo(x, y);
- }
+ public void setType(byte type) {
+ mType = type;
}
@Override
- public void endStroke(float x, float y) {
- if (mCurrentPath != null) {
- mCurrentPath.lineTo(x, y);
- Path[] np = new Path[mStrokeCnt + 1];
- for (int i = 0; i < mStrokeCnt; i++) {
- np[i] = mPaths[i];
- }
- np[mStrokeCnt] = mCurrentPath;
- mColors = Arrays.copyOf(mColors, mColors.length + 1);
- mRadius = Arrays.copyOf(mRadius, mRadius.length + 1);
- mRadius[mStrokeCnt] = mCurrentRadius;
- mColors[mStrokeCnt] = mCurrentColor;
- mPaths = np;
- mStrokeCnt++;
+ public void paint(FilterDrawRepresentation.StrokeData sd, Canvas canvas, Matrix toScrMatrix,
+ boolean highQuality) {
+ if (sd == null) {
+ return;
}
- }
-
- @Override
- public void clearCurren(){
- mCurrentPath = null;
- }
-
- @Override
- public void paintCurrentStroke(Canvas canvas, Matrix toScrMatrix, boolean highQuality) {
- Path path = mCurrentPath;
- if (path == null) {
+ if (sd.mPath == null) {
return;
}
Paint paint = new Paint();
paint.setStyle(Style.STROKE);
- paint.setColor(mCurrentColor);
- paint.setStrokeWidth(toScrMatrix.mapRadius(mCurrentRadius));
+ paint.setColor(sd.mColor);
+ paint.setStrokeWidth(toScrMatrix.mapRadius(sd.mRadius));
- // don this way because a bug in path.transform(matrix)
+ // don this way because of a bug in path.transform(matrix)
Path mCacheTransPath = new Path();
- mCacheTransPath.addPath(path, toScrMatrix);
+ mCacheTransPath.addPath(sd.mPath, toScrMatrix);
canvas.drawPath(mCacheTransPath, paint);
}
-
- @Override
- public int paintLast(int from, Canvas canvas, Matrix toScrMatrix, boolean highQuality) {
- Paint paint = new Paint();
- Matrix m = new Matrix();
- canvas.save();
- canvas.concat(toScrMatrix);
- paint.setStyle(Style.STROKE);
- for (int i = from; i < mStrokeCnt; i++) {
- paint.setColor(mColors[i]);
- paint.setStrokeWidth(mRadius[i]);
- canvas.drawPath(mPaths[i], paint);
- }
- canvas.restore();
- return mStrokeCnt;
- }
-
- @Override
- public boolean same(DrawStyle o) {
- if (!(o instanceof SimpleDraw)) {
- return false;
- }
- SimpleDraw sd = (SimpleDraw) o;
- boolean same;
- same = Arrays.equals(mRadius, sd.mRadius);
- if (!same) {
- return false;
- }
- same = Arrays.equals(mColors, sd.mColors);
- if (!same) {
- return false;
- }
- for (int i = 0; i < mPaths.length; i++) {
- if (!mPaths[i].equals(sd.mPaths)) {
- return false;
- }
- }
- return true;
- }
-
- @Override
- public int getNumberOfStrokes() {
- return mStrokeCnt;
- }
}
class Brush implements DrawStyle {
- private Path[] mPaths = new Path[0];
- private int[] mColors = new int[0];
- private float[] mRadius = new float[0];
- private int mStrokeCnt = 0;
-
- private Path mCurrentPath;
- private float mCurrentRadius;
- private int mCurrentColor;
-
- @Override
- public DrawStyle clone() {
- Brush ret = new Brush();
- ret.mPaths = new Path[mPaths.length];
- for (int i = 0; i < ret.mPaths.length; i++) {
- ret.mPaths[i] = new Path(mPaths[i]);
- }
- ret.mColors = Arrays.copyOf(mColors, mColors.length);
- ret.mRadius = Arrays.copyOf(mRadius, mRadius.length);
- ret.mStrokeCnt = mStrokeCnt;
- return ret;
- }
-
- @Override
- public boolean empty() {
- return mStrokeCnt == -1;
- }
-
- @Override
- public void setSize(float radius) {
- mCurrentRadius = radius;
- }
-
- @Override
- public void setColor(int color) {
- mCurrentColor = color;
- }
-
- @Override
- public void startStroke(float x, float y) {
- mCurrentPath = new Path();
- mCurrentPath.moveTo(x, y);
- }
-
- @Override
- public void stroke(float x, float y) {
- if (mCurrentPath != null) {
- mCurrentPath.lineTo(x, y);
+ int mBrushID = R.drawable.brush2;
+ Bitmap mBrush;
+ byte mType;
+
+ public Brush(int brushID) {
+ mBrushID = brushID;
+ }
+ public Bitmap getBrush() {
+ if (mBrush == null) {
+ BitmapFactory.Options opt = new BitmapFactory.Options();
+ opt.inPreferredConfig = Bitmap.Config.ALPHA_8;
+ mBrush = MasterImage.getImage().getImageLoader().decodeImage(mBrushID, opt);
+ mBrush = mBrush.extractAlpha();
}
+ return mBrush;
}
@Override
- public void endStroke(float x, float y) {
- if (mCurrentPath != null) {
- mCurrentPath.lineTo(x, y);
- Path[] np = new Path[mStrokeCnt + 1];
- for (int i = 0; i < mStrokeCnt; i++) {
- np[i] = mPaths[i];
- }
- np[mStrokeCnt] = mCurrentPath;
- mColors = Arrays.copyOf(mColors, mColors.length + 1);
- mRadius = Arrays.copyOf(mRadius, mRadius.length + 1);
- mRadius[mStrokeCnt] = mCurrentRadius;
- mColors[mStrokeCnt] = mCurrentColor;
- mPaths = np;
- mStrokeCnt++;
- clearCurren();
+ public void paint(FilterDrawRepresentation.StrokeData sd, Canvas canvas, Matrix toScrMatrix,
+ boolean highQuality) {
+ if (sd == null) {
+ return;
}
- }
- @Override
- public void clearCurren() {
- mCurrentPath = null;
- }
-
- @Override
- public void paintCurrentStroke(Canvas canvas, Matrix toScrMatrix, boolean highQuality) {
- Path path = mCurrentPath;
- if (path == null) {
+ if (sd == null || sd.mPath == null) {
return;
}
Paint paint = new Paint();
float scale = toScrMatrix.mapRadius(1);
Path mCacheTransPath = new Path();
- mCacheTransPath.addPath(path, toScrMatrix);
- draw(canvas, paint, mCurrentColor, toScrMatrix.mapRadius(mCurrentRadius),
+ mCacheTransPath.addPath(sd.mPath, toScrMatrix);
+ draw(canvas, paint, sd.mColor, toScrMatrix.mapRadius(sd.mRadius),
mCacheTransPath);
}
- @Override
- public int paintLast(int from, Canvas canvas, Matrix toScrMatrix, boolean highQuality) {
- Paint paint = new Paint();
-
- Matrix m = new Matrix();
- canvas.save();
- canvas.concat(toScrMatrix);
- paint.setStyle(Style.STROKE);
- for (int i = from; i < mStrokeCnt; i++) {
-
- draw(canvas, paint, mColors[i], mRadius[i], mPaths[i]);
- }
- canvas.restore();
- return mStrokeCnt;
- }
-
- PathMeasure mPathMeasure = new PathMeasure();
-
void draw(Canvas canvas, Paint paint, int color, float size, Path path) {
+ PathMeasure mPathMeasure = new PathMeasure();
+ float[] mPosition = new float[2];
+ float[] mTan = new float[2];
mPathMeasure.setPath(path, false);
- float[] pos = new float[2];
- float[] tan = new float[2];
+
+ paint.setAntiAlias(true);
paint.setColor(color);
+ paint.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
+ Bitmap brush = Bitmap.createScaledBitmap(getBrush(), (int) size, (int) size, true);
float len = mPathMeasure.getLength();
- for (float i = 0; i < len; i += (size) / 2) {
- mPathMeasure.getPosTan(i, pos, tan);
- canvas.drawCircle(pos[0], pos[1], size, paint);
+ float s2 = size / 2;
+ float step = s2 / 6;
+ for (float i = 0; i < len; i += step) {
+ mPathMeasure.getPosTan(i, mPosition, mTan);
+ // canvas.drawCircle(pos[0], pos[1], size, paint);
+ canvas.drawBitmap(brush, mPosition[0] - s2, mPosition[1] - s2, paint);
}
-
- }
-
- @Override
- public boolean same(DrawStyle o) {
- if (!(o instanceof Brush)) {
- return false;
- }
- Brush sd = (Brush) o;
- boolean same;
- same = Arrays.equals(mRadius, sd.mRadius);
- if (!same) {
- return false;
- }
- same = Arrays.equals(mColors, sd.mColors);
- if (!same) {
- return false;
- }
- for (int i = 0; i < mPaths.length; i++) {
- if (!mPaths[i].equals(sd.mPaths)) {
- return false;
- }
- }
- return true;
}
@Override
- public int getNumberOfStrokes() {
- return mStrokeCnt;
+ public void setType(byte type) {
+ mType = type;
}
}
- public void startSection(int color, float size, float x, float y) {
- mDrawings[mCurrentStyle].setColor(color);
- mDrawings[mCurrentStyle].setSize(size);
- mDrawings[mCurrentStyle].startStroke(x, y);
- }
-
- public void addPoint(float x, float y) {
- mDrawings[mCurrentStyle].stroke(x, y);
- }
-
- public void endSection(float x, float y) {
- mDrawings[mCurrentStyle].endStroke(x, y);
- }
-
- public ImageFilterDraw() {
- mName = "Image Draw";
+ void paint(FilterDrawRepresentation.StrokeData sd, Canvas canvas, Matrix toScrMatrix,
+ boolean highQuality) {
+ mDrawingsTypes[sd.mType].paint(sd, canvas, toScrMatrix, highQuality);
}
public void drawData(Canvas canvas, Matrix originalRotateToScreen, boolean highQuality) {
paint.setStyle(Style.STROKE);
paint.setColor(Color.RED);
paint.setStrokeWidth(40);
- boolean empty = true;
- for (int i = 0; i < mDrawings.length; i++) {
- empty &= mDrawings[i].empty();
- }
- if (empty) {
+
+ if (mParameters.getDrawing().isEmpty()) {
return;
}
if (highQuality) {
- for (int i = 0; i < mDrawings.length; i++) {
- mDrawings[i].paintLast(0, canvas, originalRotateToScreen, highQuality);
+ for (FilterDrawRepresentation.StrokeData strokeData : mParameters.getDrawing()) {
+ paint(strokeData, canvas, originalRotateToScreen, highQuality);
}
-
return;
}
+
if (mOverlayBitmap == null ||
mOverlayBitmap.getWidth() != canvas.getWidth() ||
mOverlayBitmap.getHeight() != canvas.getHeight()) {
canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
mCachedStrokes = 0;
}
- if (mCachedStrokes < mDrawings[mCurrentStyle].getNumberOfStrokes()) {
+
+ if (mCachedStrokes < mParameters.getDrawing().size()) {
fillBuffer(originalRotateToScreen);
}
canvas.drawBitmap(mOverlayBitmap, 0, 0, paint);
+
+ StrokeData stroke = mParameters.getCurrentDrawing();
+ if (stroke != null) {
+ paint(stroke, canvas, originalRotateToScreen, highQuality);
+ }
}
public void fillBuffer(Matrix originalRotateToScreen) {
Canvas drawCache = new Canvas(mOverlayBitmap);
- for (int i = 0; i < mDrawings.length; i++) {
+ Vector<FilterDrawRepresentation.StrokeData> v = mParameters.getDrawing();
+ int n = v.size();
- mCachedStrokes = mDrawings[i].paintLast(
- mCachedStrokes, drawCache, originalRotateToScreen, false);
+ for (int i = mCachedStrokes; i < n; i++) {
+ paint(v.get(i), drawCache, originalRotateToScreen, false);
}
+ mCachedStrokes = n;
}
@Override
public ImageFilter clone() throws CloneNotSupportedException {
ImageFilterDraw filter = (ImageFilterDraw) super.clone();
- filter.mDrawings = mDrawings.clone();
+ filter.mDrawingsTypes = mDrawingsTypes.clone();
return filter;
}
public boolean isNil() {
- for (int i = 0; i < mDrawings.length; i++) {
- if (mDrawings[i].getNumberOfStrokes() != 0) {
- return false;
- }
- }
- return true;
+ return mParameters.getDrawing().isEmpty();
}
@Override
}
ImageFilterDraw dfilter = (ImageFilterDraw) filter;
- boolean same = true;
- for (int i = 0; i < mDrawings.length; i++) {
- same &= mDrawings[i].same(dfilter.mDrawings[i]);
- }
- return same;
- }
-
- public void clear() {
- mDrawings[mCurrentStyle].clearCurren();
+ return mParameters.getDrawing().equals(dfilter.mParameters.getDrawing());
}
public void draw(Canvas canvas, Matrix originalRotateToScreen) {
- for (int i = 0; i < mDrawings.length; i++) {
- mDrawings[i].paintCurrentStroke(canvas, originalRotateToScreen, false);
+ for (FilterDrawRepresentation.StrokeData strokeData : mParameters.getDrawing()) {
+ paint(strokeData, canvas, originalRotateToScreen, false);
}
+ mDrawingsTypes[mCurrentStyle].paint(null, canvas, originalRotateToScreen, false);
}
@Override
return bitmap;
}
+
}
OSDN Git Service
