1 files changed, 32 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
index 1cb2645c7..e41f0a622 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -17,6 +17,10 @@
 package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Path;
+import android.util.Log;
+
+import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.editors.EditorDraw;
 
 import java.util.Vector;
 
@@ -28,7 +32,7 @@ public class FilterDrawRepresentation extends FilterRepresentation {
         public Path mPath;
         public float mRadius;
         public int mColor;
-
+        public int noPoints = 0;
         @Override
         public String toString() {
             return "stroke(" + mType + ", path(" + (mPath) + "), " + mRadius + " , "
@@ -45,12 +49,18 @@ public class FilterDrawRepresentation extends FilterRepresentation {
 
     public FilterDrawRepresentation() {
         super("Draw");
+        setFilterClass(ImageFilterDraw.class);
+        setPriority(FilterRepresentation.TYPE_VIGNETTE);
+        setTextId(R.string.imageDraw);
+        setButtonId(R.id.drawOnImageButton);
+        setEditorId(EditorDraw.ID);
     }
 
     @Override
     public String toString() {
         return getName() + " : strokes=" + mDrawing.size()
-                + ((mCurrent == null) ? " no current " : ("current=" + mCurrent.mType));
+                + ((mCurrent == null) ? " no current "
+                        : ("draw=" + mCurrent.mType + " " + mCurrent.noPoints));
     }
 
     public Vector<StrokeData> getDrawing() {
@@ -84,10 +94,15 @@ public class FilterDrawRepresentation extends FilterRepresentation {
                 }
                 if (representation.mDrawing != null) {
                     mDrawing = (Vector<StrokeData>) representation.mDrawing.clone();
+                } else {
+                    mDrawing = null;
                 }
+
             } catch (CloneNotSupportedException e) {
                 e.printStackTrace();
             }
+        } else {
+            Log.v(LOGTAG, "cannot use parameters from " + a);
         }
     }
 
@@ -97,8 +112,18 @@ public class FilterDrawRepresentation extends FilterRepresentation {
             return false;
         }
         if (representation instanceof FilterDrawRepresentation) {
-            // FIXME!
-            return true;
+            FilterDrawRepresentation fdRep = (FilterDrawRepresentation) representation;
+            if (fdRep.mDrawing.size() != mDrawing.size())
+                return false;
+            if (fdRep.mCurrent == null && mCurrent.mPath == null) {
+                return true;
+            }
+            if (fdRep.mCurrent != null && mCurrent.mPath != null) {
+                if (fdRep.mCurrent.noPoints == mCurrent.noPoints) {
+                    return true;
+                }
+                return false;
+            }
         }
         return false;
     }
@@ -110,14 +135,17 @@ public class FilterDrawRepresentation extends FilterRepresentation {
         mCurrent.mType = type;
         mCurrent.mPath = new Path();
         mCurrent.mPath.moveTo(x, y);
+        mCurrent.noPoints = 0;
     }
 
     public void addPoint(float x, float y) {
+        mCurrent.noPoints++;
         mCurrent.mPath.lineTo(x, y);
     }
 
     public void endSection(float x, float y) {
         mCurrent.mPath.lineTo(x, y);
+        mCurrent.noPoints++;
         mDrawing.add(mCurrent);
         mCurrent = null;
     }