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

1 files changed, 140 insertions, 18 deletions

diff --git a/app/lib/demos/dmgroup.xtr b/app/lib/demos/dmgroup.xtr
index efc883d..f5ed0dd 100644
--- a/app/lib/demos/dmgroup.xtr
+++ b/app/lib/demos/dmgroup.xtr
@@ -3,7 +3,7 @@
 VERSION 10
 DEMOINIT
 PARAMETER display labelenable 1
-ORIG 2.000 0.000 0.000
+ORIG 1.0 0.0 0.0
 TURNOUT  6 0 0 0 0 DEMO 2 2.125000 2.281250 0 0.000000 "Peco-55	Medium Right	SL-E395F"
 	E 2.125000 2.281250 270.000000
 	E 7.530000 2.281250 90.000000
@@ -29,19 +29,24 @@ PARAMETER draw linewidth 0
 PARAMETER draw linecolor 0
 PARAMETER GROUP draw
 PARAMETER draw linewidth 4
+MOUSE 1 2.500 3.000
+COMMAND DrawLine
 MOUSE 2 2.500 3.000
 MOUSE 4 2.500 1.500
+COMMAND DrawLine
+KEYSTATE 12
 MOUSE 2 3.200 3.000
+KEYSTATE 12
 MOUSE 4 3.200 1.500
-RESET
+STEP
 COMMAND DrawFilledBox
 PARAMETER draw linecolor 0
 PARAMETER GROUP draw
+MOUSE 1 2.600 3.000
 MOUSE 2 2.600 3.000
 MOUSE 4 3.100 2.500
 MOUSE 2 2.600 2.000
 MOUSE 4 3.100 1.500
-RESET
 MESSAGE
 _________________________________________
 
@@ -51,7 +56,9 @@ First we Select the objects in the new definition.
 END
 STEP
 COMMAND Select
+MOUSE 1 0.781 3.375
 MOUSE 2 0.781 3.375
+MOUSE 3 8.312 1.312
 MOUSE 4 8.312 1.312
 MESSAGE
 _________________________________________
@@ -109,6 +116,7 @@ First Select the turnout and then Ungroup it.
 
 END
 STEP
+MOUSE 1 7.156 2.094
 MOUSE 2 7.156 2.094
 MOUSE 4 7.156 2.094
 PARAMETER misc cmdUngroup
@@ -120,7 +128,7 @@ Notice that the Title now indicates the turnout is Ungrouped.
 Hit Escape to deselect everything.
 END
 STEP
-MOUSE 6920 4.094 5.188
+MOUSE 2800 4.094 5.188
 RESET
 MESSAGE
 _________________________________________
@@ -128,14 +136,25 @@ _________________________________________
 Now Select the lines and squares.
 END
 STEP
+#KEYSTATE 12
+MOUSE 1 2.469 2.812
+#KEYSTATE 12
 MOUSE 2 2.469 2.812
+KEYSTATE 12
 MOUSE 4 2.469 2.812
+KEYSTATE 12
 MOUSE 2 2.688 2.875
+KEYSTATE 12
 MOUSE 4 2.688 2.875
+KEYSTATE 12
 MOUSE 2 3.188 2.844
+KEYSTATE 12
 MOUSE 4 3.188 2.844
+KEYSTATE 12
 MOUSE 2 2.812 1.656
+KEYSTATE 12
 MOUSE 4 2.812 1.656
+MOUSE 1 5.000 1.000
 MESSAGE
 _________________________________________
 
@@ -150,10 +169,10 @@ And move the Label out of the way.
 END
 STEP
 COMMAND MoveLabel
+MOUSE 1 4.281 2.031
 MOUSE 2 4.281 2.031
 MOUSE 4 4.594 0.844
-ORIG 3.000 0.000 0.000
-ORIG 1.000 2.000 1.000
+ORIG 1.0 0.0 0.0
 MESSAGE
 _________________________________________
 
@@ -161,12 +180,15 @@ Notice that the turnout has been broken into three parts.
 END
 STEP
 COMMAND Describe
+MOUSE 1 4.531 2.219
 MOUSE 2 4.531 2.219
 MOUSE 4 4.531 2.219
 BIGPAUSE
+MOUSE 1 6.984 1.812
 MOUSE 2 6.984 1.812
 MOUSE 4 6.984 1.812
 BIGPAUSE
+MOUSE 1 2.359 2.266
 MOUSE 2 2.359 2.266
 MOUSE 4 2.359 2.266
 BIGPAUSE
@@ -194,21 +216,45 @@ KEYSTATE 2
 MOUSE 2 4.625 1.969
 KEYSTATE 2
 MOUSE 4 4.625 1.969
+REGRESSION START 10 - group 1
+TURNOUT  16 0 32 0 0 DEMO 2 2.477615 1.950213 0 0.000000 "Peco-55	Modified Medium Right	SL-E395F"
+	T4 17 2.478000 2.281250 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 7.530000 2.281250 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 18 6.375762 1.950213 99.704000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D -0.409808 -1.271732
+	P "P1" 1
+	P "P2" 2
+	S 0 0.000000 0.000385 0.331037 5.052385 0.331037
+	C 0 0.000000 23.136000 -0.001615 -22.804963 0.004000 9.700000
+	END
+STRAIGHT 17 0 0 0 0 DEMO 2
+	E4 2.125000 2.281250 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 16 2.478000 2.281250 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 18 0 0 0 0 DEMO 2
+	T4 16 6.376000 1.950250 279.686360 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 7.495000 1.759250 99.686360 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+REGRESSION END
 PARAMETER misc cmdDelete
-ORIG 3.000 0.000 0.000
+ORIG 1.0 0.0 0.0
 CLEAR
 MESSAGE
 Now, create a track and place the new turnout on it.
 END
 STEP
 COMMAND Straight
+MOUSE 1 0.281 0.688
 MOUSE 2 0.281 0.688
+MOUSE 3 11.156 4.281
 MOUSE 4 11.156 4.281
 BIGPAUSE
 COMMAND TurnoutHotBar
 #PARAMETER turnout list 0 
 PARAMETER GROUP turnout
 HOTBARSELECT Peco-55	Modified Medium Right	SL-E395F
+MOUSE 1 4.750 1.906
+MOUSE 2 4.750 1.906
 MOUSE 4 4.750 1.906
 MOUSE 8200 4.750 1.906
 MESSAGE
@@ -220,6 +266,7 @@ First we Select the turnout.
 END
 STEP
 COMMAND Select
+MOUSE 1 6.062 2.906
 MOUSE 2 6.062 2.906
 MOUSE 4 6.062 2.906
 MESSAGE
@@ -239,13 +286,16 @@ _________________________________________
 Now, hit escape to deselect everything and then Select the 2 squares and delete them.
 END
 STEP
-MOUSE 6920 6.062 2.906
+MOUSE 2800 6.062 2.906
 RESET
 BIGPAUSE
-MOUSE 2 5.219 2.938
-MOUSE 4 5.219 2.938
-MOUSE 2 5.531 1.844
-MOUSE 4 5.531 1.844
+MOUSE 1 5.219 3.000
+MOUSE 2 5.219 3.000
+MOUSE 4 5.219 3.000
+KEYSTATE 12
+MOUSE 2 5.219 2.000
+KEYSTATE 12
+MOUSE 4 5.219 2.000
 PARAMETER misc cmdDelete
 MESSAGE
 _________________________________________
@@ -253,25 +303,34 @@ _________________________________________
 Now draw the green circles...
 END
 STEP
-ORIG 1.000 2.000 1.000
-COMMAND DrawFilledCircleCenter
+ORIG 1.0 0.0 0.0
+COMMAND DrawFilledCircleTangent
 PARAMETER draw linecolor 0
 PARAMETER GROUP draw
 PARAMETER draw linecolor 65280
+MOUSE 1 5.203 2.812
 MOUSE 2 5.203 2.812
+MOUSE 3 5.359 2.609
 MOUSE 4 5.359 2.609
 PARAMETER GROUP draw
+MOUSE 1 5.516 1.891
 MOUSE 2 5.516 1.891
+MOUSE 3 5.672 1.719
 MOUSE 4 5.672 1.719
 PARAMETER GROUP draw
 MESSAGE
 and Group the new definition.
 END
 STEP
-ORIG 2.000 0.000 0.000
-RESET
+ORIG 1.0 0.0 0.0
 COMMAND Select
+KEYSTATE 12
+MOUSE 1 3.719 4.156
+KEYSTATE 12
 MOUSE 2 3.719 4.156
+KEYSTATE 12
+MOUSE 3 10.531 0.969
+KEYSTATE 12
 MOUSE 4 10.531 0.969
 BIGPAUSE
 PARAMETER misc cmdGroup
@@ -288,22 +347,63 @@ KEYSTATE 2
 MOUSE 2 5.000 2.188
 KEYSTATE 2
 MOUSE 4 5.000 2.188
+REGRESSION START 10 - group 2
+STRAIGHT 19 0 0 0 0 DEMO 2
+	E4 0.281000 0.688000 251.716920 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 32 4.672994 2.139075 71.716920 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 20 0 0 0 0 DEMO 2
+	T4 32 9.805140 3.834688 251.716920 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 11.156000 4.281000 71.716920 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  32 0 0 0 0 DEMO 2 4.672994 2.139075 0 0.000000 "Peco-55	Modified Medium Right	SL-E395F"
+	T4 19 4.672994 2.139075 251.716920 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 20 9.805140 3.834688 71.716920 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 9.935665 3.328060 81.403280 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "P0" 1 3
+	P "P1" 4 2 3
+	L3 0 0.055556 0.130589 0.800108 0 0.601157 -0.624169 0
+	L3 0 0.055556 0.795251 1.019707 0 1.265820 -0.404571 0
+	S 0 0.000000 5.132146 1.695614 0.335180 0.110740
+	C 0 0.000000 -23.136000 7.591323 -21.857939 341.720920 9.700000
+	S 0 0.000000 0.335180 0.110740 0.000000 0.000000
+	S 0 0.000000 5.262670 1.188985 4.140240 1.019299
+	G3 65280 0.000000 0.256018 0.530006 0.672925 0
+	G3 65280 0.000000 0.232207 0.843006 -0.248075 0
+	END
+REGRESSION END
 PARAMETER misc cmdDelete
 CLEAR
 RESET
 MESSAGE
 We can also create turnouts from simple straight and curved tracks.
 
-We'll create two tracks that have a common End-Point.
+We'll create two tracks that have a common endpoint.
 END
 STEP
 COMMAND Straight
+MOUSE 1 2.000 2.000
 MOUSE 2 2.000 2.000
+MOUSE 3 10.000 2.000
 MOUSE 4 10.000 2.000
+MESSAGE
+
+When we create the curve from the straight track endpoint we need to hold down the Shift key to prevent XTrackCAD from trying to join the two tracks.
+END
 COMMAND CurveEndPt
+MOUSE 1 2.000 2.000
+KEYSTATE 12
 MOUSE 2 2.000 2.000
+KEYSTATE 12
+MOUSE 3 9.000 2.000
+KEYSTATE 12
 MOUSE 4 9.000 2.000
+KEYSTATE 12
 MOUSE 2 9.000 2.000
+KEYSTATE 12
+MOUSE 3 8.875 3.062
+KEYSTATE 12
 MOUSE 4 8.875 3.062
 MESSAGE
 _________________________________________
@@ -314,6 +414,7 @@ We will use the <Describe> command to change the tracks.
 END
 STEP
 COMMAND Describe
+MOUSE 1 9.438 2.000
 MOUSE 2 9.438 2.000
 MOUSE 4 9.438 2.000
 MESSAGE
@@ -344,6 +445,7 @@ Now let's look at the curved track.
 END
 STEP
 COMMAND Describe
+MOUSE 1 7.688 2.625
 MOUSE 2 7.688 2.625
 MOUSE 4 7.688 2.625
 MESSAGE
@@ -357,7 +459,7 @@ PARAMETER describe P1 2
 MESSAGE
 _________________________________________
 
-We want the curve to have a radius of 20" and an angle of 17.5°.
+We want the curve to have a radius of 20" and an angle of 17.5�.
 First change the Radius...
 END
 STEP
@@ -378,9 +480,14 @@ Now Select both tracks...
 END
 STEP
 COMMAND Select
+MOUSE 1 7.500 2.750
 MOUSE 2 7.500 2.750
 MOUSE 4 7.500 2.750
+KEYSTATE 12
+MOUSE 1 8.000 2.000
+KEYSTATE 12
 MOUSE 2 8.000 2.000
+KEYSTATE 12
 MOUSE 4 8.000 2.000
 MESSAGE
 and Group them.
@@ -409,6 +516,7 @@ We'll use the <Flip> command.
 END
 STEP
 COMMAND Select
+MOUSE 1 7.812 2.250
 MOUSE 2 7.812 2.250
 MOUSE 4 7.812 2.250
 COMMAND Flip
@@ -418,7 +526,9 @@ _________________________________________
 Drag a horizontal line that will be the mirror for the <Flip> command.
 END
 STEP
+MOUSE 1 1.438 1.938
 MOUSE 2 1.438 1.938
+MOUSE 3 11.625 1.938
 MOUSE 4 11.625 1.938
 MESSAGE
 _________________________________________
@@ -464,4 +574,16 @@ MESSAGE
 =========================================
 END
 STEP
+REGRESSION START 10 - group 3
+TURNOUT  36 0 0 0 0 DEMO 2 2.000000 1.876000 0 0.000000 "Custom	Right	99-R"
+	E4 2.000000 1.876000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 9.500000 1.876000 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 8.014116 0.950339 107.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "P0" 1
+	P "P1" 2
+	S 0 0.000000 0.000000 0.000000 7.500000 -0.000000
+	C 0 0.000000 20.000000 -0.000000 -20.000000 0.000000 17.500000
+	END
+REGRESSION END
 CLEAR