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

1 files changed, 127 insertions, 11 deletions

diff --git a/app/lib/demos/dmdimlin.xtr b/app/lib/demos/dmdimlin.xtr
index 9668b95..904fffb 100644
--- a/app/lib/demos/dmdimlin.xtr
+++ b/app/lib/demos/dmdimlin.xtr
@@ -3,8 +3,8 @@
 VERSION 10
 DEMOINIT
 ORIG 1.000 12.000 5.000
-PARAMETER display description-fontsize 64
-STRUCTURE 1 0 0 0 0 N 2 6.210395 3.915802 0 236.697715 "Walthers	Interstate Fuel - Loading Rack	933-32000a"
+PARAMETER display description-fontsize 16
+STRUCTURE 1 0 0 0 0 DEMO 2 6.210395 3.915802 0 236.697715 "Walthers	Interstate Fuel - Loading Rack	933-32000a"
 	D 0.000000 0.000000
 	L3 0 0.000000 0.750000 0.000000 0 3.750000 0.000000 0
 	L3 0 0.000000 3.750000 0.000000 0 3.750000 3.125000 0
@@ -34,11 +34,11 @@ STRUCTURE 1 0 0 0 0 N 2 6.210395 3.915802 0 236.697715 "Walthers	Interstate Fuel
 	L3 0 0.000000 0.750000 3.125000 0 0.750000 2.187500 0
 	L3 0 0.000000 0.750000 0.000000 0 0.750000 0.937500 0
 	END
-STRAIGHT 2 0 0 0 0 N 2
+STRAIGHT 2 0 0 0 0 DEMO 2
 	E 0.105826 -1.346082 236.697715
 	T 5 3.511000 0.890894 56.697715
 	END
-STRUCTURE 3 0 0 0 0 N 2 15.697638 4.710368 0 326.697715 "Walthers	Shady Jct Water Tower	933-3205a"
+STRUCTURE 3 0 0 0 0 DEMO 2 15.697638 4.710368 0 326.697715 "Walthers	Shady Jct Water Tower	933-3205a"
 	D 0.000000 0.000000
 	L3 0 0.000000 0.000000 0.000000 0 1.562500 0.000000 0
 	L3 0 0.000000 1.562500 0.000000 0 1.562500 1.562500 0
@@ -66,11 +66,11 @@ STRUCTURE 3 0 0 0 0 N 2 15.697638 4.710368 0 326.697715 "Walthers	Shady Jct Wate
 	L3 0 0.000000 1.750000 1.500000 0 1.750000 1.062500 0
 	L3 0 0.000000 1.750000 1.062500 0 1.250000 1.062500 0
 	END
-STRAIGHT 4 0 0 0 0 N 2
+STRAIGHT 4 0 0 0 0 DEMO 2
 	E 22.026067 13.054077 56.697715
 	T 5 8.028421 3.858543 236.697715
 	END
-TURNOUT  5 0 0 0 0 N 2 3.511000 0.890894 0 326.697715 "Peco-55	Medium Right	SL-E395F"
+TURNOUT  5 0 0 0 0 DEMO 2 3.511000 0.890894 0 326.697715 "Peco-55	Medium Right	SL-E395F"
 	T 2 3.511000 0.890894 236.697715
 	T 4 8.028421 3.858543 56.697715
 	T 8 8.285775 3.403046 66.383715
@@ -82,19 +82,19 @@ TURNOUT  5 0 0 0 0 N 2 3.511000 0.890894 0 326.697715 "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 6 0 0 0 0 N 2
+STRAIGHT 6 0 0 0 0 DEMO 2
 	E 22.690715 11.995108 56.697715
 	T 7 13.433501 5.913726 236.697715
 	END
-CURVE 7 0 0 0 0 N 2 4.259807 19.878127 0 16.708116 0 0.000000 0.000000
+CURVE 7 0 0 0 0 DEMO 2 4.259807 19.878127 0 16.708116 0 0.000000 0.000000
 	T 6 13.433501 5.913726 56.697715
 	T 8 10.953237 4.569334 246.383715
 	END
-STRAIGHT 8 0 0 0 0 N 2
+STRAIGHT 8 0 0 0 0 DEMO 2
 	T 5 8.285775 3.403046 246.383715
 	T 7 10.953237 4.569334 66.383715
 	END
-STRUCTURE 9 0 0 0 0 N 2 16.897495 6.987885 0 326.697715 "Walthers	2-Stall Engine House	933-3204"
+STRUCTURE 9 0 0 0 0 DEMO 2 16.897495 6.987885 0 326.697715 "Walthers	2-Stall Engine House	933-3204"
 	D 0.000000 0.000000
 	L3 0 0.000000 0.000000 0.000000 0 7.625000 0.000000 0
 	L3 0 0.000000 7.625000 0.000000 0 7.625000 3.250000 0
@@ -135,7 +135,7 @@ _________________________________________
 We might also want to measure the distance between two structures.  In this case we will use a larger dimension line.
 END
 STEP
-PARAMETER draw arrowsize 2 Medium
+PARAMETER draw arrowsize 2 Small
 MOUSE 2 15.000 9.688
 MOUSE 4 6.375 4.000
 #PARAMETER draw arrowsize 2 Medium
@@ -161,5 +161,121 @@ RESET
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - dimension lines
+STRUCTURE 1 0 0 0 0 DEMO 2 6.210395 3.915802 0 236.697715 "Walthers	Interstate Fuel - Loading Rack	933-32000a"
+	D 0.000000 0.000000
+	L3 0 0.000000 0.750000 0.000000 0 3.750000 0.000000 0
+	L3 0 0.000000 3.750000 0.000000 0 3.750000 3.125000 0
+	L3 0 0.000000 3.750000 3.125000 0 0.750000 3.125000 0
+	L3 0 0.000000 3.687500 0.062500 0 1.687500 0.062500 0
+	L3 0 0.000000 1.687500 0.062500 0 1.687500 0.812500 0
+	L3 0 0.000000 1.687500 0.812500 0 3.687500 0.812500 0
+	L3 0 0.000000 3.687500 0.812500 0 3.687500 0.062500 0
+	L3 0 0.000000 3.687500 3.062500 0 1.687500 3.062500 0
+	L3 0 0.000000 1.687500 3.062500 0 1.687500 2.312500 0
+	L3 0 0.000000 1.687500 2.312500 0 3.687500 2.312500 0
+	L3 0 0.000000 3.687500 2.312500 0 3.687500 3.062500 0
+	L3 0 0.000000 3.687500 1.187500 0 1.687500 1.187500 0
+	L3 0 0.000000 1.687500 1.187500 0 1.687500 1.937500 0
+	L3 0 0.000000 1.687500 1.937500 0 3.687500 1.937500 0
+	L3 0 0.000000 3.687500 1.937500 0 3.687500 1.187500 0
+	A3 0 0.000000 0.088388 3.000000 2.687500 0 0.000000 360.000000
+	A3 0 0.000000 0.088388 3.000000 1.562500 0 0.000000 360.000000
+	A3 0 0.000000 0.088388 3.000000 0.437500 0 0.000000 360.000000
+	L3 0 0.000000 0.750000 2.875000 0 0.000000 2.875000 0
+	L3 0 0.000000 0.000000 2.875000 0 0.000000 0.250000 0
+	L3 0 0.000000 0.000000 0.250000 0 0.750000 0.250000 0
+	L3 0 0.000000 1.500000 2.187500 0 0.437500 2.187500 0
+	L3 0 0.000000 0.437500 2.187500 0 0.437500 0.937500 0
+	L3 0 0.000000 0.437500 0.937500 0 1.500000 0.937500 0
+	L3 0 0.000000 1.500000 0.937500 0 1.500000 2.187500 0
+	L3 0 0.000000 0.750000 3.125000 0 0.750000 2.187500 0
+	L3 0 0.000000 0.750000 0.000000 0 0.750000 0.937500 0
+	END
+STRAIGHT 2 0 0 0 0 DEMO 2
+	E4 0.105826 -1.346082 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 3.511000 0.890894 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRUCTURE 3 0 0 0 0 DEMO 2 15.697638 4.710368 0 326.697715 "Walthers	Shady Jct Water Tower	933-3205a"
+	D 0.000000 0.000000
+	L3 0 0.000000 0.000000 0.000000 0 1.562500 0.000000 0
+	L3 0 0.000000 1.562500 0.000000 0 1.562500 1.562500 0
+	L3 0 0.000000 1.562500 1.562500 0 0.000000 1.562500 0
+	L3 0 0.000000 0.000000 1.562500 0 0.000000 0.000000 0
+	L3 0 0.000000 0.000000 0.375000 0 1.250000 0.375000 0
+	L3 0 0.000000 1.250000 0.375000 0 1.250000 1.562500 0
+	L3 0 0.000000 0.625000 1.000000 0 0.625000 0.375000 0
+	L3 0 0.000000 0.625000 1.000000 0 1.250000 1.000000 0
+	L3 0 0.000000 0.625000 1.000000 0 0.000000 1.000000 0
+	L3 0 0.000000 0.625000 1.000000 0 0.625000 1.562500 0
+	L3 0 0.000000 0.625000 1.000000 0 1.062500 1.437500 0
+	L3 0 0.000000 0.625000 1.000000 0 1.062500 0.562500 0
+	L3 0 0.000000 0.625000 1.000000 0 0.187500 0.562500 0
+	L3 0 0.000000 0.625000 1.000000 0 0.187500 1.437500 0
+	L3 0 0.000000 0.625000 1.562500 0 1.062500 1.437500 0
+	L3 0 0.000000 1.062500 1.437500 0 1.250000 1.000000 0
+	L3 0 0.000000 1.250000 1.000000 0 1.062500 0.562500 0
+	L3 0 0.000000 1.062500 0.562500 0 0.625000 0.375000 0
+	L3 0 0.000000 0.625000 0.375000 0 0.187500 0.562500 0
+	L3 0 0.000000 0.187500 0.562500 0 0.000000 1.000000 0
+	L3 0 0.000000 0.000000 1.000000 0 0.187500 1.437500 0
+	L3 0 0.000000 0.187500 1.437500 0 0.625000 1.562500 0
+	L3 0 0.000000 1.250000 1.500000 0 1.750000 1.500000 0
+	L3 0 0.000000 1.750000 1.500000 0 1.750000 1.062500 0
+	L3 0 0.000000 1.750000 1.062500 0 1.250000 1.062500 0
+	END
+STRAIGHT 4 0 0 0 0 DEMO 2
+	E4 22.026067 13.054077 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 8.028421 3.858543 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  5 0 0 0 0 DEMO 2 3.511000 0.890894 0 326.697715 "Peco-55	Medium Right	SL-E395F"
+	T4 2 3.511000 0.890894 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 8.028421 3.858543 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 8.285775 3.403046 66.383715 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 6 0 0 0 0 DEMO 2
+	E4 22.690715 11.995108 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 7 13.433501 5.913726 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 7 0 0 0 0 DEMO 2 4.259807 19.878127 0 16.708116 0 0.000000 0.000000
+	T4 6 13.433501 5.913726 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 10.953237 4.569334 246.383715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 8 0 0 0 0 DEMO 2
+	T4 5 8.285775 3.403046 246.383715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 7 10.953237 4.569334 66.383715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRUCTURE 9 0 0 0 0 DEMO 2 16.897495 6.987885 0 326.697715 "Walthers	2-Stall Engine House	933-3204"
+	D 0.000000 0.000000
+	L3 0 0.000000 0.000000 0.000000 0 7.625000 0.000000 0
+	L3 0 0.000000 7.625000 0.000000 0 7.625000 3.250000 0
+	L3 0 0.000000 7.625000 3.250000 0 0.000000 3.250000 0
+	L3 0 0.000000 0.000000 3.250000 0 0.000000 0.000000 0
+	L3 0 0.000000 0.000000 1.625000 0 7.625000 1.625000 0
+	L3 0 0.000000 0.000000 2.000000 0 7.625000 2.000000 0
+	L3 0 0.000000 0.000000 1.250000 0 7.625000 1.250000 0
+	A3 0 0.000000 0.225347 6.625000 0.875000 0 0.000000 360.000000
+	A3 0 0.000000 0.139754 6.625000 0.875000 0 0.000000 360.000000
+	A3 0 0.000000 0.225347 1.000000 0.875000 0 0.000000 360.000000
+	A3 0 0.000000 0.139754 1.000000 0.875000 0 0.000000 360.000000
+	A3 0 0.000000 0.225347 1.000000 2.375000 0 0.000000 360.000000
+	A3 0 0.000000 0.139754 1.000000 2.375000 0 0.000000 360.000000
+	A3 0 0.000000 0.225347 6.625000 2.375000 0 0.000000 360.000000
+	A3 0 0.000000 0.139754 6.625000 2.375000 0 0.000000 360.000000
+	END
+DRAW 10 0 0 0 0 0.000000 0.000000 0 0.000000
+	M3 0 0.055556 13.953000 7.766000 0 14.686233 6.736689 0 0
+	END
+DRAW 11 0 0 0 0 0.000000 0.000000 0 0.000000
+	M3 0 0.055556 15.113063 9.704188 0 6.001449 3.778538 0 1
+	END
+REGRESSION END
 STEP
 CLEAR