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

1 files changed, 96 insertions, 3 deletions

diff --git a/app/lib/demos/dmtosel.xtr b/app/lib/demos/dmtosel.xtr
index 953d43b..df3d067 100644
--- a/app/lib/demos/dmtosel.xtr
+++ b/app/lib/demos/dmtosel.xtr
@@ -1,6 +1,6 @@
 VERSION 2
 DEMOINIT
-ORIG 8.000 0.000 0.000
+ORIG 4.000 0.000 0.000
 PARAMETER turnout hide 1
 STRAIGHT 1 DEMO 1
 	E 2.050000 1.050000 270.000000
@@ -90,6 +90,7 @@ Then you can rotate the turnout by Right dragging.
 You can also use Shift-Right-Click to display a popup menu that lets you rotate the Turnout by specific angles.
 END
 STEP
+MOUSE 1 13.250 8.500
 MOUSE 5 13.250 8.500
 PAUSE 390
 MOUSE 6 13.250 8.583
@@ -137,7 +138,7 @@ _________________________________________
 
 When you are satisfied with the position and orientation of the turnout press Space bar or the Return key on the keyboard to finish placing the turnout.
 
-Pressing the Ok button on the Turnout dialog will end the <Turnout> command as well as placing the turnout.
+Pressing the Close button on the Turnout dialog will end the <Turnout> command as well as placing the turnout.
 END
 STEP
 MOUSE 3336 10.500 10.250
@@ -145,6 +146,44 @@ MOUSE 3336 10.500 10.250
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - turnout select 1
+STRAIGHT 1 0 0 0 0 DEMO 2
+	E4 2.050000 1.050000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 14.883333 1.050017 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 2 0 0 0 0 DEMO 2 20.993080 13.050025 0 12.000000 0 0.000000 0.000000
+	E4 32.991545 13.241946 359.083680 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 20.993048 1.050025 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  3 0 0 0 0 DEMO 2 14.883333 1.050017 0 0.000000 "Peco-55	Medium Left	SL-E396F"
+	T4 1 14.883333 1.050017 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 20.288333 1.050017 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 20.253333 1.572017 80.314000 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 170.297000 9.700000
+	S 0 0.000000 4.251000 0.331000 5.370000 0.522000
+	END
+STRAIGHT 4 0 0 0 0 DEMO 2
+	T4 2 20.993080 1.050025 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 20.288333 1.050024 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  5 0 0 0 0 DEMO 2 13.294561 8.570024 0 212.471192 "Peco-55	Medium Right	SL-E395F"
+	E4 13.294561 8.570024 122.471192 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 8.734570 11.471836 302.471192 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 9.044347 11.893437 312.157192 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
+REGRESSION END
 STEP
 CLEAR
 MESSAGE
@@ -181,7 +220,7 @@ PAUSE 170
 MESSAGE
 _________________________________________
 
-By moving the cursor from one side to the other of the track centerline you can flip the turnout 180°.
+By moving the cursor from one side to the other of the track centerline you can flip the turnout 180�.
 END
 STEP
 MOUSE 3 10.667 1.333
@@ -269,6 +308,60 @@ MESSAGE
 =========================================
 END
 BIGPAUSE
+REGRESSION START 10 - turnout select 2
+STRAIGHT 1 0 0 0 0 DEMO 2
+	E4 2.050000 1.050000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 14.883333 1.050017 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 2 0 0 0 0 DEMO 2 20.993080 13.050025 0 12.000000 0 0.000000 0.000000
+	T4 7 30.934023 6.328592 34.064054 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 20.993048 1.050025 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  3 0 0 0 0 DEMO 2 14.883333 1.050017 0 0.000000 "Peco-55	Medium Left	SL-E396F"
+	T4 1 14.883333 1.050017 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 20.288333 1.050017 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 20.253333 1.572017 80.314000 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 170.297000 9.700000
+	S 0 0.000000 4.251000 0.331000 5.370000 0.522000
+	END
+STRAIGHT 4 0 0 0 0 DEMO 2
+	T4 2 20.993080 1.050025 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 20.288333 1.050024 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  5 0 0 0 0 DEMO 2 13.294561 8.570024 0 212.471192 "Peco-55	Medium Right	SL-E395F"
+	E4 13.294561 8.570024 122.471192 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 8.734570 11.471836 302.471192 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 9.044347 11.893437 312.157192 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
+CURVE 6 0 0 0 0 DEMO 2 20.993080 13.050025 0 12.000000 0 0.000000 0.000000
+	E4 32.991545 13.241930 359.083680 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 32.863416 11.290726 188.430422 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  7 0 0 0 0 DEMO 2 30.934023 6.328592 0 304.064054 "Peco-55	Medium Right	SL-E395F"
+	T4 2 30.934023 6.328592 214.064054 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 33.961468 10.806159 34.064054 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 34.374295 10.484782 43.750054 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
+REGRESSION END
 CLEAR
 MESSAGE