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

1 files changed, 120 insertions, 9 deletions

diff --git a/app/lib/demos/dmrescal.xtr b/app/lib/demos/dmrescal.xtr
index 6758f5d..32662b1 100644
--- a/app/lib/demos/dmrescal.xtr
+++ b/app/lib/demos/dmrescal.xtr
@@ -4,7 +4,7 @@ VERSION 10
 DEMOINIT
 ORIG 4.000 0.000 0.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"
+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
@@ -150,6 +150,7 @@ END
 STEP
 PARAMETER rescale toggle 0
 PARAMETER rescale toS 4 HO
+PARAMETER misc cmdSelectAll
 MESSAGE
 _________________________________________
 
@@ -177,4 +178,114 @@ MESSAGE
 =========================================
 END
 STEP
+REGRESSION START 10 - rescale
+STRUCTURE 1 0 0 0 0 HO 2 11.213904 9.665918 0 236.697715 "Walthers	Interstate Fuel - Loading Rack	933-32000a"
+	D 0.000000 0.000000
+	L3 0 0.000000 1.377727 0.000000 0 6.888634 0.000000 0
+	L3 0 0.000000 6.888634 0.000000 0 6.888634 5.740528 0
+	L3 0 0.000000 6.888634 5.740528 0 1.377727 5.740528 0
+	L3 0 0.000000 6.773823 0.114811 0 3.099885 0.114811 0
+	L3 0 0.000000 3.099885 0.114811 0 3.099885 1.492537 0
+	L3 0 0.000000 3.099885 1.492537 0 6.773823 1.492537 0
+	L3 0 0.000000 6.773823 1.492537 0 6.773823 0.114811 0
+	L3 0 0.000000 6.773823 5.625718 0 3.099885 5.625718 0
+	L3 0 0.000000 3.099885 5.625718 0 3.099885 4.247991 0
+	L3 0 0.000000 3.099885 4.247991 0 6.773823 4.247991 0
+	L3 0 0.000000 6.773823 4.247991 0 6.773823 5.625718 0
+	L3 0 0.000000 6.773823 2.181401 0 3.099885 2.181401 0
+	L3 0 0.000000 3.099885 2.181401 0 3.099885 3.559127 0
+	L3 0 0.000000 3.099885 3.559127 0 6.773823 3.559127 0
+	L3 0 0.000000 6.773823 3.559127 0 6.773823 2.181401 0
+	A3 0 0.000000 0.162366 5.510907 4.936854 0 0.000000 360.000000
+	A3 0 0.000000 0.162366 5.510907 2.870264 0 0.000000 360.000000
+	A3 0 0.000000 0.162366 5.510907 0.803674 0 0.000000 360.000000
+	L3 0 0.000000 1.377727 5.281286 0 0.000000 5.281286 0
+	L3 0 0.000000 0.000000 5.281286 0 0.000000 0.459242 0
+	L3 0 0.000000 0.000000 0.459242 0 1.377727 0.459242 0
+	L3 0 0.000000 2.755454 4.018370 0 0.803674 4.018370 0
+	L3 0 0.000000 0.803674 4.018370 0 0.803674 1.722158 0
+	L3 0 0.000000 0.803674 1.722158 0 2.755454 1.722158 0
+	L3 0 0.000000 2.755454 1.722158 0 2.755454 4.018370 0
+	L3 0 0.000000 1.377727 5.740528 0 1.377727 4.018370 0
+	L3 0 0.000000 1.377727 0.000000 0 1.377727 1.722158 0
+	END
+STRAIGHT 2 0 0 0 0 HO 2
+	E4 0.000000 -0.000000 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 6.255199 4.109256 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRUCTURE 3 0 0 0 0 HO 2 28.641675 11.125511 0 326.697715 "Walthers	Shady Jct Water Tower	933-3205a"
+	D 0.000000 0.000000
+	L3 0 0.000000 0.000000 0.000000 0 2.870264 0.000000 0
+	L3 0 0.000000 2.870264 0.000000 0 2.870264 2.870264 0
+	L3 0 0.000000 2.870264 2.870264 0 0.000000 2.870264 0
+	L3 0 0.000000 0.000000 2.870264 0 0.000000 0.000000 0
+	L3 0 0.000000 0.000000 0.688863 0 2.296211 0.688863 0
+	L3 0 0.000000 2.296211 0.688863 0 2.296211 2.870264 0
+	L3 0 0.000000 1.148106 1.836969 0 1.148106 0.688863 0
+	L3 0 0.000000 1.148106 1.836969 0 2.296211 1.836969 0
+	L3 0 0.000000 1.148106 1.836969 0 0.000000 1.836969 0
+	L3 0 0.000000 1.148106 1.836969 0 1.148106 2.870264 0
+	L3 0 0.000000 1.148106 1.836969 0 1.951780 2.640643 0
+	L3 0 0.000000 1.148106 1.836969 0 1.951780 1.033295 0
+	L3 0 0.000000 1.148106 1.836969 0 0.344432 1.033295 0
+	L3 0 0.000000 1.148106 1.836969 0 0.344432 2.640643 0
+	L3 0 0.000000 1.148106 2.870264 0 1.951780 2.640643 0
+	L3 0 0.000000 1.951780 2.640643 0 2.296211 1.836969 0
+	L3 0 0.000000 2.296211 1.836969 0 1.951780 1.033295 0
+	L3 0 0.000000 1.951780 1.033295 0 1.148106 0.688863 0
+	L3 0 0.000000 1.148106 0.688863 0 0.344432 1.033295 0
+	L3 0 0.000000 0.344432 1.033295 0 0.000000 1.836969 0
+	L3 0 0.000000 0.000000 1.836969 0 0.344432 2.640643 0
+	L3 0 0.000000 0.344432 2.640643 0 1.148106 2.870264 0
+	L3 0 0.000000 2.296211 2.755454 0 3.214696 2.755454 0
+	L3 0 0.000000 3.214696 2.755454 0 3.214696 1.951780 0
+	L3 0 0.000000 3.214696 1.951780 0 2.296211 1.951780 0
+	END
+STRAIGHT 4 0 0 0 0 HO 2
+	E4 40.266803 26.452646 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 14.553561 9.560735 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  5 0 0 0 0 HO 2 6.255199 4.109256 0 326.697715 "Peco-55	Medium Right	SL-E395F"
+	T4 2 6.255199 4.109256 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 14.553561 9.560735 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 15.026313 8.724001 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.648450 0.000000
+	S 0 0.000000 0.648450 0.000000 9.928817 0.000000
+	C 0 0.000000 42.500115 0.644776 -42.500115 0.004000 9.700000
+	S 0 0.000000 7.808955 -0.608037 9.864524 -0.958898
+	END
+STRAIGHT 6 0 0 0 0 HO 2
+	E4 41.487741 24.507352 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 7 24.482526 13.336042 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 7 0 0 0 0 HO 2 7.630734 38.988214 0 30.692291 0 0.000000 0.000000
+	T4 6 24.482526 13.336042 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 19.926358 10.866436 246.383715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 8 0 0 0 0 HO 2
+	T4 5 15.026313 8.724001 246.383715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 7 19.926358 10.866436 66.383715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRUCTURE 9 0 0 0 0 HO 2 30.845775 15.309239 0 326.697715 "Walthers	2-Stall Engine House	933-3204"
+	D 0.000000 0.000000
+	L3 0 0.000000 0.000000 0.000000 0 14.006889 0.000000 0
+	L3 0 0.000000 14.006889 0.000000 0 14.006889 5.970149 0
+	L3 0 0.000000 14.006889 5.970149 0 0.000000 5.970149 0
+	L3 0 0.000000 0.000000 5.970149 0 0.000000 0.000000 0
+	L3 0 0.000000 0.000000 2.985075 0 14.006889 2.985075 0
+	L3 0 0.000000 0.000000 3.673938 0 14.006889 3.673938 0
+	L3 0 0.000000 0.000000 2.296211 0 14.006889 2.296211 0
+	A3 0 0.000000 0.413955 12.169920 1.607348 0 0.000000 360.000000
+	A3 0 0.000000 0.256724 12.169920 1.607348 0 0.000000 360.000000
+	A3 0 0.000000 0.413955 1.836969 1.607348 0 0.000000 360.000000
+	A3 0 0.000000 0.256724 1.836969 1.607348 0 0.000000 360.000000
+	A3 0 0.000000 0.413955 1.836969 4.362801 0 0.000000 360.000000
+	A3 0 0.000000 0.256724 1.836969 4.362801 0 0.000000 360.000000
+	A3 0 0.000000 0.413955 12.169920 4.362801 0 0.000000 360.000000
+	A3 0 0.000000 0.256724 12.169920 4.362801 0 0.000000 360.000000
+	END
+REGRESSION END
 CLEAR