New upstream version 5.2.0Beta2.1upstream/5.2.0Beta2.1

1 files changed, 104 insertions, 28 deletions

diff --git a/app/lib/demos/dmlines.xtr b/app/lib/demos/dmlines.xtr
index c37246c..9f2b66f 100644
--- a/app/lib/demos/dmlines.xtr
+++ b/app/lib/demos/dmlines.xtr
@@ -1,6 +1,6 @@
 VERSION 2
 DEMOINIT
-ORIG 4.000 0.000 0.000
+ORIG 2.000 0.000 0.000
 PARAMETER display labelenable 4
 STRAIGHT 1 DEMO 1
 	E 0.051703 4.160000 270.000000
@@ -47,37 +47,46 @@ MESSAGE
 _________________________________________
 
 Lines are drawn by clicking at the starting postion and dragging to the final position.
+
+By default, the new line will snap to existing objects.  Hold down the <Ctrl> and <Alt> keys to prevent this from happening.
 END
 STEP
+KEYSTATE 12
 MOUSE 2 0.533 4.693
+KEYSTATE 12
 MOUSE 3 4.320 4.693
+KEYSTATE 12
 MOUSE 4 4.320 4.693
+KEYSTATE 12
 MOUSE 2 4.373 4.693
+KEYSTATE 12
 MOUSE 3 4.533 5.120
+KEYSTATE 12
 MOUSE 4 4.533 5.120
-MOUSE 2 0.267 5.120
-MOUSE 3 0.587 4.747
-MOUSE 4 0.587 4.747
+KEYSTATE 12
+MOUSE 2 0.533 4.693
+KEYSTATE 12
+MOUSE 3 0.533 4.693
+KEYSTATE 12
+MOUSE 4 0.267 5.120
+KEYSTATE 12
 MOUSE 2 0.267 3.253
+KEYSTATE 12
 MOUSE 3 0.533 3.787
+KEYSTATE 12
 MOUSE 4 0.533 3.787
-MESSAGE
-_________________________________________
-
-Drawing lines with the Shift key held down will use the previous line End-Point as the starting position.  This makes it easy to draw connected lines.
-END
 STEP
-KEYSTATE 2
-MOUSE 2 3.520 3.680
-KEYSTATE 2
+KEYSTATE 12
+MOUSE 2 0.533 3.787
+KEYSTATE 12
 MOUSE 3 4.320 3.787
-KEYSTATE 2
+KEYSTATE 12
 MOUSE 4 4.320 3.787
-KEYSTATE 2
-MOUSE 2 4.533 3.307
-KEYSTATE 2
+KEYSTATE 12
+MOUSE 2 4.320 3.787
+KEYSTATE 12
 MOUSE 3 4.533 3.307
-KEYSTATE 2
+KEYSTATE 12
 MOUSE 4 4.533 3.307
 MESSAGE
 _________________________________________
@@ -85,25 +94,17 @@ _________________________________________
 You also draw in various colors and line widths.
 END
 PARAMETER draw linecolor 255
-PARAMETER draw linewidth 2
+PARAMETER draw linewidth 6
 STEP
 MOUSE 2 0.747 4.800
 MOUSE 4 0.693 6.560
-KEYSTATE 2
 MOUSE 2 0.693 6.560
-KEYSTATE 2
 MOUSE 4 1.493 7.573
-KEYSTATE 2
 MOUSE 2 1.547 7.573
-KEYSTATE 2
 MOUSE 4 3.147 7.467
-KEYSTATE 2
-MOUSE 2 3.787 6.773
-KEYSTATE 2
+MOUSE 2 3.147 7.467
 MOUSE 4 4.213 5.813
-KEYSTATE 2
-MOUSE 2 4.107 5.173
-KEYSTATE 2
+MOUSE 2 4.207 5.800
 MOUSE 4 4.107 4.693
 MESSAGE
 _________________________________________
@@ -114,6 +115,7 @@ Here we will draw a Curve by dragging from one End-Point to the other to define
 END
 STEP
 COMMAND DrawCurveChord
+KEYSTATE 12
 MOUSE 2 0.800 3.680
 #MOUSE 3 0.800 3.573
 #MOUSE 3 0.853 3.467
@@ -172,9 +174,12 @@ MOUSE 2 0.800 3.680
 #MOUSE 3 3.947 3.680
 #MOUSE 3 3.947 3.733
 #MOUSE 3 3.947 3.787
+KEYSTATE 12
 MOUSE 4 4.107 3.787
 BIGPAUSE
+KEYSTATE 12
 MOUSE 2 2.9 3.78
+KEYSTATE 12
 MOUSE 4 2.9 1.5
 MESSAGE
 _________________________________________
@@ -207,17 +212,88 @@ MOUSE 2 11.307 6.400
 MOUSE 4 11.307 6.400
 #BIGPAUSE
 #PARAMETER misc cmdDelete
+KEYSTATE 4
 MOUSE 2 4.160 5.493
+KEYSTATE 4
 MOUSE 4 4.160 5.493
 #BIGPAUSE
 #PARAMETER misc cmdDelete
+KEYSTATE 4
 MOUSE 2 3.467 6.933
+KEYSTATE 4
 MOUSE 4 3.467 6.933
 BIGPAUSE
 PARAMETER misc cmdDelete
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - lines
+STRAIGHT 1 0 0 0 0 DEMO 2
+	E4 0.051703 4.160000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 2 4.533333 4.160000 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  2 0 0 0 0 DEMO 2 4.533333 4.160000 0 0.000000 "Peco-55	Medium Left	SL-E395F"
+	T4 1 4.533333 4.160000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 9.938333 4.160000 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 6 9.903333 3.638000 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	S 0 0.000000 0.000000 0.000000 0.353000 0.000000
+	S 0 0.000000 0.353000 0.000000 5.405000 0.000000
+	C 0 0.000000 23.136000 0.351000 -23.136000 0.004000 9.700000
+	S 0 0.000000 4.251000 -0.331000 5.370000 -0.522000
+	END
+STRAIGHT 3 0 0 0 0 DEMO 2
+	E4 31.466667 4.160000 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 2 9.938333 4.160000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 4 0 0 0 0 DEMO 2
+	E4 31.466667 2.660000 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 16.693333 2.660000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 5 0 0 0 0 DEMO 2 16.693333 15.171003 0 12.511003 0 0.000000 0.000000
+	T4 4 16.693333 2.660000 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 6 14.588376 2.838349 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 6 0 0 0 0 DEMO 2
+	T4 2 9.903333 3.638000 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 14.588376 2.838349 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+DRAW 7 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 0.533000 4.693000 0 4.320000 4.693000 0
+	END
+DRAW 8 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 4.373000 4.693000 0 4.533000 5.120000 0
+	END
+DRAW 9 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 0.533000 4.693000 0 0.267000 5.120000 0
+	END
+DRAW 10 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 0.267000 3.253000 0 0.533000 3.787000 0
+	END
+DRAW 11 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 0.533000 3.787000 0 4.320000 3.787000 0
+	END
+DRAW 12 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 4.320000 3.787000 0 4.533000 3.307000 0
+	END
+DRAW 13 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 255 0.083333 0.747000 4.693000 0 0.693000 6.560000 0
+	END
+DRAW 14 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 255 0.083333 0.693000 6.560000 0 1.493000 7.573000 0
+	END
+DRAW 15 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 255 0.083333 1.493000 7.573000 0 3.147000 7.467000 0
+	END
+DRAW 18 0 0 0 0 0.000000 0.000000 0 0.000000
+	A3 255 0.083333 1.732465 2.470132 3.219463 0 70.877480 214.538653
+	END
+DRAW 20 0 0 0 0 0.000000 0.000000 0 0.000000
+	A3 8421376 0.083333 1.288417 8.533000 5.920000 0 0.000000 360.000000
+	END
+REGRESSION END
 STEP
 CLEAR
 RESET