fix draw and curves to use FilterRepresentation

Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349

diff --git a/res/drawable-nodpi/brush1.png b/res/drawable-nodpi/brush1.png
new file mode 100644 (file)
index 0000000..6030f25
Binary files /dev/null and b/res/drawable-nodpi/brush1.png differ

diff --git a/res/drawable-nodpi/brush2.png b/res/drawable-nodpi/brush2.png
new file mode 100644 (file)
index 0000000..ae15c22
Binary files /dev/null and b/res/drawable-nodpi/brush2.png differ

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
new file mode 100644 (file)
index 0000000..d90f558
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
@@ -0,0 +1,35 @@
+package com.android.gallery3d.filtershow.filters;
+
+import com.android.gallery3d.filtershow.ui.Spline;
+
+/**
+ * TODO: Insert description here. (generated by hoford)
+ */
+public class FilterCurvesRepresentation extends FilterRepresentation {
+    private Spline[] mSplines = new Spline[4];
+    public FilterCurvesRepresentation() {
+        super("Curves");
+        for (int i = 0; i < mSplines.length; i++) {
+            mSplines[i] = new Spline();
+            mSplines[i].reset();
+        }
+    }
+
+    public void reset() {
+        Spline spline = new Spline();
+
+        spline.addPoint(0.0f, 1.0f);
+        spline.addPoint(1.0f, 0.0f);
+
+        for (int i = 0; i < 4; i++) {
+            mSplines[i] = new Spline(spline);
+        }
+    }
+
+    public void setSpline(int splineIndex, Spline s) {
+        mSplines[splineIndex] = s;
+    }
+    public Spline getSpline(int splineIndex) {
+        return mSplines[splineIndex];
+    }
+}

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
new file mode 100644 (file)
index 0000000..84e04c7
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gallery3d.filtershow.filters;
+
+import android.graphics.Path;
+
+import java.util.Vector;
+
+public class FilterDrawRepresentation extends FilterRepresentation {
+    private static final String LOGTAG = "FilterDrawRepresentation";
+
+    public static class StrokeData implements Cloneable {
+        public byte mType;
+        public Path mPath;
+        public float mRadius;
+        public int mColor;
+
+        @Override
+        public String toString() {
+            return "stroke(" + mType + ", path(" + (mPath) + "), " + mRadius + " , "
+                    + Integer.toHexString(mColor) + ")";
+        }
+        @Override
+        public StrokeData clone() throws CloneNotSupportedException {
+            return (StrokeData) super.clone();
+        }
+    }
+
+    private Vector<StrokeData> mDrawing = new Vector<StrokeData>();
+    private StrokeData mCurrent; // used in the currently drawing style
+
+    public FilterDrawRepresentation() {
+        super("Draw");
+    }
+
+    @Override
+    public String toString() {
+        return getName() + " : strokes=" + mDrawing.size()
+                + ((mCurrent == null) ? " no current " : ("current=" + mCurrent.mType));
+    }
+
+    public Vector<StrokeData> getDrawing() {
+        return mDrawing;
+    }
+
+    public StrokeData getCurrentDrawing() {
+        return mCurrent;
+    }
+
+    @Override
+    public FilterRepresentation clone() throws CloneNotSupportedException {
+        FilterDrawRepresentation representation = (FilterDrawRepresentation) super.clone();
+        return representation;
+    }
+
+    @Override
+    public void useParametersFrom(FilterRepresentation a) {
+        if (a instanceof FilterDrawRepresentation) {
+            FilterDrawRepresentation representation = (FilterDrawRepresentation) a;
+            try {
+                if (representation.mCurrent != null) {
+                    mCurrent = (StrokeData) representation.mCurrent.clone();
+                } else {
+                    mCurrent = null;
+                }
+                if (representation.mDrawing != null) {
+                    mDrawing = (Vector<StrokeData>) representation.mDrawing.clone();
+                }
+            } catch (CloneNotSupportedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    @Override
+    public boolean equals(FilterRepresentation representation) {
+        if (!super.equals(representation)) {
+            return false;
+        }
+        if (representation instanceof FilterDrawRepresentation) {
+            FilterDrawRepresentation grunge = (FilterDrawRepresentation) representation;
+                return true;
+        }
+        return false;
+    }
+
+    public void startNewSection(byte type, int color, float size, float x, float y) {
+        mCurrent = new StrokeData();
+        mCurrent.mColor = color;
+        mCurrent.mRadius = size;
+        mCurrent.mType = type;
+        mCurrent.mPath = new Path();
+        mCurrent.mPath.moveTo(x, y);
+    }
+
+    public void addPoint(float x, float y) {
+        mCurrent.mPath.lineTo(x, y);
+    }
+
+    public void endSection(float x, float y) {
+        mCurrent.mPath.lineTo(x, y);
+        mDrawing.add(mCurrent);
+        mCurrent = null;
+    }
+
+    public void clear() {
+        mCurrent = null;
+        mDrawing.clear();
+    }
+
+}