Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterdebian/1%5.2.0Beta2.1-1

1 files changed, 78 insertions, 10 deletions

diff --git a/app/lib/demos/dmplymod.xtr b/app/lib/demos/dmplymod.xtr
index 2c66bc0..a0bf12d 100644
--- a/app/lib/demos/dmplymod.xtr
+++ b/app/lib/demos/dmplymod.xtr
@@ -17,22 +17,40 @@ DRAW 2 0 0 0 0 0.000000 0.000000 0.000000
 REDRAW
 RESET
 MESSAGE
-Polylines and Polygons (created with the <Draw> command) can be modified by dragging on their Corners or Edges.
+Polylines and polygons (created with the <Draw> command) can be modified by dragging on their corners or edges.
+
+First Left Click on the shape you want to modify.
 END
 STEP
 COMMAND Modify
 MOUSE 2 11.333 18.889
+MOUSE 4 11.333 18.889
+BIGPAUSE
+MESSAGE
+
+Then drag on the point you want to move
+END
+MOUSE 2 11.333 18.889
 MOUSE 3 18.889 19.333
 MOUSE 4 18.889 19.333
 MOUSE 2 4.000 4.444
 MOUSE 3 4.111 19.333
 MOUSE 4 4.111 19.333
+MESSAGE
+
+And finally press the Space bar to finish the change
+END
+MOUSE 8200 4.111 19.333
+STEP
+MOUSE 2 31.222 18.889
+MOUSE 4 31.222 18.889
 MOUSE 2 31.222 18.889
 MOUSE 3 38.889 19.667
 MOUSE 4 38.889 19.667
 MOUSE 2 24.222 4.667
 MOUSE 3 24.778 19.667
 MOUSE 4 24.778 19.667
+MOUSE 8200 24.778 19.667
 MESSAGE
 _________________________________________
 
@@ -40,37 +58,87 @@ If you select the middle of an Edge a new Corner is created.
 END
 STEP
 MOUSE 2 10.556 12.667
+MOUSE 4 10.556 12.667
+MOUSE 2 10.556 12.667
 MOUSE 3 4.111 4.333
 MOUSE 4 4.111 4.333
+MOUSE 8200 4.111 4.333
+MOUSE 2 31.556 12.333
+MOUSE 4 31.556 12.333
 MOUSE 2 31.556 12.333
 MOUSE 3 24.889 4.333
 MOUSE 4 24.889 4.333
+MOUSE 8200 24.889 4.333
 MESSAGE
 _________________________________________
 
-If you drag a Corner to another Corner the two are merged and the Edge between them is removed.
+To delete a corner, select and then press Delete or Backspace
 END
 STEP
-MOUSE 2 4.333 19.222
-MOUSE 3 4.000 4.444
+#MOUSE 2 4.333 19.222
+#MOUSE 4 4.333 19.222
+#MOUSE 2 4.333 19.222
+#MOUSE 3 4.000 4.444
+MOUSE 2 4.000 4.444
 MOUSE 4 4.000 4.444
-MOUSE 2 25.111 19.667
-MOUSE 3 25.111 4.444
+MOUSE 2 4.000 4.444
+MOUSE 4 4.000 4.444
+MOUSE 2056 4.000 4.444
+MOUSE 8200 4.000 4.444
+#MOUSE 2 25.111 19.667
+#MOUSE 4 25.111 19.667
+#MOUSE 2 25.111 19.667
+#MOUSE 3 25.111 4.444
+MOUSE 2 25.111 4.444
 MOUSE 4 25.111 4.444
+MOUSE 2 25.111 4.444
+MOUSE 4 25.111 4.444
+MOUSE 2056 25.111 4.444
+MOUSE 8200 25.111 4.444
 MESSAGE
 _________________________________________
 
 But you cannot have a Poly-shape with less than 3 sides.
 END
 STEP
-MOUSE 2 4.000 4.444
-MOUSE 3 18.900 4.333
+#MOUSE 2 4.000 4.444
+#MOUSE 4 4.000 4.444
+#MOUSE 2 4.000 4.444
+#MOUSE 3 18.900 4.333
+MOUSE 2 18.900 4.333
 MOUSE 4 18.900 4.333
-MOUSE 2 25.111 4.444
-MOUSE 3 39.111 4.778
+MOUSE 2 18.900 4.333
+MOUSE 4 18.900 4.333
+MOUSE 2056 18.900 4.333
+STEP
+MOUSE 8200 18.900 4.333
+#MOUSE 2 25.111 4.444
+#MOUSE 4 25.111 4.444
+#MOUSE 2 25.111 4.444
+#MOUSE 3 39.111 4.778
+MOUSE 2 39.111 4.778
+MOUSE 4 39.111 4.778
+MOUSE 2 39.111 4.778
 MOUSE 4 39.111 4.778
+MOUSE 2056 39.111 4.778
+STEP
+MOUSE 8200 39.111 4.778
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - modify polygons
+DRAW 1 0 0 0 0 0.000000 0.000000 0 0.000000
+	Y4 255 0.333333 3 0 
+		4.111000 19.333000 0
+		18.889000 19.333000 0
+		18.900000 4.333000 0
+	END
+DRAW 2 0 0 0 0 0.000000 0.000000 0 0.000000
+	F4 255 0.333333 3 0 
+		24.778000 19.667000 0
+		38.889000 19.667000 0
+		39.111000 4.778000 0
+	END
+REGRESSION END
 STEP
 CLEAR