From a7836003e689af28725930ba6a2c191275876577 Mon Sep 17 00:00:00 2001 From: John Hoford Date: Mon, 12 Aug 2013 17:25:02 -0700 Subject: add circle brush Change-Id: Iee5bc138599853b9c5343ae2e6f02b22ea4abe2d --- .../filtershow/filters/FilterDrawRepresentation.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java') diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java index 8a4799c1c..05a8b11bf 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java @@ -51,9 +51,16 @@ public class FilterDrawRepresentation extends FilterRepresentation { private BasicParameterInt mParamBrightness = new ParameterBrightness(PARAM_BRIGHTNESS, 220); private BasicParameterInt mParamSaturation = new ParameterSaturation(PARAM_SATURATION, 200); private ParameterOpacity mParamOpacity = new ParameterOpacity(PARAM_OPACITY, 200); - private BasicParameterStyle mParamStyle = new BasicParameterStyle(PARAM_STYLE, 3); + private BasicParameterStyle mParamStyle = new BasicParameterStyle(PARAM_STYLE, 4); int mParamMode; Parameter mCurrentParam = mParamSize; + private static final String SERIAL_COLOR = "color"; + private static final String SERIAL_RADIUS = "radius"; + private static final String SERIAL_TYPE = "type"; + private static final String SERIAL_POINTS_COUNT = "point_count"; + private static final String SERIAL_POINTS = "points"; + private static final String SERIAL_PATH = "path"; + private Parameter[] mAllParam = { mParamSize, @@ -83,7 +90,7 @@ public class FilterDrawRepresentation extends FilterRepresentation { public float mRadius; public int mColor; public int noPoints = 0; - public float []mPoints = new float [20]; + public float[] mPoints = new float[20]; @Override public String toString() { @@ -256,11 +263,6 @@ public class FilterDrawRepresentation extends FilterRepresentation { mCurrent = null; mDrawing.clear(); } - private static final String SERIAL_COLOR = "color"; - private static final String SERIAL_RADIUS = "radius"; - private static final String SERIAL_TYPE = "type"; - private static final String SERIAL_POINTS_COUNT = "point_count"; - private static final String SERIAL_POINTS = "points"; @Override public void serializeRepresentation(JsonWriter writer) throws IOException { @@ -272,7 +274,7 @@ public class FilterDrawRepresentation extends FilterRepresentation { PathMeasure mPathMeasure = new PathMeasure(); for (int i = 0; i < len; i++) { - writer.name("path" + i); + writer.name(SERIAL_PATH + i); writer.beginObject(); StrokeData mark = mDrawing.get(i); writer.name(SERIAL_COLOR).value(mark.mColor); -- cgit v1.2.3