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

1 files changed, 137 insertions, 12 deletions

diff --git a/app/lib/demos/dmlines2.xtr b/app/lib/demos/dmlines2.xtr
index 11837ae..13f43b3 100644
--- a/app/lib/demos/dmlines2.xtr
+++ b/app/lib/demos/dmlines2.xtr
@@ -1,13 +1,13 @@
 VERSION 7
 DEMOINIT
-ORIG 4.000 0.000 0.000
+ORIG 2.000 0.000 2.000
 PARAMETER display labelenable 4
 PARAMETER display description-fontsize 24
-STRAIGHT 1 0 0 0 0 DEMO -1
+STRAIGHT 1 0 0 0 0 DEMO 2
 	E 0.051703 4.160000 270.000000
 	T 2 4.533333 4.160000 90.000000
 	END
-TURNOUT  2 0 0 0 0 DEMO -1 4.533333 4.160000 0.000000 "Peco-55	Medium Right	SL-E395F"
+TURNOUT  2 0 0 0 0 DEMO 2 4.533333 4.160000 0.000000 "Peco-55	Medium Right	SL-E395F"
 	T 1 4.533333 4.160000 270.000000
 	T 3 9.938333 4.160000 90.000000
 	T 6 9.903333 3.638000 99.686000
@@ -19,19 +19,19 @@ TURNOUT  2 0 0 0 0 DEMO -1 4.533333 4.160000 0.000000 "Peco-55	Medium Right	SL-E
 	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 -1
+STRAIGHT 3 0 0 0 0 DEMO 2
 	E 31.466667 4.160000 90.000000
 	T 2 9.938333 4.160000 270.000000
 	END
-STRAIGHT 4 0 0 0 0 DEMO -1
+STRAIGHT 4 0 0 0 0 DEMO 2
 	E 31.466667 2.660000 90.000000
 	T 5 16.693333 2.660000 270.000000
 	END
-CURVE 5 0 0 0 0 DEMO -1 16.693333 15.171003 12.511003
+CURVE 5 0 0 0 0 DEMO 2 16.693333 15.171003 12.511003
 	T 4 16.693333 2.660000 90.000000
 	T 6 14.588376 2.838349 279.686000
 	END
-STRAIGHT 6 0 0 0 0 DEMO -1
+STRAIGHT 6 0 0 0 0 DEMO 2
 	T 2 9.903333 3.638000 279.686000
 	T 5 14.588376 2.838349 99.686000
 	END
@@ -132,9 +132,9 @@ MOUSE 8200 0.316 8.842
 MESSAGE
 _________________________________________
 
-A Polygon is drawn in the same way
+A filled Polygon is drawn in the same way.
 END
-COMMAND DrawPolygon
+COMMAND DrawFilledPolygon
 PARAMETER draw linecolor 65280
 STEP
 MOUSE 2 0.579 6.211
@@ -147,14 +147,20 @@ MOUSE 2 4.053 6.684
 MOUSE 4 4.053 6.684
 MOUSE 2 4.263 5.000
 MOUSE 4 4.263 5.000
-MOUSE 2 4.474 5.211
-MOUSE 4 4.474 5.211
+MOUSE 2 4.494 5.211
+MOUSE 4 4.494 5.211
 MOUSE 2 6.053 5.211
 MOUSE 4 6.053 5.211
 MOUSE 2 5.789 8.737
 MOUSE 4 5.789 8.737
 MOUSE 2 0.421 8.684
 MOUSE 4 0.421 8.684
+MESSAGE
+_________________________________________
+
+When you are finished, press the <Space> key to complete the polygon.
+END
+STEP
 MOUSE 8200 0.421 8.684
 MESSAGE
 _________________________________________
@@ -178,7 +184,7 @@ _________________________________________
 
 Filled Boxes and Circles work the same as line Boxes and Circles.
 END
-COMMAND DrawFilledCircleCenter
+COMMAND DrawFilledCircleTangent
 PARAMETER draw linecolor 16776960
 BIGPAUSE
 MOUSE 2 7.360 6.45333
@@ -193,5 +199,124 @@ RESET
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - lines2
+DRAW 24 0 0 0 0 0.000000 0.000000 0 0.000000
+	Y4 32768 0.000000 9 2 
+		0.640000 6.070000 0
+		1.170000 7.250000 0
+		2.710000 7.610000 0
+		4.040000 6.570000 0
+		4.250000 4.770000 0
+		4.560000 5.210000 0
+		5.920000 5.210000 0
+		5.920000 8.840000 0
+		0.316000 8.842000 0
+	END
+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 Right	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.533333 4.693333 0 4.320000 4.693333 0
+	END
+DRAW 8 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 4.373333 4.693333 0 4.533333 5.120000 0
+	END
+DRAW 9 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 0.266667 5.120000 0 0.586667 4.746667 0
+	END
+DRAW 10 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 0.266667 3.253333 0 0.533333 3.786667 0
+	END
+DRAW 11 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 0.533333 3.786667 0 4.320000 3.786667 0
+	END
+DRAW 12 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 0 0.000000 4.320000 3.786667 0 4.533333 3.306667 0
+	END
+DRAW 13 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 255 0.106667 0.746667 4.800000 0 0.746667 6.080000 0
+	END
+DRAW 14 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 255 0.106667 0.746667 6.080000 0 1.226667 7.200000 0
+	END
+DRAW 15 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 255 0.106667 1.226667 7.200000 0 2.720000 7.520000 0
+	END
+DRAW 16 0 0 0 0 0.000000 0.000000 0 0.000000
+	A3 255 0.106667 1.581026 2.368375 3.879611 0 93.370222 169.376584
+	END
+DRAW 17 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 8421376 0.106667 11.413333 4.960000 0 20.106667 4.960000 0
+	END
+DRAW 18 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 8421376 0.106667 20.106667 4.960000 0 20.106667 7.680000 0
+	END
+DRAW 19 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 8421376 0.106667 20.106667 7.680000 0 11.413333 7.680000 0
+	END
+DRAW 20 0 0 0 0 0.000000 0.000000 0 0.000000
+	A3 8421376 0.106667 0.812349 7.360000 6.453333 0 0.000000 360.000000
+	END
+DRAW 21 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 255 0.105263 2.736842 7.473684 0 3.947368 6.526316 0
+	END
+DRAW 22 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 255 0.105263 3.947368 6.526316 0 4.157895 4.684211 0
+	END
+DRAW 23 0 0 0 0 0.000000 0.000000 0 0.000000
+	L3 8421376 0.105263 11.473684 7.736842 0 11.473684 5.000000 0
+	END
+DRAW 25 0 0 0 0 0.000000 0.000000 0 0.000000
+	F4 65280 0.000000 9 0 
+		0.579000 6.211000 0
+		1.211000 7.421000 0
+		2.684000 7.789000 0
+		4.053000 6.684000 0
+		4.263000 5.000000 0
+		4.494000 5.211000 0
+		6.053000 5.211000 0
+		5.789000 8.737000 0
+		0.554570 8.685319 0
+	END
+DRAW 26 0 0 0 0 0.000000 0.000000 0 0.000000
+	G3 16776960 0.000000 0.737930 7.360000 6.453330 0
+	END
+DRAW 27 0 0 0 0 0.000000 0.000000 0 0.000000
+	F4 16776960 0.000000 4 1 
+		11.530000 7.630000 0
+		20.000000 7.630000 0
+		20.000000 5.030000 0
+		11.530000 5.030000 0
+	END
+REGRESSION END
 STEP
 CLEAR