summaryrefslogtreecommitdiff
path: root/app/lib/demos
diff options
context:
space:
mode:
Diffstat (limited to 'app/lib/demos')
-rw-r--r--app/lib/demos/dmadjend.xtr622
-rw-r--r--app/lib/demos/dmbench.xtr8
-rw-r--r--app/lib/demos/dmcancel.xtr52
-rw-r--r--app/lib/demos/dmcircle.xtr9
-rw-r--r--app/lib/demos/dmconn1.xtr336
-rw-r--r--app/lib/demos/dmconn2.xtr236
-rw-r--r--app/lib/demos/dmcrvtrk.xtr32
-rw-r--r--app/lib/demos/dmctlpnl.xtr1082
-rw-r--r--app/lib/demos/dmdelund.xtr10
-rw-r--r--app/lib/demos/dmdialog.xtr13
-rw-r--r--app/lib/demos/dmdimlin.xtr138
-rw-r--r--app/lib/demos/dmease.xtr162
-rw-r--r--app/lib/demos/dmelev.xtr239
-rw-r--r--app/lib/demos/dmexcept.xtr52
-rw-r--r--app/lib/demos/dmextend.xtr49
-rw-r--r--app/lib/demos/dmflip.xtr3
-rw-r--r--app/lib/demos/dmgroup.xtr158
-rw-r--r--app/lib/demos/dmhelix.xtr33
-rw-r--r--app/lib/demos/dmhndld.xtr66
-rw-r--r--app/lib/demos/dmintro.xtr24
-rw-r--r--app/lib/demos/dmjcir.xtr34
-rw-r--r--app/lib/demos/dmjnabut.xtr16
-rw-r--r--app/lib/demos/dmjncs.xtr44
-rw-r--r--app/lib/demos/dmjnmove.xtr27
-rw-r--r--app/lib/demos/dmjnss.xtr225
-rw-r--r--app/lib/demos/dmjntt.xtr34
-rw-r--r--app/lib/demos/dmlines.xtr132
-rw-r--r--app/lib/demos/dmlines2.xtr149
-rw-r--r--app/lib/demos/dmmouse.xtr232
-rw-r--r--app/lib/demos/dmmovabt.xtr3
-rw-r--r--app/lib/demos/dmnotes.xtr7
-rw-r--r--app/lib/demos/dmparall.xtr41
-rw-r--r--app/lib/demos/dmplymod.xtr88
-rw-r--r--app/lib/demos/dmprof.xtr164
-rw-r--r--app/lib/demos/dmrescal.xtr129
-rw-r--r--app/lib/demos/dmrotate.xtr913
-rw-r--r--app/lib/demos/dmruler.xtr3
-rw-r--r--app/lib/demos/dmselect.xtr468
-rw-r--r--app/lib/demos/dmsplit.xtr42
-rw-r--r--app/lib/demos/dmstrtrk.xtr6
-rw-r--r--app/lib/demos/dmtbledg.xtr59
-rw-r--r--app/lib/demos/dmtosel.xtr99
-rw-r--r--app/lib/demos/dmtotrim.xtr28
-rw-r--r--app/lib/demos/dmtoyard.xtr159
-rw-r--r--app/lib/demos/dmtrkwid.xtr134
-rw-r--r--app/lib/demos/dmtrntab.xtr4
46 files changed, 4608 insertions, 1956 deletions
diff --git a/app/lib/demos/dmadjend.xtr b/app/lib/demos/dmadjend.xtr
index 5e918fa..c74122a 100644
--- a/app/lib/demos/dmadjend.xtr
+++ b/app/lib/demos/dmadjend.xtr
@@ -1,6 +1,6 @@
VERSION 2
DEMOINIT
-ORIG 8.000 0.000 0.000
+ORIG 5.000 0.000 0.000
STRAIGHT 1 DEMO 1
E 16.166667 2.333333 260.498723
E 36.083333 5.666667 80.498723
@@ -23,346 +23,83 @@ CURVE 3 DEMO 1 7.500000 8.333333 6.000000
REDRAW
RESET
MESSAGE
-The unconnected End-Points of a straight or curved track can be changed with the 'Modify Track' command.
+The unconnected endpoints of a straight or curved track can be changed with the 'Modify Track' command.
END
STEP
COMMAND Modify
-MOUSE 2 35.917 5.917
+MOUSE 1 35.833 5.917
MESSAGE
_________________________________________
-The End-Point of a straight track is selected and then Left-Dragged to change its length.
+The endpoint of a straight track is selected and then Left-Dragged to change its length. A blue anchor shows that the length can be extended.
END
+STEP
BIGPAUSE
+MOUSE 1 35.833 5.917
+PAUSE 200
+MOUSE 2 35.833 5.917
MOUSE 3 35.833 5.917
-MOUSE 3 36.750 6.167
-PAUSE 1000
-MOUSE 3 36.750 6.167
-MOUSE 3 16.750 2.750
+#MOUSE 3 56.750 15.167
+MOUSE 3 58 9.5
+PAUSE 200
+#MOUSE 4 56.750 15.167
+MOUSE 4 58 9.5
BIGPAUSE
MESSAGE
_________________________________________
-Watch what happens if you try to drag the selected End-Point beyond the far End-Point.
+If you try to drag the selected endpoint beyond the far endpoint, the track extends in the opposite direction.
-The length of the straight track is determined by the distance from the far End-Point and the cursor.
END
-BIGPAUSE
-MOUSE 3 16.167 2.667
-MOUSE 3 10.583 1.500
-PAUSE 820
+STEP
+#MOUSE 1 16.167 2.667
+MOUSE 1 58 9.5
+PAUSE 200
+#MOUSE 2 16.167 2.667
+MOUSE 2 58 9.5
+#MOUSE 3 10.583 1.500
MOUSE 3 10.583 1.500
+BIGPAUSE
+#MOUSE 3 34.333 5.917
+MOUSE 3 34.333 5.917
+#MOUSE 4 34.333 5.917
MOUSE 4 34.333 5.917
+BIGPAUSE
MESSAGE
=========================================
END
STEP
CLEAR
MESSAGE
-A curved track is selected and it's new End-Point is determined by the angle to the cursor.
+A curved track is selected and it's new endpoint is determined by the angle to the cursor.
END
STEP
+MOUSE 1 13.67 8.100
+PAUSE 200
MOUSE 2 13.67 8.100
-PAUSE 500
-MOUSE 3 13.67 8.100
-PAUSE 50
-MOUSE 3 13.333 8.083
-PAUSE 60
-MOUSE 3 13.333 8.000
-PAUSE 50
-MOUSE 3 13.250 7.833
-PAUSE 60
-MOUSE 3 13.167 7.667
-PAUSE 50
-MOUSE 3 13.167 7.500
-PAUSE 60
-MOUSE 3 13.000 7.333
-PAUSE 50
-MOUSE 3 13.000 7.167
-PAUSE 60
-MOUSE 3 12.833 6.917
-PAUSE 50
-MOUSE 3 12.667 6.667
-PAUSE 60
-MOUSE 3 12.667 6.417
-PAUSE 50
-MOUSE 3 12.500 6.167
-PAUSE 60
-MOUSE 3 12.333 5.833
PAUSE 50
MOUSE 3 12.167 5.417
-PAUSE 60
-MOUSE 3 12.000 5.333
-PAUSE 50
-MOUSE 3 12.000 5.083
-PAUSE 60
-MOUSE 3 11.833 5.000
-PAUSE 50
-MOUSE 3 11.667 4.667
-PAUSE 60
-MOUSE 3 11.500 4.500
-MOUSE 3 11.333 4.333
-PAUSE 110
-MOUSE 3 11.333 4.167
-PAUSE 380
-MOUSE 3 11.333 4.250
-PAUSE 60
-MOUSE 3 11.333 4.333
-PAUSE 50
-MOUSE 3 11.333 4.417
-PAUSE 60
-MOUSE 3 11.500 4.500
-PAUSE 50
-MOUSE 3 11.583 4.667
PAUSE 50
MOUSE 3 11.750 5.000
PAUSE 60
-MOUSE 3 11.917 5.083
-PAUSE 50
-MOUSE 3 12.000 5.333
-PAUSE 60
-MOUSE 3 12.167 5.417
-PAUSE 50
-MOUSE 3 12.250 5.667
-PAUSE 60
-MOUSE 3 12.333 5.750
-MOUSE 3 12.500 6.000
-PAUSE 50
-MOUSE 3 12.583 6.167
-PAUSE 110
-MOUSE 3 12.750 6.500
-MOUSE 3 12.917 6.833
-PAUSE 60
-MOUSE 3 13.083 7.083
-PAUSE 50
-MOUSE 3 13.167 7.333
-PAUSE 60
-MOUSE 3 13.250 7.417
-PAUSE 50
-MOUSE 3 13.333 7.667
-PAUSE 60
-MOUSE 3 13.333 7.833
-PAUSE 50
MOUSE 3 13.417 8.083
PAUSE 60
-MOUSE 3 13.500 8.333
-PAUSE 50
-MOUSE 3 13.500 8.667
-PAUSE 60
-MOUSE 3 13.500 9.000
-PAUSE 50
-MOUSE 3 13.500 9.167
-PAUSE 60
-MOUSE 3 13.500 9.417
-PAUSE 50
-MOUSE 3 13.500 9.750
-PAUSE 60
-MOUSE 3 13.417 10.000
-PAUSE 50
-MOUSE 3 13.333 10.167
-PAUSE 60
-MOUSE 3 13.333 10.417
-PAUSE 50
-MOUSE 3 13.167 10.500
-PAUSE 60
-MOUSE 3 13.000 10.667
-PAUSE 50
-MOUSE 3 13.000 10.833
-PAUSE 60
MOUSE 3 12.917 10.833
PAUSE 50
MOUSE 3 12.833 10.917
PAUSE 60
-MOUSE 3 12.667 11.000
-PAUSE 50
-MOUSE 3 12.500 11.000
-PAUSE 60
-MOUSE 3 12.167 11.167
-PAUSE 50
-MOUSE 3 12.000 11.333
-PAUSE 110
-MOUSE 3 11.917 11.333
-PAUSE 60
-MOUSE 3 11.833 11.500
-PAUSE 50
-MOUSE 3 11.667 11.500
-PAUSE 60
-MOUSE 3 11.667 11.667
-PAUSE 50
-MOUSE 3 11.500 11.667
-PAUSE 60
-MOUSE 3 11.333 11.667
-PAUSE 50
-MOUSE 3 11.167 11.917
-PAUSE 60
-MOUSE 3 11.000 12.000
-PAUSE 110
MOUSE 3 10.833 12.083
-PAUSE 50
-MOUSE 3 10.667 12.167
-PAUSE 60
-MOUSE 3 10.333 12.333
-MOUSE 3 10.250 12.333
-PAUSE 110
-MOUSE 3 10.000 12.500
-PAUSE 50
-MOUSE 3 9.833 12.583
-PAUSE 60
-MOUSE 3 9.667 12.667
-PAUSE 50
-MOUSE 3 9.417 12.750
-PAUSE 60
-MOUSE 3 9.333 12.833
-PAUSE 50
-MOUSE 3 9.083 13.000
-PAUSE 60
-MOUSE 3 8.917 13.000
-PAUSE 50
-MOUSE 3 8.667 13.167
-PAUSE 60
-MOUSE 3 8.500 13.333
-PAUSE 160
-MOUSE 3 8.417 13.333
PAUSE 60
MOUSE 3 8.167 13.333
-PAUSE 50
-MOUSE 3 7.333 13.333
-PAUSE 60
-MOUSE 3 7.000 13.250
-PAUSE 110
-MOUSE 3 7.000 13.167
-PAUSE 50
-MOUSE 3 6.750 13.000
-PAUSE 60
-MOUSE 3 6.333 12.917
-PAUSE 100
-MOUSE 3 6.333 12.833
-PAUSE 60
-MOUSE 3 6.333 12.750
-PAUSE 50
-MOUSE 3 6.000 12.667
-PAUSE 110
-MOUSE 3 5.750 12.417
-PAUSE 60
-MOUSE 3 5.667 12.333
-PAUSE 50
-MOUSE 3 5.500 12.167
-PAUSE 60
-MOUSE 3 5.333 12.000
-PAUSE 50
-MOUSE 3 5.167 11.833
-PAUSE 60
-MOUSE 3 5.000 11.500
-PAUSE 50
-MOUSE 3 4.833 11.333
-PAUSE 110
-MOUSE 3 4.667 11.000
-PAUSE 60
-MOUSE 3 4.417 10.667
-PAUSE 50
-MOUSE 3 4.333 10.500
-PAUSE 110
-MOUSE 3 4.167 10.083
PAUSE 60
-MOUSE 3 4.000 9.750
-PAUSE 50
MOUSE 3 3.833 9.417
PAUSE 60
-MOUSE 3 3.750 9.167
-PAUSE 50
-MOUSE 3 3.667 8.833
-PAUSE 110
-MOUSE 3 3.500 8.500
-PAUSE 60
-MOUSE 3 3.500 8.250
-PAUSE 50
-MOUSE 3 3.333 8.000
-PAUSE 60
-MOUSE 3 3.333 7.667
-PAUSE 110
-MOUSE 3 3.333 7.417
-PAUSE 50
-MOUSE 3 3.250 7.167
-PAUSE 60
MOUSE 3 3.167 6.917
-PAUSE 110
-MOUSE 3 3.167 6.500
-PAUSE 50
-MOUSE 3 3.167 6.250
-PAUSE 60
-MOUSE 3 3.167 6.000
-PAUSE 110
-MOUSE 3 3.167 5.833
-PAUSE 50
-MOUSE 3 3.167 5.500
-PAUSE 60
-MOUSE 3 3.167 5.333
-PAUSE 50
-MOUSE 3 3.250 5.167
-PAUSE 110
-MOUSE 3 3.333 4.917
-PAUSE 60
-MOUSE 3 3.500 4.667
-PAUSE 50
-MOUSE 3 3.500 4.583
-PAUSE 110
-MOUSE 3 3.750 4.417
-PAUSE 60
-MOUSE 3 4.167 4.083
-PAUSE 50
-MOUSE 3 4.333 4.000
-PAUSE 110
-MOUSE 3 4.500 3.833
-PAUSE 60
-MOUSE 3 4.667 3.667
-PAUSE 50
-MOUSE 3 5.000 3.583
-PAUSE 60
-MOUSE 3 5.167 3.500
-PAUSE 110
-MOUSE 3 5.333 3.500
-PAUSE 50
-MOUSE 3 5.500 3.417
-PAUSE 60
-MOUSE 3 5.667 3.333
-PAUSE 110
-MOUSE 3 5.833 3.333
PAUSE 50
-MOUSE 3 6.000 3.250
-PAUSE 60
-MOUSE 3 6.000 3.167
-PAUSE 110
-MOUSE 3 6.167 3.167
-PAUSE 110
-MOUSE 3 6.250 3.167
-PAUSE 50
-MOUSE 3 6.333 3.167
-PAUSE 60
-MOUSE 3 6.417 3.167
-PAUSE 100
-MOUSE 3 6.500 3.167
-PAUSE 60
-MOUSE 3 6.583 3.167
-PAUSE 50
-MOUSE 3 6.667 3.083
-PAUSE 110
-MOUSE 3 6.667 3.000
-PAUSE 60
-MOUSE 3 6.750 3.083
-PAUSE 50
-MOUSE 3 6.833 3.083
-PAUSE 660
-MOUSE 3 6.917 3.083
-PAUSE 110
-MOUSE 3 7.000 3.167
-PAUSE 440
-MOUSE 3 7.083 3.167
-PAUSE 110
-MOUSE 3 7.167 3.167
MOUSE 3 7.250 3.167
PAUSE 50
MOUSE 3 7.333 3.167
-PAUSE 170
+PAUSE 250
MOUSE 3 7.417 3.167
PAUSE 50
MESSAGE
@@ -372,38 +109,18 @@ It's possible to almost create a complete circle.
If you drag the mouse beyond the start of the curve the track becomes very short.
END
STEP
-MOUSE 3 7.500 3.167
+MOUSE 4 7.500 3.167
MESSAGE
_________________________________________
Here you are warned that the track will be too short.
END
-MOUSE 3 7.60 3.167
+MOUSE 1 7.60 3.167
BIGPAUSE
+MOUSE 2 7.60 3.167
+STEP
MOUSE 3 8.417 3.167
PAUSE 60
-MOUSE 3 8.417 3.250
-PAUSE 440
-MOUSE 3 8.500 3.250
-PAUSE 50
-MOUSE 3 8.500 3.333
-PAUSE 110
-MOUSE 3 8.583 3.333
-PAUSE 60
-MOUSE 3 8.667 3.333
-PAUSE 270
-MOUSE 3 8.750 3.333
-PAUSE 60
-MOUSE 3 8.833 3.333
-PAUSE 50
-MOUSE 3 8.833 3.417
-PAUSE 110
-MOUSE 3 8.833 3.500
-PAUSE 1610
-MOUSE 3 8.833 3.417
-PAUSE 60
-MOUSE 3 8.833 3.500
-PAUSE 110
MOUSE 3 8.917 3.500
PAUSE 60
MOUSE 3 9.000 3.667
@@ -422,52 +139,10 @@ PAUSE 60
MOUSE 3 10.167 4.500
PAUSE 50
MOUSE 3 10.333 4.667
-PAUSE 60
-MOUSE 3 10.583 4.667
-PAUSE 50
-MOUSE 3 10.833 4.833
-PAUSE 60
-MOUSE 3 11.083 5.000
-PAUSE 50
-MOUSE 3 11.750 5.083
-PAUSE 60
-MOUSE 3 11.917 5.167
-PAUSE 50
-MOUSE 3 12.250 5.333
-PAUSE 60
-MOUSE 3 12.417 5.333
-PAUSE 50
-MOUSE 3 12.667 5.333
-PAUSE 60
-MOUSE 3 12.917 5.333
-PAUSE 160
-MOUSE 3 12.917 5.417
-PAUSE 60
-MOUSE 3 13.083 5.500
PAUSE 50
-MOUSE 3 13.333 5.667
-MOUSE 3 13.417 5.750
-PAUSE 220
-MOUSE 3 13.417 5.833
-PAUSE 60
-MOUSE 3 13.417 5.917
-PAUSE 50
-MOUSE 3 13.417 6.083
-MOUSE 3 13.500 6.167
-PAUSE 60
-MOUSE 3 13.583 6.167
-PAUSE 110
-MOUSE 3 13.500 6.333
-PAUSE 110
-MOUSE 3 13.500 6.417
-PAUSE 50
-MOUSE 3 13.500 6.500
-PAUSE 50
-MOUSE 3 13.500 6.667
-PAUSE 110
-MOUSE 3 13.500 6.750
-PAUSE 60
MOUSE 3 13.583 6.833
+STEP
+PAUSE 200
MOUSE 4 13.583 6.833
MESSAGE
_________________________________________
@@ -475,130 +150,17 @@ _________________________________________
If you move the cursor away from the curve, you will create a straight track tangent to the curve.
END
STEP
+MOUSE 1 13.50 6.8
+PAUSE 250
MOUSE 2 13.50 6.8
PAUSE 110
-MOUSE 3 13.50 7.0
-PAUSE 440
-MOUSE 3 13.500 7.2
-PAUSE 60
-MOUSE 3 13.750 7.4
-PAUSE 50
-MOUSE 3 14.083 7.6
-PAUSE 60
-MOUSE 3 14.333 7.8
-PAUSE 110
-MOUSE 3 15.000 7.833
-PAUSE 50
-MOUSE 3 15.500 7.667
-PAUSE 60
-MOUSE 3 16.000 7.583
-PAUSE 110
MOUSE 3 16.250 7.583
-PAUSE 50
-MOUSE 3 16.500 7.417
-PAUSE 60
-MOUSE 3 16.583 7.417
-PAUSE 110
-MOUSE 3 16.750 7.417
-PAUSE 50
-MOUSE 3 16.750 7.417
-PAUSE 110
-MOUSE 3 16.833 7.417
-PAUSE 60
-MOUSE 3 17.000 7.417
-PAUSE 50
-MOUSE 3 17.333 7.583
-PAUSE 110
-MOUSE 3 17.500 7.833
PAUSE 60
MOUSE 3 17.667 8.083
PAUSE 110
-MOUSE 3 17.750 8.333
-PAUSE 50
-MOUSE 3 17.917 8.833
-PAUSE 60
-MOUSE 3 18.000 9.667
-PAUSE 110
-MOUSE 3 18.083 10.500
-PAUSE 50
-MOUSE 3 18.083 11.000
-PAUSE 110
-MOUSE 3 17.917 11.417
-PAUSE 60
-MOUSE 3 17.667 11.667
-PAUSE 50
-MOUSE 3 17.167 12.083
-PAUSE 110
MOUSE 3 16.000 12.583
-PAUSE 60
-MOUSE 3 14.917 13.167
-PAUSE 110
-MOUSE 3 13.917 13.583
-PAUSE 50
-MOUSE 3 13.417 13.833
-PAUSE 110
-MOUSE 3 13.000 14.000
-MOUSE 3 12.583 14.083
-PAUSE 110
-MOUSE 3 12.167 14.250
-PAUSE 60
-MOUSE 3 11.333 14.417
PAUSE 50
-MOUSE 3 10.000 14.500
-PAUSE 110
-MOUSE 3 8.333 14.583
-PAUSE 60
-MOUSE 3 6.667 14.583
-PAUSE 110
-MOUSE 3 5.500 14.583
-PAUSE 50
-MOUSE 3 4.333 14.583
-PAUSE 110
-MOUSE 3 4.000 14.500
-PAUSE 50
-MOUSE 3 4.000 14.417
-PAUSE 110
-MOUSE 3 3.833 14.250
-PAUSE 60
-MOUSE 3 3.667 14.167
-PAUSE 110
-MOUSE 3 3.667 14.083
-PAUSE 50
-MOUSE 3 3.583 14.083
-PAUSE 110
-MOUSE 3 3.500 14.083
-PAUSE 220
-MOUSE 3 3.417 14.083
-PAUSE 60
-MOUSE 3 3.167 14.167
-PAUSE 110
-MOUSE 3 3.167 14.250
-PAUSE 50
-MOUSE 3 3.000 14.250
-PAUSE 110
-MOUSE 3 2.833 14.417
-PAUSE 60
-MOUSE 3 2.667 14.417
-PAUSE 110
-MOUSE 3 2.500 14.583
-PAUSE 50
-MOUSE 3 2.333 14.583
-PAUSE 110
-MOUSE 3 2.167 14.583
-PAUSE 60
-MOUSE 3 2.000 14.667
-PAUSE 110
-MOUSE 3 1.833 14.667
-PAUSE 50
-MOUSE 3 1.667 14.667
-PAUSE 110
-MOUSE 3 1.500 14.667
-PAUSE 60
-MOUSE 3 1.417 14.583
-PAUSE 110
MOUSE 3 1.250 14.583
-PAUSE 50
-MOUSE 3 1.167 14.500
PAUSE 110
MOUSE 3 1.000 14.417
PAUSE 940
@@ -610,13 +172,20 @@ END
STEP
CLEAR
MESSAGE
-If you adjust the End-Point of a turnout or sectional track the track is extended by a straight track segment.
+If you adjust the endpoint of a turnout or sectional track the track is extended by a similar track segment. The extension can be
+a straight or a curve.
END
STEP
+MOUSE 1 19.750 10.583
+PAUSE 50
MOUSE 2 19.750 10.583
+MOUSE 3 28.583 13.500
MOUSE 4 28.583 13.500
BIGPAUSE
+MOUSE 1 19.833 10.583
+PAUSE 50
MOUSE 2 19.833 10.583
+MOUSE 3 28.583 12.083
MOUSE 4 28.583 12.083
MESSAGE
=========================================
@@ -624,20 +193,113 @@ END
STEP
CLEAR
MESSAGE
-You can change the radius of a Straight or Curved track that is connected at one End-Point by holding down the Shift key while dragging on it.
+You can change the radius of a straight or curved track that is connected at one endpoint by holding down the Shift key while Left-dragging on it.
+The blue cross anchor shows that this is possible when shift is held down with no buttons.
END
STEP
KEYSTATE 2
+MOUSE 1 28 13
+BIGPAUSE
+KEYSTATE 2
MOUSE 2 28 13
KEYSTATE 2
-MOUSE 4 31 21
+MOUSE 3 31 20
+KEYSTATE 2
+MOUSE 4 31 20
MESSAGE
_________________________________________
-This lets you change a Straight track into a Curved track (and vice versa) as well as changing the radius of a Curved track.
+This lets you change a straight track into a curved track (and vice versa) as well as changing the radius of a curved track.
+
END
+REGRESSION START 10 - adjust ep 1
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 16.166667 2.333333 260.498723 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 34.429091 5.389833 80.498723 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 2 0 0 0 0 DEMO 2 14.750000 9.333333 0 -16.389478 "Peco-55 Medium Right SL-E395F"
+ E4 14.750000 9.333333 253.610522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 19.935373 10.858435 73.610522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 20.049085 10.347771 83.296522 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 3 0 0 0 0 DEMO 2 7.500000 8.333333 0 6.000000 0 0.000000 0.000000
+ E4 13.500000 8.333333 0.000076 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 1.519171 7.854075 355.418545 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 4 0 0 0 0 DEMO 2
+ T4 3 1.519171 7.854075 175.418545 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 1.000000 14.333000 355.418545 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 20.049085 10.347771 263.296522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 28.698093 11.364328 83.296522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 7 0 0 0 0 DEMO 2 14.785857 28.366861 0 18.250000 0 0.000000 0.000000
+ E4 31.008578 20.007087 27.262627 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 19.935373 10.858435 253.610522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
+STEP
+PARAMETER misc cmdUndo
+CLEAR
+MESSAGE
+You can form an extension of a straight or curved Track that is connected at one endpoint using an easement by holding down the Ctrl key while Left-dragging on it.
+The blue half cross anchor shows that this is possible when the Ctrl key is held down with no mouse button.
+END
+STEP
+COMMAND Modify
+KEYSTATE 4
+MOUSE 1 28.583 11.083
+PAUSE 50
+KEYSTATE 4
+MOUSE 2 28.583 11.083
+KEYSTATE 4
+MOUSE 3 31 50
+KEYSTATE 4
+MOUSE 4 31 50
MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - adjust ep 2
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 16.166667 2.333333 260.498723 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 34.429091 5.389833 80.498723 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 2 0 0 0 0 DEMO 2 14.750000 9.333333 0 -16.389478 "Peco-55 Medium Right SL-E395F"
+ E4 14.750000 9.333333 253.610522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 19.935373 10.858435 73.610522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 20.049085 10.347771 83.296522 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 3 0 0 0 0 DEMO 2 7.500000 8.333333 0 6.000000 0 0.000000 0.000000
+ E4 13.500000 8.333333 0.000076 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 1.519171 7.854075 355.418545 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 4 0 0 0 0 DEMO 2
+ T4 3 1.519171 7.854075 175.418545 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 1.000000 14.333000 355.418545 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 20.049085 10.347771 263.296522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 8 28.698093 11.364328 83.296522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 8 0 0 0 0 DEMO 2 26.407246 30.855163 0 19.625000 0 0.000000 0.000000
+ E4 30.996193 49.936101 283.522764 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 28.698093 11.364328 263.296522 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmbench.xtr b/app/lib/demos/dmbench.xtr
index 8fbf7f2..252703b 100644
--- a/app/lib/demos/dmbench.xtr
+++ b/app/lib/demos/dmbench.xtr
@@ -66,5 +66,13 @@ _________________________________________
Now both flanges are on the inside of the two girders.
=========================================
END
+REGRESSION START 10 - benchwork
+DRAW 1 0 0 0 0 0.000000 0.000000 0 0.000000
+ B3 16760832 0.055556 0.000000 2.000000 0 23.812000 2.000000 0 17173504
+ END
+DRAW 2 0 0 0 0 0.000000 0.000000 0 0.000000
+ B3 16760832 0.055556 0.000000 10.250000 0 23.750000 10.250000 0 17173505
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmcancel.xtr b/app/lib/demos/dmcancel.xtr
index edaef5c..e4afbf7 100644
--- a/app/lib/demos/dmcancel.xtr
+++ b/app/lib/demos/dmcancel.xtr
@@ -1,6 +1,7 @@
VERSION 10
DEMOINIT
-ORIG 6.000 0.000 0.000
+ORIG 4.000 0.000 0.000
+PARAMETER display labelenable 1
STRAIGHT 1 0 0 0 0 DEMO 2
E 5.333333 2.250000 270.000000
T 2 14.000000 2.250011 90.000000
@@ -22,7 +23,7 @@ STRAIGHT 3 0 0 0 0 DEMO 2
T 2 19.405000 2.250007 270.000123
END
NOTE 4 0 0 0 16.666667 4.250000 0 69
-This is a note about something important
+This is a note about something important
but I can't remember what.
END
DRAW 5 0 0 0 0 4.125000 5.750000 0 0.000000
@@ -33,19 +34,22 @@ RESET
MESSAGE
Pushing the <Describe> button will cancel any other command in progress.
-Here we will begin to create a Curved track which is a two step process.
+Here we will begin to create a curved track which is a two step process.
END
STEP
COMMAND CurveEndPt
MOUSE 2 21.250 5.583
+MOUSE 3 21.250 5.583
+MOUSE 3 32.333 5.750
MOUSE 4 32.333 5.750
+STEP
COMMAND Describe
MESSAGE
_________________________________________
When we clicked on the <Describe> button, the current command was cancelled.
-When in <Describe> mode, selecting any object will print a description in the Status Bar and display a Dialog showing properties of the clicked-on object.
+When in <Describe> mode, selecting any object will print a description in the Status Bar and display a dialog showing properties of the clicked-on object.
END
STEP
MOUSE 2 11.333 2.167
@@ -53,7 +57,7 @@ MOUSE 4 11.333 2.167
MESSAGE
_________________________________________
-Certain parameters of the object can be changed. In this case we'll change the Length
+Certain parameters of the object can be changed. In this case we'll change the length
END
STEP
#DESCRIBE Length 7.500
@@ -67,7 +71,7 @@ BIGPAUSE
MOUSE 2 18.083 2.250
MOUSE 4 18.083 2.250
MESSAGE
-and change the turnout Title.
+and change the turnout name and part no.
END
STEP
#DESCRIBE Name Medium Left
@@ -80,11 +84,11 @@ MOUSE 4 11.500 6.625
MESSAGE
_________________________________________
-You can change the contents of Text...
+You can change the contents of text...
END
STEP
#DESCRIBE Text Goodbye
-PARAMETER describe S1 Goodbye
+PARAMETER describe T1 Goodbye
BIGPAUSE
MESSAGE
and its size.
@@ -96,7 +100,7 @@ STEP
MESSAGE
_________________________________________
-If you select a Note, the Description dialog appears which displays the contents of the note.
+If you select a note, the Description dialog appears which displays the contents of the note.
END
BIGPAUSE
MOUSE 2 16.750 4.583
@@ -109,4 +113,34 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - describe
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 6.500000 2.250001 269.999927 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 14.000000 2.250011 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 14.000000 2.250011 0 0.000000 "Peco-55 Medium Left SL-E396F2"
+ T4 1 14.000000 2.250011 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 19.405000 2.250011 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 19.370000 2.772011 80.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.172500 -1.261011
+ 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 3 0 0 0 0 DEMO 2
+ E4 28.166667 2.250000 90.000123 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 19.405000 2.250007 270.000123 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+NOTE 4 0 0 0 16.666667 4.250000 0 69
+This is a note about something important
+but I can't remember what.
+
+ END
+DRAW 5 0 0 0 0 4.125000 5.750000 0 0.000000
+ Z 0 0.000000 0.000000 0.000000 0 19.000000 "This is some text"
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmcircle.xtr b/app/lib/demos/dmcircle.xtr
index 5d93443..d97370a 100644
--- a/app/lib/demos/dmcircle.xtr
+++ b/app/lib/demos/dmcircle.xtr
@@ -17,6 +17,7 @@ PARAMETER circle radius 10.000
BIGPAUSE
PARAMETER circle radius 12.000000
MOUSE 2 20.500 11.500
+MOUSE 3 13.750 13.250
MOUSE 4 13.750 13.250
PARAMETER circle radius 12.000
RESET
@@ -30,6 +31,7 @@ PARAMETER misc cmdUndo
COMMAND CircleTangent
PARAMETER circle radius 12.000
MOUSE 2 12.000 1.750
+MOUSE 3 12.250 12.000
MOUSE 4 12.250 12.000
PARAMETER circle radius 10.253
MESSAGE
@@ -43,9 +45,16 @@ RESET
COMMAND CircleCenter
PARAMETER circle radius 10.253
MOUSE 2 14.000 14.000
+MOUSE 3 5.750 5.250
MOUSE 4 5.750 5.250
MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - circle
+CURVE 3 0 0 0 0 DEMO 2 14.000000 14.000000 0 12.026013 0 0.000000 0.000000
+ E4 14.000000 26.026013 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 14.000000 26.026013 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmconn1.xtr b/app/lib/demos/dmconn1.xtr
index 25c562e..5d5ea12 100644
--- a/app/lib/demos/dmconn1.xtr
+++ b/app/lib/demos/dmconn1.xtr
@@ -2,7 +2,7 @@ VERSION 7
DEMOINIT
ORIG 8.000 0.000 0.000
PARAMETER display description-fontsize 24
-TURNOUT 1 0 0 0 0 HO -1 6.842105 1.684210 0.000000 "Kato Unitrack #4-L Turnout 2-850"
+TURNOUT 1 0 0 0 0 HO 2 6.842105 1.684210 0.000000 "Kato Unitrack #4-L Turnout 2-850"
T 11 6.842105 1.684210 270.000000
T 2 14.125570 1.684210 90.000000
T 10 13.891809 2.863926 71.000000
@@ -14,7 +14,7 @@ TURNOUT 1 0 0 0 0 HO -1 6.842105 1.684210 0.000000 "Kato Unitrack #4-L Turnout
L 11579568 0.053333 0.000000 -0.723334 7.283465 -0.723334
A 11579568 0.053333 -20.930666 0.000000 21.654000 161.000000 19.000000
END
-TURNOUT 2 0 0 0 0 HO -1 14.125570 1.684210 0.000000 "Kato Unitrack S61L (incl w/#4 TO) "
+TURNOUT 2 0 0 0 0 HO 2 14.125570 1.684210 0.000000 "Kato Unitrack S61L (incl w/#4 TO) "
T 1 14.125570 1.684210 270.000000
T 3 16.527145 1.684210 90.000000
D 0.000000 0.000000
@@ -23,7 +23,7 @@ TURNOUT 2 0 0 0 0 HO -1 14.125570 1.684210 0.000000 "Kato Unitrack S61L (incl w
L 11579568 0.053333 0.000000 0.723334 2.401575 0.723334
L 11579568 0.053333 0.000000 -0.723334 2.401575 -0.723334
END
-TURNOUT 3 0 0 0 0 HO -1 16.527145 1.684210 0.000000 "Kato Unitrack S114 (incl w/#4 TO) "
+TURNOUT 3 0 0 0 0 HO 2 16.527145 1.684210 0.000000 "Kato Unitrack S114 (incl w/#4 TO) "
T 2 16.527145 1.684210 270.000000
T 12 21.015334 1.684210 90.000000
D 0.000000 0.000000
@@ -32,7 +32,7 @@ TURNOUT 3 0 0 0 0 HO -1 16.527145 1.684210 0.000000 "Kato Unitrack S114 (incl w
L 11579568 0.053333 0.000000 0.723334 4.488189 0.723334
L 11579568 0.053333 0.000000 -0.723334 4.488189 -0.723334
END
-TURNOUT 4 0 0 0 0 HO -1 34.716122 1.684210 0.000000 "Kato Unitrack S114 (incl w/#4 TO) "
+TURNOUT 4 0 0 0 0 HO 2 34.716122 1.684210 0.000000 "Kato Unitrack S114 (incl w/#4 TO) "
T 13 34.716122 1.684210 270.000000
T 5 39.204311 1.684210 90.000000
D 0.000000 0.000000
@@ -41,7 +41,7 @@ TURNOUT 4 0 0 0 0 HO -1 34.716122 1.684210 0.000000 "Kato Unitrack S114 (incl w
L 11579568 0.053333 0.000000 0.723334 4.488189 0.723334
L 11579568 0.053333 0.000000 -0.723334 4.488189 -0.723334
END
-TURNOUT 5 0 0 0 0 HO -1 39.204311 1.684210 0.000000 "Kato Unitrack S61R (incl w/#4 TO) "
+TURNOUT 5 0 0 0 0 HO 2 39.204311 1.684210 0.000000 "Kato Unitrack S61R (incl w/#4 TO) "
T 4 39.204311 1.684210 270.000000
T 6 41.605886 1.684210 90.000000
D 0.000000 0.000000
@@ -50,7 +50,7 @@ TURNOUT 5 0 0 0 0 HO -1 39.204311 1.684210 0.000000 "Kato Unitrack S61R (incl w
L 11579568 0.053333 0.000000 0.723334 2.401575 0.723334
L 11579568 0.053333 0.000000 -0.723334 2.401575 -0.723334
END
-TURNOUT 6 0 0 0 0 HO -1 48.889351 1.684210 180.000000 "Kato Unitrack #4-R Turnout 2-851"
+TURNOUT 6 0 0 0 0 HO 2 48.889351 1.684210 180.000000 "Kato Unitrack #4-R Turnout 2-851"
T 16 48.889351 1.684210 90.000000
T 5 41.605886 1.684210 270.000000
T 7 41.839647 2.863926 289.000000
@@ -62,7 +62,7 @@ TURNOUT 6 0 0 0 0 HO -1 48.889351 1.684210 180.000000 "Kato Unitrack #4-R Turno
L 11579568 0.053333 0.000000 0.723334 7.283465 0.723334
A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 19.000000
END
-TURNOUT 7 0 0 0 0 HO -1 40.576601 3.256112 15.500000 "Kato Unitrack R550-3.5 (incl w/#4 TO) "
+TURNOUT 7 0 0 0 0 HO 2 40.576601 3.256112 15.500000 "Kato Unitrack R550-3.5 (incl w/#4 TO) "
T 8 40.576601 3.256112 285.500000
T 6 41.839647 2.863926 109.000000
D 0.000000 0.000000
@@ -71,7 +71,7 @@ TURNOUT 7 0 0 0 0 HO -1 40.576601 3.256112 15.500000 "Kato Unitrack R550-3.5 (
A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 3.500000
A 11579568 0.053333 22.377334 0.000000 -21.654000 0.000000 3.500000
END
-TURNOUT 8 0 0 0 0 HO -1 34.789943 4.043642 0.000000 "Kato Unitrack R550-15.5 (incl w/#4 TO) "
+TURNOUT 8 0 0 0 0 HO 2 34.789943 4.043642 0.000000 "Kato Unitrack R550-15.5 (incl w/#4 TO) "
T 14 34.789943 4.043642 270.000000
T 7 40.576601 3.256112 105.500000
D 0.000000 0.000000
@@ -80,7 +80,7 @@ TURNOUT 8 0 0 0 0 HO -1 34.789943 4.043642 0.000000 "Kato Unitrack R550-15.5 (
A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 15.500000
A 11579568 0.053333 22.377334 0.000000 -21.654000 0.000000 15.500000
END
-TURNOUT 9 0 0 0 0 HO -1 15.302497 3.256113 344.500000 "Kato Unitrack R550-15.5 (incl w/#4 TO) "
+TURNOUT 9 0 0 0 0 HO 2 15.302497 3.256113 344.500000 "Kato Unitrack R550-15.5 (incl w/#4 TO) "
E 15.302497 3.256113 254.500000
T 15 21.089155 4.043642 90.000000
D 0.000000 0.000000
@@ -89,7 +89,7 @@ TURNOUT 9 0 0 0 0 HO -1 15.302497 3.256113 344.500000 "Kato Unitrack R550-15.5
A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 15.500000
A 11579568 0.053333 22.377334 0.000000 -21.654000 0.000000 15.500000
END
-TURNOUT 10 0 0 0 0 HO -1 13.891809 2.863926 341.000000 "Kato Unitrack R550-3.5 (incl w/#4 TO) "
+TURNOUT 10 0 0 0 0 HO 2 13.891809 2.863926 341.000000 "Kato Unitrack R550-3.5 (incl w/#4 TO) "
T 1 13.891809 2.863926 251.000000
E 15.154856 3.256113 74.500000
D 0.000000 0.000000
@@ -98,7 +98,7 @@ TURNOUT 10 0 0 0 0 HO -1 13.891809 2.863926 341.000000 "Kato Unitrack R550-3.5
A 11579568 0.053333 20.930666 0.000000 -21.654000 0.000000 3.500000
A 11579568 0.053333 22.377334 0.000000 -21.654000 0.000000 3.500000
END
-TURNOUT 11 0 0 0 0 HO -1 6.842105 1.684210 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+TURNOUT 11 0 0 0 0 HO 2 6.842105 1.684210 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
T 1 6.842105 1.684210 90.000000
E -0.008289 1.684210 270.000000
D 0.000000 0.000000
@@ -107,7 +107,7 @@ TURNOUT 11 0 0 0 0 HO -1 6.842105 1.684210 180.000000 "Kato Unitrack Straight 6
L 11579568 0.053333 0.000000 0.723334 6.850394 0.723334
L 11579568 0.053333 0.000000 -0.723334 6.850394 -0.723334
END
-TURNOUT 12 0 0 0 0 HO -1 21.015334 1.684210 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+TURNOUT 12 0 0 0 0 HO 2 21.015334 1.684210 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
T 3 21.015334 1.684210 270.000000
T 13 27.865728 1.684210 90.000000
D 0.000000 0.000000
@@ -116,7 +116,7 @@ TURNOUT 12 0 0 0 0 HO -1 21.015334 1.684210 0.000000 "Kato Unitrack Straight 6
L 11579568 0.053333 0.000000 0.723334 6.850394 0.723334
L 11579568 0.053333 0.000000 -0.723334 6.850394 -0.723334
END
-TURNOUT 13 0 0 0 0 HO -1 27.865728 1.684210 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+TURNOUT 13 0 0 0 0 HO 2 27.865728 1.684210 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
T 12 27.865728 1.684210 270.000000
T 4 34.716122 1.684210 90.000000
D 0.000000 0.000000
@@ -125,7 +125,7 @@ TURNOUT 13 0 0 0 0 HO -1 27.865728 1.684210 0.000000 "Kato Unitrack Straight 6
L 11579568 0.053333 0.000000 0.723334 6.850394 0.723334
L 11579568 0.053333 0.000000 -0.723334 6.850394 -0.723334
END
-TURNOUT 14 0 0 0 0 HO -1 34.789943 4.043642 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+TURNOUT 14 0 0 0 0 HO 2 34.789943 4.043642 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
T 8 34.789943 4.043642 90.000000
T 15 27.939549 4.043642 270.000000
D 0.000000 0.000000
@@ -134,7 +134,7 @@ TURNOUT 14 0 0 0 0 HO -1 34.789943 4.043642 180.000000 "Kato Unitrack Straight
L 11579568 0.053333 0.000000 0.723334 6.850394 0.723334
L 11579568 0.053333 0.000000 -0.723334 6.850394 -0.723334
END
-TURNOUT 15 0 0 0 0 HO -1 27.939549 4.043642 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+TURNOUT 15 0 0 0 0 HO 2 27.939549 4.043642 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
T 14 27.939549 4.043642 90.000000
T 9 21.089155 4.043642 270.000000
D 0.000000 0.000000
@@ -143,7 +143,7 @@ TURNOUT 15 0 0 0 0 HO -1 27.939549 4.043642 180.000000 "Kato Unitrack Straight
L 11579568 0.053333 0.000000 0.723334 6.850394 0.723334
L 11579568 0.053333 0.000000 -0.723334 6.850394 -0.723334
END
-TURNOUT 16 0 0 0 0 HO -1 48.889351 1.684210 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+TURNOUT 16 0 0 0 0 HO 2 48.889351 1.684210 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
T 6 48.889351 1.684210 270.000000
E 55.739745 1.684210 90.000000
D 0.000000 0.000000
@@ -196,6 +196,158 @@ ORIG 1 26 3
MESSAGE
=========================================
END
+REGRESSION START 10 - connect
+TURNOUT 1 0 0 0 0 HO 2 6.842105 1.684210 0 0.000000 "Kato Unitrack #4-L Turnout 2-850"
+ T4 11 6.842105 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 14.125570 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 13.891809 2.863926 71.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ P "Reverse" 2
+ S 0 0.000000 0.000000 0.000000 7.283465 0.000000
+ C 0 0.000000 -21.654000 0.000000 21.654000 161.000000 19.000000
+ L3 11579568 0.053333 0.000000 -0.723334 0 7.283465 -0.723334 0
+ A3 11579568 0.053333 -20.930666 0.000000 21.654000 0 161.000000 19.000000
+ END
+TURNOUT 2 0 0 0 0 HO 2 14.125570 1.684210 0 0.000000 "Kato Unitrack S61L (incl w/#4 TO) "
+ T4 1 14.125570 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 16.527145 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.401575 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 2.401575 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 2.401575 -0.723334 0
+ END
+TURNOUT 3 0 0 0 0 HO 2 16.527145 1.684210 0 0.000000 "Kato Unitrack S114 (incl w/#4 TO) "
+ T4 2 16.527145 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 12 21.015334 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 4.488189 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 4.488189 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 4.488189 -0.723334 0
+ END
+TURNOUT 4 0 0 0 0 HO 2 34.716122 1.684210 0 0.000000 "Kato Unitrack S114 (incl w/#4 TO) "
+ T4 13 34.716122 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 39.204311 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 4.488189 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 4.488189 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 4.488189 -0.723334 0
+ END
+TURNOUT 5 0 0 0 0 HO 2 39.204311 1.684210 0 0.000000 "Kato Unitrack S61R (incl w/#4 TO) "
+ T4 4 39.204311 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 41.605886 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.401575 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 2.401575 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 2.401575 -0.723334 0
+ END
+TURNOUT 6 0 0 0 0 HO 2 48.889351 1.684210 0 180.000000 "Kato Unitrack #4-R Turnout 2-851"
+ T4 16 48.889351 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 41.605886 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 41.839647 2.863926 289.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ P "Reverse" 2
+ S 0 0.000000 0.000000 0.000000 7.283465 0.000000
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 19.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 7.283465 0.723334 0
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 19.000000
+ END
+TURNOUT 7 0 0 0 0 HO 2 40.569155 3.257929 0 15.500000 "Kato Unitrack R550-3.5? (incl w/#4 TO) "
+ T4 8 40.569155 3.257929 285.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 41.832201 2.865743 109.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 3.500000
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 3.500000
+ A3 11579568 0.053333 22.377334 0.000000 -21.654000 0 0.000000 3.500000
+ END
+TURNOUT 8 0 0 0 0 HO 2 34.765158 4.047454 0 0.000000 "Kato Unitrack R550-15.5? (incl w/#4 TO) "
+ T4 14 34.765158 4.047454 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 40.551816 3.259924 105.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 15.500000
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 15.500000
+ A3 11579568 0.053333 22.377334 0.000000 -21.654000 0 0.000000 15.500000
+ END
+TURNOUT 9 0 0 0 0 HO 2 15.195546 3.263767 0 344.500000 "Kato Unitrack R550-15.5? (incl w/#4 TO) "
+ T4 10 15.195546 3.263767 254.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 20.982204 4.051296 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 15.500000
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 15.500000
+ A3 11579568 0.053333 22.377334 0.000000 -21.654000 0 0.000000 15.500000
+ END
+TURNOUT 10 0 0 0 0 HO 2 13.912031 2.868564 0 341.000000 "Kato Unitrack R550-3.5? (incl w/#4 TO) "
+ T4 1 13.912031 2.868564 251.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 9 15.175078 3.260751 74.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 3.500000
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 3.500000
+ A3 11579568 0.053333 22.377334 0.000000 -21.654000 0 0.000000 3.500000
+ END
+TURNOUT 11 0 0 0 0 HO 2 6.842105 1.684210 0 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 1 6.842105 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 -0.008289 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 12 0 0 0 0 HO 2 21.015334 1.684210 0 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 3 21.015334 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 13 27.865728 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 13 0 0 0 0 HO 2 27.865728 1.684210 0 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 12 27.865728 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 34.716122 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 14 0 0 0 0 HO 2 34.746599 4.048730 0 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 8 34.746599 4.048730 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 27.896205 4.048730 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 15 0 0 0 0 HO 2 27.864401 4.050013 0 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 14 27.864401 4.050013 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 9 21.014007 4.050013 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 16 0 0 0 0 HO 2 48.889351 1.684210 0 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 6 48.889351 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 55.739745 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+REGRESSION END
STEP
CLEAR
MESSAGE
@@ -226,5 +378,157 @@ MOUSE 4 27.933 4.080
MESSAGE
=========================================
END
+REGRESSION START 10 - disconnect
+TURNOUT 1 0 0 0 0 HO 2 6.842105 1.684210 0 0.000000 "Kato Unitrack #4-L Turnout 2-850"
+ T4 11 6.842105 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 14.125570 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 13.891809 2.863926 71.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ P "Reverse" 2
+ S 0 0.000000 0.000000 0.000000 7.283465 0.000000
+ C 0 0.000000 -21.654000 0.000000 21.654000 161.000000 19.000000
+ L3 11579568 0.053333 0.000000 -0.723334 0 7.283465 -0.723334 0
+ A3 11579568 0.053333 -20.930666 0.000000 21.654000 0 161.000000 19.000000
+ END
+TURNOUT 2 0 0 0 0 HO 2 14.125570 1.684210 0 0.000000 "Kato Unitrack S61L (incl w/#4 TO) "
+ T4 1 14.125570 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 16.527145 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.401575 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 2.401575 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 2.401575 -0.723334 0
+ END
+TURNOUT 3 0 0 0 0 HO 2 16.527145 1.684210 0 0.000000 "Kato Unitrack S114 (incl w/#4 TO) "
+ T4 2 16.527145 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 12 21.015334 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 4.488189 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 4.488189 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 4.488189 -0.723334 0
+ END
+TURNOUT 4 0 0 0 0 HO 2 34.716122 1.684210 0 0.000000 "Kato Unitrack S114 (incl w/#4 TO) "
+ T4 13 34.716122 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 39.204311 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 4.488189 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 4.488189 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 4.488189 -0.723334 0
+ END
+TURNOUT 5 0 0 0 0 HO 2 39.204311 1.684210 0 0.000000 "Kato Unitrack S61R (incl w/#4 TO) "
+ T4 4 39.204311 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 41.605886 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.401575 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 2.401575 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 2.401575 -0.723334 0
+ END
+TURNOUT 6 0 0 0 0 HO 2 48.889351 1.684210 0 180.000000 "Kato Unitrack #4-R Turnout 2-851"
+ T4 16 48.889351 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 41.605886 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 41.839647 2.863926 289.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ P "Reverse" 2
+ S 0 0.000000 0.000000 0.000000 7.283465 0.000000
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 19.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 7.283465 0.723334 0
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 19.000000
+ END
+TURNOUT 7 0 0 0 0 HO 2 40.576601 3.256112 0 15.500000 "Kato Unitrack R550-3.5? (incl w/#4 TO) "
+ T4 8 40.576601 3.256112 285.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 41.839647 2.863926 109.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 3.500000
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 3.500000
+ A3 11579568 0.053333 22.377334 0.000000 -21.654000 0 0.000000 3.500000
+ END
+TURNOUT 8 0 0 0 0 HO 2 34.789943 4.043642 0 0.000000 "Kato Unitrack R550-15.5? (incl w/#4 TO) "
+ T4 14 34.789943 4.043642 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 40.576601 3.256112 105.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 15.500000
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 15.500000
+ A3 11579568 0.053333 22.377334 0.000000 -21.654000 0 0.000000 15.500000
+ END
+TURNOUT 9 0 0 0 0 HO 2 15.154856 3.256113 0 344.500000 "Kato Unitrack R550-15.5? (incl w/#4 TO) "
+ T4 10 15.154856 3.256113 254.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 20.941514 4.043642 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 15.500000
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 15.500000
+ A3 11579568 0.053333 22.377334 0.000000 -21.654000 0 0.000000 15.500000
+ END
+TURNOUT 10 0 0 0 0 HO 2 13.891809 2.863926 0 341.000000 "Kato Unitrack R550-3.5? (incl w/#4 TO) "
+ T4 1 13.891809 2.863926 251.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 9 15.154856 3.256113 74.500000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 21.654000 0.000000 -21.654000 0.000000 3.500000
+ A3 11579568 0.053333 20.930666 0.000000 -21.654000 0 0.000000 3.500000
+ A3 11579568 0.053333 22.377334 0.000000 -21.654000 0 0.000000 3.500000
+ END
+TURNOUT 11 0 0 0 0 HO 2 6.842105 1.684210 0 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 1 6.842105 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 -0.008289 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 12 0 0 0 0 HO 2 21.015334 1.684210 0 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 3 21.015334 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 13 27.865728 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 13 0 0 0 0 HO 2 27.865728 1.684210 0 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 12 27.865728 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 34.716122 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 14 0 0 0 0 HO 2 34.789943 4.043642 0 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 8 34.789943 4.043642 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 27.939549 4.043642 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 15 0 0 0 0 HO 2 27.791908 4.043642 0 180.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 14 27.791908 4.043642 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 9 20.941514 4.043642 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+TURNOUT 16 0 0 0 0 HO 2 48.889351 1.684210 0 0.000000 "Kato Unitrack Straight 6 7/8 2-130"
+ T4 6 48.889351 1.684210 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 55.739745 1.684210 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 6.850394 0.000000
+ L3 11579568 0.053333 0.000000 0.723334 0 6.850394 0.723334 0
+ L3 11579568 0.053333 0.000000 -0.723334 0 6.850394 -0.723334 0
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmconn2.xtr b/app/lib/demos/dmconn2.xtr
index d233edc..720c677 100644
--- a/app/lib/demos/dmconn2.xtr
+++ b/app/lib/demos/dmconn2.xtr
@@ -2,7 +2,7 @@ VERSION 7
DEMOINIT
ORIG 8.000 5.000 0.000
PARAMETER display description-fontsize 24
-TURNOUT 1 0 0 0 0 N -1 17.157895 20.894737 0.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 1 0 0 0 0 N 2 17.157895 20.894737 0.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 2 17.157895 20.894737 270.000000
T 8 24.061930 18.034992 135.000000
D 0.000000 0.000000
@@ -11,7 +11,7 @@ TURNOUT 1 0 0 0 0 N -1 17.157895 20.894737 0.000000 "Kato Unitrack Curve 9.75R
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 2 0 0 0 0 N -1 10.253860 18.034992 315.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 2 0 0 0 0 N 2 10.253860 18.034992 315.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 3 10.253860 18.034992 225.000000
T 1 17.157895 20.894737 90.000000
D 0.000000 0.000000
@@ -20,7 +20,7 @@ TURNOUT 2 0 0 0 0 N -1 10.253860 18.034992 315.000000 "Kato Unitrack Curve 9.75
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 3 0 0 0 0 N -1 7.394115 11.130957 270.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 3 0 0 0 0 N 2 7.394115 11.130957 270.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 4 7.394115 11.130957 180.000000
T 2 10.253860 18.034992 45.000000
D 0.000000 0.000000
@@ -29,7 +29,7 @@ TURNOUT 3 0 0 0 0 N -1 7.394115 11.130957 270.000000 "Kato Unitrack Curve 9.75R
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 4 0 0 0 0 N -1 10.253860 4.226922 225.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 4 0 0 0 0 N 2 10.253860 4.226922 225.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 5 10.253860 4.226922 135.000000
T 3 7.394115 11.130957 0.000000
D 0.000000 0.000000
@@ -38,7 +38,7 @@ TURNOUT 4 0 0 0 0 N -1 10.253860 4.226922 225.000000 "Kato Unitrack Curve 9.75R
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 5 0 0 0 0 N -1 17.157895 1.367177 180.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 5 0 0 0 0 N 2 17.157895 1.367177 180.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 6 17.157895 1.367177 90.000000
T 4 10.253860 4.226922 315.000000
D 0.000000 0.000000
@@ -47,7 +47,7 @@ TURNOUT 5 0 0 0 0 N -1 17.157895 1.367177 180.000000 "Kato Unitrack Curve 9.75R
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 6 0 0 0 0 N -1 24.061930 4.226922 135.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 6 0 0 0 0 N 2 24.061930 4.226922 135.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 7 24.061930 4.226922 45.000000
T 5 17.157895 1.367177 270.000000
D 0.000000 0.000000
@@ -56,7 +56,7 @@ TURNOUT 6 0 0 0 0 N -1 24.061930 4.226922 135.000000 "Kato Unitrack Curve 9.75R
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 7 0 0 0 0 N -1 29.239955 9.404947 135.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
+TURNOUT 7 0 0 0 0 N 2 29.239955 9.404947 135.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
T 10 29.239955 9.404947 45.000000
T 6 24.061930 4.226922 225.000000
D 0.000000 0.000000
@@ -65,7 +65,7 @@ TURNOUT 7 0 0 0 0 N -1 29.239955 9.404947 135.000000 "Kato Unitrack Straight 7
L 11579568 0.053333 0.000000 0.473340 7.322834 0.473340
L 11579568 0.053333 0.000000 -0.473340 7.322834 -0.473340
END
-TURNOUT 8 0 0 0 0 N -1 29.239955 12.856966 225.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
+TURNOUT 8 0 0 0 0 N 2 29.239955 12.856966 225.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
T 9 29.239955 12.856966 135.000000
T 1 24.061930 18.034992 315.000000
D 0.000000 0.000000
@@ -74,7 +74,7 @@ TURNOUT 8 0 0 0 0 N -1 29.239955 12.856966 225.000000 "Kato Unitrack Straight 7
L 11579568 0.053333 0.000000 0.473340 7.322834 0.473340
L 11579568 0.053333 0.000000 -0.473340 7.322834 -0.473340
END
-TURNOUT 9 0 0 0 0 N -1 31.026851 11.070071 225.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
+TURNOUT 9 0 0 0 0 N 2 31.026851 11.070071 225.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
T 12 31.026851 11.070071 135.000000
T 8 29.239955 12.856966 315.000000
D 0.000000 0.000000
@@ -83,7 +83,7 @@ TURNOUT 9 0 0 0 0 N -1 31.026851 11.070071 225.000000 "Kato Unitrack Straight 2
L 11579568 0.053333 0.000000 0.473340 2.527052 0.473340
L 11579568 0.053333 0.000000 -0.473340 2.527052 -0.473340
END
-TURNOUT 10 0 0 0 0 N -1 31.026851 11.191843 135.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
+TURNOUT 10 0 0 0 0 N 2 31.026851 11.191843 135.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
T 11 31.026851 11.191843 45.000000
T 7 29.239955 9.404947 225.000000
D 0.000000 0.000000
@@ -92,7 +92,7 @@ TURNOUT 10 0 0 0 0 N -1 31.026851 11.191843 135.000000 "Kato Unitrack Straight
L 11579568 0.053333 0.000000 0.473340 2.527052 0.473340
L 11579568 0.053333 0.000000 -0.473340 2.527052 -0.473340
END
-TURNOUT 11 0 0 0 0 N -1 32.813746 12.978739 135.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
+TURNOUT 11 0 0 0 0 N 2 32.813746 12.978739 135.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
E 32.813746 12.978739 45.000000
T 10 31.026851 11.191843 225.000000
D 0.000000 0.000000
@@ -101,7 +101,7 @@ TURNOUT 11 0 0 0 0 N -1 32.813746 12.978739 135.000000 "Kato Unitrack Straight
L 11579568 0.053333 0.000000 0.473340 2.527052 0.473340
L 11579568 0.053333 0.000000 -0.473340 2.527052 -0.473340
END
-TURNOUT 12 0 0 0 0 N -1 32.813747 9.283175 225.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
+TURNOUT 12 0 0 0 0 N 2 32.813747 9.283175 225.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
T 13 32.813747 9.283175 135.000000
T 9 31.026851 11.070071 315.000000
D 0.000000 0.000000
@@ -110,7 +110,7 @@ TURNOUT 12 0 0 0 0 N -1 32.813747 9.283175 225.000000 "Kato Unitrack Straight 2
L 11579568 0.053333 0.000000 0.473340 2.527052 0.473340
L 11579568 0.053333 0.000000 -0.473340 2.527052 -0.473340
END
-TURNOUT 13 0 0 0 0 N -1 32.813747 9.283175 45.000000 "Kato Unitrack Turnout 6-R 20-203"
+TURNOUT 13 0 0 0 0 N 2 32.813747 9.283175 45.000000 "Kato Unitrack Turnout 6-R 20-203"
T 12 32.813747 9.283175 315.000000
T 15 37.991772 4.105149 135.000000
T 14 37.310072 3.423450 150.000000
@@ -122,7 +122,7 @@ TURNOUT 13 0 0 0 0 N -1 32.813747 9.283175 45.000000 "Kato Unitrack Turnout 6-R
L 11579568 0.053333 0.000000 0.473340 7.322834 0.473340
A 11579568 0.053333 27.794666 0.003000 -28.268000 359.993000 15.014000
END
-TURNOUT 14 0 0 0 0 N -1 37.310072 3.423450 60.000000 "Kato Unitrack S60L {incl w/4} "
+TURNOUT 14 0 0 0 0 N 2 37.310072 3.423450 60.000000 "Kato Unitrack S60L {incl w/4} "
T 13 37.310072 3.423450 330.000000
E 38.491174 1.377721 150.000000
D 0.000000 0.000000
@@ -131,7 +131,7 @@ TURNOUT 14 0 0 0 0 N -1 37.310072 3.423450 60.000000 "Kato Unitrack S60L {incl
L 11579568 0.053333 0.000000 0.473340 2.362204 0.473340
L 11579568 0.053333 0.000000 -0.473340 2.362204 -0.473340
END
-TURNOUT 15 0 0 0 0 N -1 44.895807 1.245404 180.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 15 0 0 0 0 N 2 44.895807 1.245404 180.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 16 44.895807 1.245404 90.000000
T 13 37.991772 4.105149 315.000000
D 0.000000 0.000000
@@ -140,7 +140,7 @@ TURNOUT 15 0 0 0 0 N -1 44.895807 1.245404 180.000000 "Kato Unitrack Curve 9.75
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 16 0 0 0 0 N -1 51.799842 4.105149 135.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 16 0 0 0 0 N 2 51.799842 4.105149 135.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 17 51.799842 4.105149 45.000000
T 15 44.895807 1.245404 270.000000
D 0.000000 0.000000
@@ -149,7 +149,7 @@ TURNOUT 16 0 0 0 0 N -1 51.799842 4.105149 135.000000 "Kato Unitrack Curve 9.75
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 17 0 0 0 0 N -1 54.659587 11.009184 90.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 17 0 0 0 0 N 2 54.659587 11.009184 90.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 18 54.659587 11.009184 0.000000
T 16 51.799842 4.105149 225.000000
D 0.000000 0.000000
@@ -158,7 +158,7 @@ TURNOUT 17 0 0 0 0 N -1 54.659587 11.009184 90.000000 "Kato Unitrack Curve 9.75
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 18 0 0 0 0 N -1 51.799842 17.913219 45.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 18 0 0 0 0 N 2 51.799842 17.913219 45.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 19 51.799842 17.913219 315.000000
T 17 54.659587 11.009184 180.000000
D 0.000000 0.000000
@@ -167,7 +167,7 @@ TURNOUT 18 0 0 0 0 N -1 51.799842 17.913219 45.000000 "Kato Unitrack Curve 9.75
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 19 0 0 0 0 N -1 44.895807 20.772964 0.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 19 0 0 0 0 N 2 44.895807 20.772964 0.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 20 44.895807 20.772964 270.000000
T 18 51.799842 17.913219 135.000000
D 0.000000 0.000000
@@ -176,7 +176,7 @@ TURNOUT 19 0 0 0 0 N -1 44.895807 20.772964 0.000000 "Kato Unitrack Curve 9.75R
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 20 0 0 0 0 N -1 37.991772 17.913220 315.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
+TURNOUT 20 0 0 0 0 N 2 37.991772 17.913220 315.000000 "Kato Unitrack Curve 9.75R 249mm 45 20-100"
T 21 37.991772 17.913220 225.000000
T 19 44.895807 20.772964 90.000000
D 0.000000 0.000000
@@ -185,7 +185,7 @@ TURNOUT 20 0 0 0 0 N -1 37.991772 17.913220 315.000000 "Kato Unitrack Curve 9.7
A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
END
-TURNOUT 21 0 0 0 0 N -1 32.813747 12.735194 315.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
+TURNOUT 21 0 0 0 0 N 2 32.813747 12.735194 315.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
E 32.813747 12.735194 225.000000
T 20 37.991772 17.913220 45.000000
D 0.000000 0.000000
@@ -238,5 +238,199 @@ ORIG 2 4.0 9.0
MESSAGE
=========================================
END
+REGRESSION START 10 - figure 8 connect
+TURNOUT 1 0 0 0 0 N 2 17.157895 20.894737 0 0.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 2 17.157895 20.894737 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 8 24.061930 18.034992 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 2 0 0 0 0 N 2 10.253484 18.030856 0 315.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 3 10.253484 18.030856 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 1 17.157519 20.890601 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 3 0 0 0 0 N 2 7.395159 11.119313 0 270.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 4 7.395159 11.119313 180.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 10.254904 18.023348 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 4 0 0 0 0 N 2 10.252098 4.145742 0 225.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 5 10.252098 4.145742 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 7.392353 11.049777 0.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 5 0 0 0 0 N 2 17.154956 1.248960 0 180.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 6 17.154956 1.248960 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 10.250921 4.108705 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 6 0 0 0 0 N 2 24.058991 4.108705 0 135.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 7 24.058991 4.108705 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 17.154956 1.248960 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 7 0 0 0 0 N 2 29.237016 9.286730 0 135.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
+ T4 10 29.237016 9.286730 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 24.058991 4.108705 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 7.322834 0.000000
+ L3 11579568 0.053333 0.000000 0.473340 0 7.322834 0.473340 0
+ L3 11579568 0.053333 0.000000 -0.473340 0 7.322834 -0.473340 0
+ END
+TURNOUT 8 0 0 0 0 N 2 29.239955 12.856966 0 225.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
+ T4 9 29.239955 12.856966 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 1 24.061930 18.034992 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 7.322834 0.000000
+ L3 11579568 0.053333 0.000000 0.473340 0 7.322834 0.473340 0
+ L3 11579568 0.053333 0.000000 -0.473340 0 7.322834 -0.473340 0
+ END
+TURNOUT 9 0 0 0 0 N 2 31.026851 11.070071 0 225.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
+ T4 12 31.026851 11.070071 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 8 29.239955 12.856966 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.527052 0.000000
+ L3 11579568 0.053333 0.000000 0.473340 0 2.527052 0.473340 0
+ L3 11579568 0.053333 0.000000 -0.473340 0 2.527052 -0.473340 0
+ END
+TURNOUT 10 0 0 0 0 N 2 31.023912 11.073626 0 135.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
+ T4 11 31.023912 11.073626 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 29.237016 9.286730 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.527052 0.000000
+ L3 11579568 0.053333 0.000000 0.473340 0 2.527052 0.473340 0
+ L3 11579568 0.053333 0.000000 -0.473340 0 2.527052 -0.473340 0
+ END
+TURNOUT 11 0 0 0 0 N 2 32.810807 12.860522 0 135.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
+ T4 21 32.810807 12.860522 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 31.023912 11.073626 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.527052 0.000000
+ L3 11579568 0.053333 0.000000 0.473340 0 2.527052 0.473340 0
+ L3 11579568 0.053333 0.000000 -0.473340 0 2.527052 -0.473340 0
+ END
+TURNOUT 12 0 0 0 0 N 2 32.813747 9.283175 0 225.000000 "Kato Unitrack Straight 2 1/2 64mm 20-030"
+ T4 13 32.813747 9.283175 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 9 31.026851 11.070071 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.527052 0.000000
+ L3 11579568 0.053333 0.000000 0.473340 0 2.527052 0.473340 0
+ L3 11579568 0.053333 0.000000 -0.473340 0 2.527052 -0.473340 0
+ END
+TURNOUT 13 0 0 0 0 N 2 32.813747 9.283175 0 45.000000 "Kato Unitrack Turnout 6-R 20-203"
+ T4 12 32.813747 9.283175 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 37.991772 4.105149 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 14 37.310072 3.423450 150.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ P "Reverse" 2
+ S 0 0.000000 0.000000 0.000000 7.322834 0.000000
+ C 0 0.000000 28.268000 0.003000 -28.268000 359.993000 15.014000
+ L3 11579568 0.053333 0.000000 0.473340 0 7.322834 0.473340 0
+ A3 11579568 0.053333 27.794666 0.003000 -28.268000 0 359.993000 15.014000
+ END
+TURNOUT 14 0 0 0 0 N 2 37.310072 3.423450 0 60.000000 "Kato Unitrack S60L {incl w/4} "
+ T4 13 37.310072 3.423450 330.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 38.491174 1.377721 150.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 2.362204 0.000000
+ L3 11579568 0.053333 0.000000 0.473340 0 2.362204 0.473340 0
+ L3 11579568 0.053333 0.000000 -0.473340 0 2.362204 -0.473340 0
+ END
+TURNOUT 15 0 0 0 0 N 2 44.895807 1.245404 0 180.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 16 44.895807 1.245404 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 13 37.991772 4.105149 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 16 0 0 0 0 N 2 51.802848 4.122625 0 135.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 17 51.802848 4.122625 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 44.898813 1.262880 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 17 0 0 0 0 N 2 54.661844 11.035350 0 90.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 18 54.661844 11.035350 0.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 16 51.802099 4.131315 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 18 0 0 0 0 N 2 51.804905 18.008920 0 45.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 19 51.804905 18.008920 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 17 54.664650 11.104885 180.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 19 0 0 0 0 N 2 44.892867 20.886695 0 0.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 20 44.892867 20.886695 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 18 51.796902 18.026950 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 20 0 0 0 0 N 2 37.988832 18.026951 0 315.000000 "Kato Unitrack Curve 9.75R 249mm 45? 20-100"
+ T4 21 37.988832 18.026951 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 19 44.892867 20.886695 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+ A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+ A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+ END
+TURNOUT 21 0 0 0 0 N 2 32.810807 12.848925 0 315.000000 "Kato Unitrack Straight 7 5/16 186mm 20-010"
+ T4 11 32.810807 12.848925 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 20 37.988832 18.026951 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ S 0 0.000000 0.000000 0.000000 7.322834 0.000000
+ L3 11579568 0.053333 0.000000 0.473340 0 7.322834 0.473340 0
+ L3 11579568 0.053333 0.000000 -0.473340 0 7.322834 -0.473340 0
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmcrvtrk.xtr b/app/lib/demos/dmcrvtrk.xtr
index 884a9ab..b89e877 100644
--- a/app/lib/demos/dmcrvtrk.xtr
+++ b/app/lib/demos/dmcrvtrk.xtr
@@ -15,6 +15,7 @@ END
STEP
COMMAND CurveEndPt
MOUSE 2 6.500 1.625
+MOUSE 3 31.250 2.750
MOUSE 4 31.250 2.750
MESSAGE
_________________________________________
@@ -25,9 +26,16 @@ Click and drag on one of the Red arrows to complete the Curve.
END
STEP
MOUSE 2 31.125 2.500
+MOUSE 3 20.375 17.875
MOUSE 4 20.375 17.875
RESET
RESET
+REGRESSION START 10 - curve track end point
+CURVE 1 0 0 0 0 DEMO 2 5.835913 16.234915 0 14.625000 0 0.000000 0.000000
+ E4 20.369399 17.868440 353.587021 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 6.500000 1.625000 267.397438 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
MESSAGE
_________________________________________
@@ -37,6 +45,7 @@ STEP
PARAMETER misc cmdUndo
COMMAND CurveTangent
MOUSE 2 8.250 2.250
+MOUSE 3 31.875 2.500
MOUSE 4 31.875 2.500
MESSAGE
_________________________________________
@@ -47,6 +56,7 @@ As before, drag on one of the Red arrows to complete the Curve.
END
STEP
MOUSE 2 8.875 2.500
+MOUSE 3 17.375 19.125
MOUSE 4 17.375 19.125
RESET
RESET
@@ -55,10 +65,17 @@ _________________________________________
The next method is similar to the last except that you drag first from the center of the Curve to one End-Point.
END
+REGRESSION START 10 - curve track tangent
+CURVE 2 0 0 0 0 DEMO 2 31.875000 2.500000 0 23.626323 0 0.000000 0.000000
+ E4 8.250000 2.250000 179.393718 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 16.345411 20.305477 48.905699 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
STEP
PARAMETER misc cmdUndo
COMMAND CurveCenter
MOUSE 2 27.375 4.250
+MOUSE 3 5.000 4.250
MOUSE 4 5.000 4.250
MESSAGE
_________________________________________
@@ -67,6 +84,7 @@ Once again, drag on a Red arrow to complete the Curve.
END
STEP
MOUSE 2 5.000 4.375
+MOUSE 3 15.625 18.875
MOUSE 4 15.625 18.875
RESET
MESSAGE
@@ -75,10 +93,17 @@ _________________________________________
The last method begins by drawing a line between the two End-Points of the Curve. This forms the Chord of the Curve.
END
STEP
+REGRESSION START 10 - curve track center
+CURVE 3 0 0 0 0 DEMO 2 27.375000 4.250000 0 22.375000 0 0.000000 0.000000
+ E4 5.000000 4.250000 180.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 13.361117 21.692812 51.220950 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
RESET
PARAMETER misc cmdUndo
COMMAND CurveChord
MOUSE 2 5.625 1.500
+MOUSE 3 37.125 1.500
MOUSE 4 37.125 1.500
MESSAGE
_________________________________________
@@ -87,10 +112,17 @@ Now drag on a Red arrow to complete the Curve.
END
STEP
MOUSE 2 21.250 2.125
+MOUSE 3 20.750 16.750
MOUSE 4 20.750 16.750
RESET
MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - curve track - chord
+CURVE 4 0 0 0 0 DEMO 2 21.375000 0.991803 0 15.758197 0 0.000000 0.000000
+ E4 5.625000 1.500000 181.848091 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 37.125000 1.500000 178.151909 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmctlpnl.xtr b/app/lib/demos/dmctlpnl.xtr
index e98604d..99646d5 100644
--- a/app/lib/demos/dmctlpnl.xtr
+++ b/app/lib/demos/dmctlpnl.xtr
@@ -136,349 +136,362 @@ Now, clear the layout and turn on the Snap Grid.
END
STEP
PARAMETER grid ok
-PARAMETER misc menuFile-clear
+#PARAMETER misc menuFile-clear
PARAMETER misc cmdGridShow
PARAMETER misc cmdGridEnable
ORIG 2.000 0.000 2.000
-CLEAR
+#CLEAR
+#PARAMETER layout ok
+PARAMETER misc cmdSelectAll
+PARAMETER misc cmdDelete
MESSAGE
First step: draw the lines representing the tracks.
-We specify the line width in pixels.
+We specify the line width in pixels when at 1:1 zoom.
-To create a " line, divide the dots-per-inch (DPI) of your display by 4 and then by the drawing scale (which is 2 right now).
+To create a 1/4" line, divide the dots-per-inch (DPI) of your display by 4.
-For MS-Windows the DPI is usually 98, so choose: 98/4/2 = 12 (approximately).
-For Linux, the DPI is usually 72, so choose: 72/4/2 = 9.
+For MS-Windows the DPI is usually 98, so choose: 98/4 = 24 (approximately).
+For Linux, the DPI is usually 72, so choose: 72/4 = 18.
END
STEP
COMMAND DrawLine
PARAMETER draw linewidth 0
PARAMETER draw linecolor 0
PARAMETER GROUP draw
-PARAMETER draw linewidth 12
+PARAMETER draw linewidth 24
STEP
+KEYSTATE 2
MOUSE 2 1.000 6.000
-MOUSE 3 1.016 6.000
-MOUSE 3 1.016 6.016
-MOUSE 3 1.047 6.016
-MOUSE 3 1.078 6.016
-MOUSE 3 1.125 6.016
-MOUSE 3 1.234 6.000
-MOUSE 3 1.375 5.969
-MOUSE 3 1.531 5.969
-MOUSE 3 1.734 5.938
-MOUSE 3 1.922 5.938
-MOUSE 3 2.141 5.938
-MOUSE 3 2.391 5.938
-MOUSE 3 2.641 5.906
-MOUSE 3 2.844 5.906
-MOUSE 3 3.031 5.906
-MOUSE 3 3.203 5.906
-MOUSE 3 3.344 5.906
-MOUSE 3 3.484 5.906
-MOUSE 3 3.609 5.938
-MOUSE 3 3.625 5.938
-MOUSE 3 3.641 5.938
-MOUSE 3 3.656 5.953
-MOUSE 3 3.750 5.984
-MOUSE 3 3.781 5.984
-MOUSE 3 3.922 5.984
-MOUSE 3 4.125 5.984
-MOUSE 3 4.344 5.953
-MOUSE 3 4.594 5.891
-MOUSE 3 4.875 5.875
-MOUSE 3 5.172 5.844
-MOUSE 3 5.422 5.812
-MOUSE 3 5.625 5.781
-MOUSE 3 5.875 5.750
-MOUSE 3 6.000 5.734
-MOUSE 3 6.094 5.703
-MOUSE 3 6.125 5.703
-MOUSE 3 6.156 5.688
-MOUSE 3 6.203 5.688
-MOUSE 3 6.219 5.688
-MOUSE 3 6.234 5.688
-MOUSE 3 6.250 5.688
-MOUSE 3 6.250 5.688
-MOUSE 3 6.250 5.703
-MOUSE 3 6.250 5.719
-MOUSE 3 6.281 5.734
-MOUSE 3 6.328 5.734
-MOUSE 3 6.469 5.734
-MOUSE 3 6.625 5.734
-MOUSE 3 6.828 5.734
-MOUSE 3 7.047 5.750
-MOUSE 3 7.375 5.750
-MOUSE 3 7.656 5.781
-MOUSE 3 7.906 5.781
-MOUSE 3 8.109 5.781
-MOUSE 3 8.266 5.781
-MOUSE 3 8.406 5.781
-MOUSE 3 8.578 5.781
-MOUSE 3 8.719 5.781
-MOUSE 3 8.828 5.781
-MOUSE 3 8.875 5.781
-MOUSE 3 8.891 5.766
-MOUSE 3 8.906 5.766
-MOUSE 3 8.922 5.766
-MOUSE 3 8.922 5.781
-MOUSE 3 8.922 5.812
-MOUSE 3 8.938 5.844
-MOUSE 3 9.000 5.891
-MOUSE 3 9.078 5.953
-MOUSE 3 9.188 5.984
-MOUSE 3 9.359 6.000
-MOUSE 3 9.516 6.000
-MOUSE 3 9.656 6.000
-MOUSE 3 9.859 6.000
-MOUSE 3 10.000 6.000
-MOUSE 3 10.109 6.000
-MOUSE 3 10.250 6.000
-MOUSE 3 10.375 6.000
-MOUSE 3 10.516 6.000
-MOUSE 3 10.656 6.031
-MOUSE 3 10.797 6.031
-MOUSE 3 10.938 6.062
-MOUSE 3 10.984 6.062
-MOUSE 3 11.062 6.094
-MOUSE 3 11.078 6.094
-MOUSE 3 11.094 6.109
-MOUSE 3 11.109 6.109
-MOUSE 3 11.125 6.109
-MOUSE 3 11.125 6.109
-MOUSE 3 11.141 6.109
-MOUSE 3 11.156 6.125
-MOUSE 3 11.172 6.125
-MOUSE 3 11.188 6.125
-MOUSE 3 11.203 6.125
-MOUSE 3 11.203 6.125
-MOUSE 3 11.219 6.125
-MOUSE 3 11.234 6.109
-MOUSE 3 11.250 6.094
-MOUSE 3 11.250 6.078
-MOUSE 3 11.266 6.062
-MOUSE 3 11.281 6.062
-MOUSE 3 11.297 6.062
-MOUSE 3 11.297 6.047
-MOUSE 3 11.312 6.047
-MOUSE 3 11.328 6.047
-MOUSE 3 11.312 6.047
-MOUSE 3 11.281 6.062
-MOUSE 3 11.172 6.094
-MOUSE 3 11.062 6.094
-MOUSE 3 10.953 6.094
-MOUSE 3 10.812 6.125
-MOUSE 3 10.703 6.125
-MOUSE 3 10.562 6.125
-MOUSE 3 10.516 6.125
-MOUSE 3 10.484 6.125
-MOUSE 3 10.453 6.125
-MOUSE 3 10.422 6.125
-MOUSE 3 10.406 6.125
-MOUSE 3 10.391 6.125
-MOUSE 3 10.375 6.125
-MOUSE 3 10.375 6.109
-MOUSE 3 10.375 6.109
-MOUSE 3 10.375 6.109
-MOUSE 3 10.391 6.109
-MOUSE 3 10.422 6.109
-MOUSE 3 10.500 6.078
-MOUSE 3 10.547 6.078
-MOUSE 3 10.578 6.078
-MOUSE 3 10.625 6.078
-MOUSE 3 10.641 6.062
-MOUSE 3 10.672 6.062
-MOUSE 3 10.688 6.062
-MOUSE 3 10.719 6.062
-MOUSE 3 10.734 6.062
-MOUSE 3 10.750 6.062
-MOUSE 3 10.750 6.062
-MOUSE 3 10.766 6.062
-MOUSE 3 10.781 6.062
-MOUSE 3 10.797 6.078
-MOUSE 3 10.812 6.078
-MOUSE 3 10.844 6.078
-MOUSE 3 10.875 6.078
-MOUSE 3 10.875 6.078
-MOUSE 3 10.891 6.078
-MOUSE 3 10.906 6.078
-MOUSE 3 10.922 6.078
-MOUSE 3 10.938 6.078
-MOUSE 3 10.953 6.078
-MOUSE 3 10.969 6.078
-MOUSE 3 10.984 6.078
-MOUSE 3 10.984 6.062
-MOUSE 3 10.984 6.047
-MOUSE 3 11.000 6.031
-MOUSE 3 11.000 6.016
-MOUSE 3 11.000 6.000
-MOUSE 3 11.000 6.000
-MOUSE 3 11.000 6.000
-MOUSE 3 11.000 5.984
-MOUSE 4 11.000 5.984
-BIGPAUSE
-MOUSE 2 3.000 4.984
-MOUSE 4 8.969 5.047
-BIGPAUSE
-MOUSE 2 2.000 6.016
-MOUSE 4 2.969 5.031
-BIGPAUSE
-MOUSE 2 10.000 6.016
+#MOUSE 3 1.016 6.000
+#MOUSE 3 1.016 6.016
+#MOUSE 3 1.047 6.016
+#MOUSE 3 1.078 6.016
+#MOUSE 3 1.125 6.016
+#MOUSE 3 1.234 6.000
+#MOUSE 3 1.375 5.969
+#MOUSE 3 1.531 5.969
+#MOUSE 3 1.734 5.938
+#MOUSE 3 1.922 5.938
+#MOUSE 3 2.141 5.938
+#MOUSE 3 2.391 5.938
+#MOUSE 3 2.641 5.906
+#MOUSE 3 2.844 5.906
+#MOUSE 3 3.031 5.906
+#MOUSE 3 3.203 5.906
+#MOUSE 3 3.344 5.906
+#MOUSE 3 3.484 5.906
+#MOUSE 3 3.609 5.938
+#MOUSE 3 3.625 5.938
+#MOUSE 3 3.641 5.938
+#MOUSE 3 3.656 5.953
+#MOUSE 3 3.750 5.984
+#MOUSE 3 3.781 5.984
+#MOUSE 3 3.922 5.984
+#MOUSE 3 4.125 5.984
+#MOUSE 3 4.344 5.953
+#MOUSE 3 4.594 5.891
+#MOUSE 3 4.875 5.875
+#MOUSE 3 5.172 5.844
+#MOUSE 3 5.422 5.812
+#MOUSE 3 5.625 5.781
+#MOUSE 3 5.875 5.750
+#MOUSE 3 6.000 5.734
+#MOUSE 3 6.094 5.703
+#MOUSE 3 6.125 5.703
+#MOUSE 3 6.156 5.688
+#MOUSE 3 6.203 5.688
+#MOUSE 3 6.219 5.688
+#MOUSE 3 6.234 5.688
+#MOUSE 3 6.250 5.688
+#MOUSE 3 6.250 5.688
+#MOUSE 3 6.250 5.703
+#MOUSE 3 6.250 5.719
+#MOUSE 3 6.281 5.734
+#MOUSE 3 6.328 5.734
+#MOUSE 3 6.469 5.734
+#MOUSE 3 6.625 5.734
+#MOUSE 3 6.828 5.734
+#MOUSE 3 7.047 5.750
+#MOUSE 3 7.375 5.750
+#MOUSE 3 7.656 5.781
+#MOUSE 3 7.906 5.781
+#MOUSE 3 8.109 5.781
+#MOUSE 3 8.266 5.781
+#MOUSE 3 8.406 5.781
+#MOUSE 3 8.578 5.781
+#MOUSE 3 8.719 5.781
+#MOUSE 3 8.828 5.781
+#MOUSE 3 8.875 5.781
+#MOUSE 3 8.891 5.766
+#MOUSE 3 8.906 5.766
+#MOUSE 3 8.922 5.766
+#MOUSE 3 8.922 5.781
+#MOUSE 3 8.922 5.812
+#MOUSE 3 8.938 5.844
+#MOUSE 3 9.000 5.891
+#MOUSE 3 9.078 5.953
+#MOUSE 3 9.188 5.984
+#MOUSE 3 9.359 6.000
+#MOUSE 3 9.516 6.000
+#MOUSE 3 9.656 6.000
+#MOUSE 3 9.859 6.000
+#MOUSE 3 10.000 6.000
+#MOUSE 3 10.109 6.000
+#MOUSE 3 10.250 6.000
+#MOUSE 3 10.375 6.000
+#MOUSE 3 10.516 6.000
+#MOUSE 3 10.656 6.031
+#MOUSE 3 10.797 6.031
+#MOUSE 3 10.938 6.062
+#MOUSE 3 10.984 6.062
+#MOUSE 3 11.062 6.094
+#MOUSE 3 11.078 6.094
+#MOUSE 3 11.094 6.109
+#MOUSE 3 11.109 6.109
+#MOUSE 3 11.125 6.109
+#MOUSE 3 11.125 6.109
+#MOUSE 3 11.141 6.109
+#MOUSE 3 11.156 6.125
+#MOUSE 3 11.172 6.125
+#MOUSE 3 11.188 6.125
+#MOUSE 3 11.203 6.125
+#MOUSE 3 11.203 6.125
+#MOUSE 3 11.219 6.125
+#MOUSE 3 11.234 6.109
+#MOUSE 3 11.250 6.094
+#MOUSE 3 11.250 6.078
+#MOUSE 3 11.266 6.062
+#MOUSE 3 11.281 6.062
+#MOUSE 3 11.297 6.062
+#MOUSE 3 11.297 6.047
+#MOUSE 3 11.312 6.047
+#MOUSE 3 11.328 6.047
+#MOUSE 3 11.312 6.047
+#MOUSE 3 11.281 6.062
+#MOUSE 3 11.172 6.094
+#MOUSE 3 11.062 6.094
+#MOUSE 3 10.953 6.094
+#MOUSE 3 10.812 6.125
+#MOUSE 3 10.703 6.125
+#MOUSE 3 10.562 6.125
+#MOUSE 3 10.516 6.125
+#MOUSE 3 10.484 6.125
+#MOUSE 3 10.453 6.125
+#MOUSE 3 10.422 6.125
+#MOUSE 3 10.406 6.125
+#MOUSE 3 10.391 6.125
+#MOUSE 3 10.375 6.125
+#MOUSE 3 10.375 6.109
+#MOUSE 3 10.375 6.109
+#MOUSE 3 10.375 6.109
+#MOUSE 3 10.391 6.109
+#MOUSE 3 10.422 6.109
+#MOUSE 3 10.500 6.078
+#MOUSE 3 10.547 6.078
+#MOUSE 3 10.578 6.078
+#MOUSE 3 10.625 6.078
+#MOUSE 3 10.641 6.062
+#MOUSE 3 10.672 6.062
+#MOUSE 3 10.688 6.062
+#MOUSE 3 10.719 6.062
+#MOUSE 3 10.734 6.062
+#MOUSE 3 10.750 6.062
+#MOUSE 3 10.750 6.062
+#MOUSE 3 10.766 6.062
+#MOUSE 3 10.781 6.062
+#MOUSE 3 10.797 6.078
+#MOUSE 3 10.812 6.078
+#MOUSE 3 10.844 6.078
+#MOUSE 3 10.875 6.078
+#MOUSE 3 10.875 6.078
+#MOUSE 3 10.891 6.078
+#MOUSE 3 10.906 6.078
+#MOUSE 3 10.922 6.078
+#MOUSE 3 10.938 6.078
+#MOUSE 3 10.953 6.078
+#MOUSE 3 10.969 6.078
+#MOUSE 3 10.984 6.078
+#MOUSE 3 10.984 6.062
+#MOUSE 3 10.984 6.047
+#MOUSE 3 11.000 6.031
+#MOUSE 3 11.000 6.016
+#MOUSE 3 11.000 6.000
+#MOUSE 3 11.000 6.000
+#MOUSE 3 11.000 6.000
+#MOUSE 3 11.000 5.984
+KEYSTATE 2
+MOUSE 4 11.000 6.000
+KEYSTATE 2
+MOUSE 2 10.000 6.000
+KEYSTATE 2
MOUSE 4 9.000 5.000
+BIGPAUSE
+KEYSTATE 2
+MOUSE 2 9.000 5.000
+KEYSTATE 2
+MOUSE 4 3.000 5.000
+BIGPAUSE
+KEYSTATE 2
+MOUSE 2 3.000 5.000
+KEYSTATE 2
+MOUSE 4 2.000 6.000
+BIGPAUSE
+KEYSTATE 2
MOUSE 2 6.000 5.000
-MOUSE 3 6.000 4.984
-MOUSE 3 6.000 4.984
-MOUSE 3 6.031 4.969
-MOUSE 3 6.047 4.953
-MOUSE 3 6.078 4.938
-MOUSE 3 6.109 4.938
-MOUSE 3 6.125 4.922
-MOUSE 3 6.156 4.906
-MOUSE 3 6.188 4.891
-MOUSE 3 6.203 4.891
-MOUSE 3 6.234 4.875
-MOUSE 3 6.250 4.875
-MOUSE 3 6.250 4.875
-MOUSE 3 6.281 4.875
-MOUSE 3 6.281 4.859
-MOUSE 3 6.297 4.844
-MOUSE 3 6.312 4.844
-MOUSE 3 6.328 4.828
-MOUSE 3 6.344 4.828
-MOUSE 3 6.375 4.812
-MOUSE 3 6.375 4.797
-MOUSE 3 6.438 4.750
-MOUSE 3 6.469 4.734
-MOUSE 3 6.516 4.672
-MOUSE 3 6.547 4.656
-MOUSE 3 6.578 4.641
-MOUSE 3 6.594 4.625
-MOUSE 3 6.609 4.625
-MOUSE 3 6.625 4.609
-MOUSE 3 6.625 4.594
-MOUSE 3 6.625 4.578
-MOUSE 3 6.625 4.562
-MOUSE 3 6.625 4.547
-MOUSE 3 6.625 4.531
-MOUSE 3 6.641 4.516
-MOUSE 3 6.656 4.500
-MOUSE 3 6.672 4.484
-MOUSE 3 6.688 4.469
-MOUSE 3 6.734 4.438
-MOUSE 3 6.734 4.422
-MOUSE 3 6.750 4.422
-MOUSE 3 6.750 4.406
-MOUSE 3 6.766 4.391
-MOUSE 3 6.781 4.375
-MOUSE 3 6.797 4.359
-MOUSE 3 6.828 4.344
-MOUSE 3 6.844 4.328
-MOUSE 3 6.859 4.312
-MOUSE 3 6.859 4.297
-MOUSE 3 6.875 4.297
-MOUSE 3 6.875 4.281
-MOUSE 3 6.891 4.281
-MOUSE 3 6.906 4.281
-MOUSE 3 6.922 4.281
-MOUSE 3 6.938 4.266
-MOUSE 3 6.969 4.266
-MOUSE 3 7.047 4.250
-MOUSE 3 7.078 4.234
-MOUSE 3 7.156 4.203
-MOUSE 3 7.250 4.172
-MOUSE 3 7.297 4.125
-MOUSE 3 7.328 4.109
-MOUSE 3 7.344 4.109
-MOUSE 3 7.359 4.109
-MOUSE 3 7.359 4.094
-MOUSE 3 7.375 4.094
-MOUSE 3 7.375 4.078
-MOUSE 3 7.375 4.078
-MOUSE 3 7.391 4.062
-MOUSE 3 7.422 4.047
-MOUSE 3 7.438 4.031
-MOUSE 3 7.453 4.016
-MOUSE 3 7.469 4.000
-MOUSE 3 7.484 4.000
-MOUSE 3 7.500 4.000
-MOUSE 3 7.500 4.000
-MOUSE 3 7.500 3.984
-MOUSE 3 7.516 3.969
-MOUSE 3 7.531 3.953
-MOUSE 3 7.547 3.938
-MOUSE 3 7.562 3.922
-MOUSE 3 7.578 3.906
-MOUSE 3 7.594 3.891
-MOUSE 3 7.609 3.875
-MOUSE 3 7.625 3.875
-MOUSE 3 7.625 3.859
-MOUSE 3 7.641 3.844
-MOUSE 3 7.703 3.781
-MOUSE 3 7.719 3.766
-MOUSE 3 7.734 3.750
-MOUSE 3 7.750 3.750
-MOUSE 3 7.750 3.734
-MOUSE 3 7.750 3.734
-MOUSE 3 7.750 3.719
-MOUSE 3 7.766 3.703
-MOUSE 3 7.781 3.688
-MOUSE 3 7.797 3.672
-MOUSE 3 7.812 3.656
-MOUSE 3 7.828 3.641
-MOUSE 3 7.844 3.625
-MOUSE 3 7.859 3.625
-MOUSE 3 7.859 3.625
-MOUSE 3 7.859 3.609
-MOUSE 3 7.859 3.594
-MOUSE 3 7.859 3.578
-MOUSE 3 7.859 3.562
-MOUSE 3 7.859 3.547
-MOUSE 3 7.859 3.531
-MOUSE 3 7.859 3.516
-MOUSE 3 7.859 3.500
-MOUSE 3 7.859 3.500
-MOUSE 3 7.875 3.484
-MOUSE 3 7.875 3.469
-MOUSE 3 7.875 3.453
-MOUSE 3 7.875 3.438
-MOUSE 3 7.875 3.422
-MOUSE 3 7.875 3.406
-MOUSE 3 7.891 3.406
-MOUSE 3 7.891 3.391
-MOUSE 3 7.891 3.375
-MOUSE 3 7.906 3.375
-MOUSE 3 7.906 3.375
-MOUSE 3 7.922 3.359
-MOUSE 3 7.922 3.344
-MOUSE 3 7.938 3.328
-MOUSE 3 7.938 3.312
-MOUSE 3 7.953 3.312
-MOUSE 3 7.953 3.297
-MOUSE 3 7.953 3.281
-MOUSE 3 7.969 3.281
-MOUSE 3 7.969 3.266
-MOUSE 3 7.969 3.250
-MOUSE 3 7.969 3.250
-MOUSE 3 7.984 3.234
-MOUSE 3 7.984 3.219
-MOUSE 3 7.984 3.203
-MOUSE 3 8.000 3.203
-MOUSE 3 8.000 3.188
-MOUSE 3 8.000 3.172
-MOUSE 3 8.000 3.156
-MOUSE 3 8.000 3.141
-MOUSE 3 8.016 3.141
-MOUSE 3 8.016 3.125
-MOUSE 3 8.016 3.125
-MOUSE 3 8.016 3.109
-MOUSE 3 8.031 3.109
-MOUSE 3 8.031 3.094
-MOUSE 3 8.031 3.078
-MOUSE 3 8.031 3.062
-MOUSE 3 8.031 3.047
-MOUSE 3 8.031 3.031
-MOUSE 4 8.031 3.031
+#MOUSE 3 6.000 4.984
+#MOUSE 3 6.000 4.984
+#MOUSE 3 6.031 4.969
+#MOUSE 3 6.047 4.953
+#MOUSE 3 6.078 4.938
+#MOUSE 3 6.109 4.938
+#MOUSE 3 6.125 4.922
+#MOUSE 3 6.156 4.906
+#MOUSE 3 6.188 4.891
+#MOUSE 3 6.203 4.891
+#MOUSE 3 6.234 4.875
+#MOUSE 3 6.250 4.875
+#MOUSE 3 6.250 4.875
+#MOUSE 3 6.281 4.875
+#MOUSE 3 6.281 4.859
+#MOUSE 3 6.297 4.844
+#MOUSE 3 6.312 4.844
+#MOUSE 3 6.328 4.828
+#MOUSE 3 6.344 4.828
+#MOUSE 3 6.375 4.812
+#MOUSE 3 6.375 4.797
+#MOUSE 3 6.438 4.750
+#MOUSE 3 6.469 4.734
+#MOUSE 3 6.516 4.672
+#MOUSE 3 6.547 4.656
+#MOUSE 3 6.578 4.641
+#MOUSE 3 6.594 4.625
+#MOUSE 3 6.609 4.625
+#MOUSE 3 6.625 4.609
+#MOUSE 3 6.625 4.594
+#MOUSE 3 6.625 4.578
+#MOUSE 3 6.625 4.562
+#MOUSE 3 6.625 4.547
+#MOUSE 3 6.625 4.531
+#MOUSE 3 6.641 4.516
+#MOUSE 3 6.656 4.500
+#MOUSE 3 6.672 4.484
+#MOUSE 3 6.688 4.469
+#MOUSE 3 6.734 4.438
+#MOUSE 3 6.734 4.422
+#MOUSE 3 6.750 4.422
+#MOUSE 3 6.750 4.406
+#MOUSE 3 6.766 4.391
+#MOUSE 3 6.781 4.375
+#MOUSE 3 6.797 4.359
+#MOUSE 3 6.828 4.344
+#MOUSE 3 6.844 4.328
+#MOUSE 3 6.859 4.312
+#MOUSE 3 6.859 4.297
+#MOUSE 3 6.875 4.297
+#MOUSE 3 6.875 4.281
+#MOUSE 3 6.891 4.281
+#MOUSE 3 6.906 4.281
+#MOUSE 3 6.922 4.281
+#MOUSE 3 6.938 4.266
+#MOUSE 3 6.969 4.266
+#MOUSE 3 7.047 4.250
+#MOUSE 3 7.078 4.234
+#MOUSE 3 7.156 4.203
+#MOUSE 3 7.250 4.172
+#MOUSE 3 7.297 4.125
+#MOUSE 3 7.328 4.109
+#MOUSE 3 7.344 4.109
+#MOUSE 3 7.359 4.109
+#MOUSE 3 7.359 4.094
+#MOUSE 3 7.375 4.094
+#MOUSE 3 7.375 4.078
+#MOUSE 3 7.375 4.078
+#MOUSE 3 7.391 4.062
+#MOUSE 3 7.422 4.047
+#MOUSE 3 7.438 4.031
+#MOUSE 3 7.453 4.016
+#MOUSE 3 7.469 4.000
+#MOUSE 3 7.484 4.000
+#MOUSE 3 7.500 4.000
+#MOUSE 3 7.500 4.000
+#MOUSE 3 7.500 3.984
+#MOUSE 3 7.516 3.969
+#MOUSE 3 7.531 3.953
+#MOUSE 3 7.547 3.938
+#MOUSE 3 7.562 3.922
+#MOUSE 3 7.578 3.906
+#MOUSE 3 7.594 3.891
+#MOUSE 3 7.609 3.875
+#MOUSE 3 7.625 3.875
+#MOUSE 3 7.625 3.859
+#MOUSE 3 7.641 3.844
+#MOUSE 3 7.703 3.781
+#MOUSE 3 7.719 3.766
+#MOUSE 3 7.734 3.750
+#MOUSE 3 7.750 3.750
+#MOUSE 3 7.750 3.734
+#MOUSE 3 7.750 3.734
+#MOUSE 3 7.750 3.719
+#MOUSE 3 7.766 3.703
+#MOUSE 3 7.781 3.688
+#MOUSE 3 7.797 3.672
+#MOUSE 3 7.812 3.656
+#MOUSE 3 7.828 3.641
+#MOUSE 3 7.844 3.625
+#MOUSE 3 7.859 3.625
+#MOUSE 3 7.859 3.625
+#MOUSE 3 7.859 3.609
+#MOUSE 3 7.859 3.594
+#MOUSE 3 7.859 3.578
+#MOUSE 3 7.859 3.562
+#MOUSE 3 7.859 3.547
+#MOUSE 3 7.859 3.531
+#MOUSE 3 7.859 3.516
+#MOUSE 3 7.859 3.500
+#MOUSE 3 7.859 3.500
+#MOUSE 3 7.875 3.484
+#MOUSE 3 7.875 3.469
+#MOUSE 3 7.875 3.453
+#MOUSE 3 7.875 3.438
+#MOUSE 3 7.875 3.422
+#MOUSE 3 7.875 3.406
+#MOUSE 3 7.891 3.406
+#MOUSE 3 7.891 3.391
+#MOUSE 3 7.891 3.375
+#MOUSE 3 7.906 3.375
+#MOUSE 3 7.906 3.375
+#MOUSE 3 7.922 3.359
+#MOUSE 3 7.922 3.344
+#MOUSE 3 7.938 3.328
+#MOUSE 3 7.938 3.312
+#MOUSE 3 7.953 3.312
+#MOUSE 3 7.953 3.297
+#MOUSE 3 7.953 3.281
+#MOUSE 3 7.969 3.281
+#MOUSE 3 7.969 3.266
+#MOUSE 3 7.969 3.250
+#MOUSE 3 7.969 3.250
+#MOUSE 3 7.984 3.234
+#MOUSE 3 7.984 3.219
+#MOUSE 3 7.984 3.203
+#MOUSE 3 8.000 3.203
+#MOUSE 3 8.000 3.188
+#MOUSE 3 8.000 3.172
+#MOUSE 3 8.000 3.156
+#MOUSE 3 8.000 3.141
+#MOUSE 3 8.016 3.141
+#MOUSE 3 8.016 3.125
+#MOUSE 3 8.016 3.125
+#MOUSE 3 8.016 3.109
+#MOUSE 3 8.031 3.109
+#MOUSE 3 8.031 3.094
+#MOUSE 3 8.031 3.078
+#MOUSE 3 8.031 3.062
+#MOUSE 3 8.031 3.047
+#MOUSE 3 8.031 3.031
+KEYSTATE 2
+MOUSE 4 8.000 3.000
MESSAGE
_________________________________________
@@ -504,15 +517,15 @@ Notice that when we are in the correct position (on the 1/8" grid), the Marker l
END
STEP
MOUSE 3 2.325 6.050
-STEP
+BIGPAUSE
MOUSE 3 2.350 6.050
-STEP
+BIGPAUSE
MOUSE 3 2.375 6.050
-STEP
+BIGPAUSE
MOUSE 3 2.375 6.025
-STEP
+BIGPAUSE
MOUSE 4 2.375 6.000
-STEP
+BIGPAUSE
MOUSE 8200 2.375 6.000
HOTBARSELECT LED T1 Red LED
MOUSE 2 2.250 5.750
@@ -580,58 +593,66 @@ ORIG 2 0.000000 2.0000000
STEP
CLEAR
MESSAGE
+_________________________________________
+
Let's add signals to our siding.
The entrance to the siding will be protected by double headed signals.
+
+We'll select a signal from the HotBar and place it into position.
END
STEP
HOTBARSELECT Signals Dbl Signal 2
-MOUSE 3 2.953 7.344
+MOUSE 2 2.953 7.344
MOUSE 4 1.625 5.578
+MESSAGE
+
+We rotate the signals by Shift-Right-Click and select 90 CW on the popup menu. We can not show the popup menu in demo mode, but will simulate the effect.
+END
BIGPAUSE
+MENU 1.625 5.578 "Structure Rotate" "90 CW"
MOUSE 8200 1.625 5.578
MOUSE 2 9.859 6.641
-MOUSE 4 10.594 6.891
+MOUSE 4 10.250 6.375
+BIGPAUSE
+MENU 10.250 6.375 "Structure Rotate" "90 CCW"
BIGPAUSE
MOUSE 8200 10.594 6.891
-MESSAGE
-_________________________________________
-
-First turn off the Snap Grid.
-
-Rotate the signals and move them to the proper locations.
-
-We rotate the signals by Shift-Right-Click and select 90 CW on the popup menu. We can not show the popup menu in demo mode, but will simulate the effect.
-END
+#MESSAGE
+#_________________________________________
+#
+#First turn off the Snap Grid.
+#
+#END
STEP
-PARAMETER misc cmdGridEnable
+#PARAMETER misc cmdGridEnable
ORIG 1 0.000000 4.000000
-RESET
-MOUSE 2 1.641 5.453
-MOUSE 4 1.641 5.453
-MENU 1.641 5.453 "Move Draw Mode " "90 CW"
-KEYSTATE 2
-MOUSE 2 1.641 5.453
-KEYSTATE 2
-MOUSE 3 1.311 5.453
-KEYSTATE 2
-MOUSE 4 1.510 5.580
-BIGPAUSE
-MOUSE 6920 1.510 5.580
-STEP
-ORIG 1 8.000000 4.000000
-RESET
-MOUSE 2 10.641 6.781
-MOUSE 4 10.641 6.781
-MENU 10.641 6.781 "Move Draw Mode " "90 CCW"
-KEYSTATE 2
-MOUSE 2 10.641 6.781
-KEYSTATE 2
-MOUSE 3 10.341 6.781
-KEYSTATE 2
-MOUSE 4 10.510 6.405
-BIGPAUSE
-MOUSE 6920 10.510 6.405
+#RESET
+#MOUSE 2 1.641 5.453
+#MOUSE 4 1.641 5.453
+#MENU 1.641 5.453 "Structure Rotate" "90 CW"
+#KEYSTATE 2
+#MOUSE 2 1.641 5.453
+#KEYSTATE 2
+#MOUSE 3 1.311 5.453
+#KEYSTATE 2
+#MOUSE 4 1.510 5.580
+#BIGPAUSE
+#MOUSE 6920 1.510 5.580
+#STEP
+#ORIG 1 8.000000 4.000000
+##RESET
+#MOUSE 2 10.641 6.781
+#MOUSE 4 10.641 6.781
+#MENU 10.641 6.781 "Structure Rotate" "90 CCW"
+#KEYSTATE 2
+#MOUSE 2 10.641 6.781
+#KEYSTATE 2
+#MOUSE 3 10.341 6.781
+#KEYSTATE 2
+#MOUSE 4 10.510 6.405
+#BIGPAUSE
+#MOUSE 6920 10.510 6.405
STEP
MESSAGE
_________________________________________
@@ -644,40 +665,44 @@ HOTBARSELECT Signals Sgl Signal 1
MOUSE 3 3.250 6.375
MOUSE 4 3.250 6.375
BIGPAUSE
+MENU 3.250 6.375 "Structure Rotate" "90 CCW"
MOUSE 8200 3.250 6.375
MOUSE 2 3.250 5.375
MOUSE 4 3.250 5.375
BIGPAUSE
+MENU 3.250 5.375 "Structure Rotate" "90 CCW"
MOUSE 8200 3.250 5.375
-RESET
-MOUSE 2 3.250 6.375
-MOUSE 4 3.250 6.375
-MENU 3.250 6.375 "Move Draw Mode " "90 CCW"
-MOUSE 6920 3.250 6.375
-MOUSE 2 3.250 5.375
-MOUSE 4 3.250 5.375
-MENU 3.250 5.375 "Move Draw Mode " "90 CCW"
+#RESET
+#MOUSE 2 3.250 6.375
+#MOUSE 4 3.250 6.375
+#MENU 3.250 6.375 "Structure Rotate" "90 CCW"
+#MOUSE 6920 3.250 6.375
+#MOUSE 2 3.250 5.375
+#MOUSE 4 3.250 5.375
+#MENU 3.250 5.375 "Structure Rotate" "90 CCW"
MOUSE 6920 3.250 5.375
HOTBARSELECT Signals Sgl Signal 1
ORIG 1 8.000000 4.000000
MOUSE 2 8.750 5.625
MOUSE 4 8.750 5.625
BIGPAUSE
+MENU 8.750 5.625 "Structure Rotate" "90 CW"
MOUSE 8200 8.750 5.625
MOUSE 2 8.750 4.625
MOUSE 4 8.750 4.625
BIGPAUSE
+MENU 8.750 4.625 "Structure Rotate" "90 CW"
MOUSE 8200 8.750 4.625
#MOUSE 4 3.250 4.625
#MOUSE 8200 3.250 4.625
-RESET
-MOUSE 2 8.750 5.625
-MOUSE 4 8.750 5.625
-MENU 8.750 5.625 "Move Draw Mode " "90 CW"
-MOUSE 6920 8.750 5.625
-MOUSE 2 8.750 4.625
-MOUSE 4 8.750 4.625
-MENU 8.750 4.625 "Move Draw Mode " "90 CW"
+#RESET
+#MOUSE 2 8.750 5.625
+#MOUSE 4 8.750 5.625
+#MENU 8.750 5.625 "Structure Rotate" "90 CW"
+#MOUSE 6920 8.750 5.625
+#MOUSE 2 8.750 4.625
+#MOUSE 4 8.750 4.625
+#MENU 8.750 4.625 "Structure Rotate" "90 CW"
MOUSE 6920 8.750 4.625
RESET
ORIG 2 0.000000 2.000000
@@ -693,13 +718,13 @@ Note: Win95/Win98/WinME does not support drawing lines with flat end-caps, but o
Users on those platforms will not see the gap.
END
STEP
-ORIG 0.500 2.000 4.000
+ORIG 1 2.000 4.000
HOTBARSELECT Symbols " DOT
MOUSE 2 3.000 5.000
MOUSE 4 3.000 5.000
BIGPAUSE
MOUSE 8200 3.000 5.000
-ORIG 0.5 8.000 4.000
+ORIG 1 8.000 4.000
HOTBARSELECT Symbols " DOT
MOUSE 2 9.000 5.000
MOUSE 4 9.000 5.000
@@ -710,6 +735,8 @@ MESSAGE
_________________________________________
Add an arrow head to indicate the tracks that connect to the rest of the layout.
+
+The second arrow will be flipped 180"
END
STEP
HOTBARSELECT Symbols Arrow
@@ -718,28 +745,30 @@ MOUSE 4 11.000 5.750
BIGPAUSE
MOUSE 8200 11.000 5.750
MOUSE 2 0.500 5.750
-MOUSE 4 0.500 5.750
+MOUSE 4 1.000 6.000
+BIGPAUSE
+MENU 1.000 6.250 "Structure Rotate" "180 "
BIGPAUSE
MOUSE 8200 0.500 5.750
-RESET
+#RESET
MOUSE 6920 0.500 6.000
-MESSAGE
-_________________________________________
-
-Rotate the arrow head by 180 and move into position.
-END
-MOUSE 2 0.500 6.000
-MOUSE 4 0.500 6.000
-BIGPAUSE
-MENU 0.500 6.000 "Move Draw Mode " "180"
-KEYSTATE 2
-MOUSE 2 0.500 6.000
-KEYSTATE 2
-MOUSE 3 1.500 6.000
-KEYSTATE 2
-MOUSE 4 1.000 6.000
-BIGPAUSE
-MOUSE 6920 1.000 6.000
+#MESSAGE
+#_________________________________________
+#
+#Rotate the arrow head by 180 and move into position.
+#END
+#MOUSE 2 0.500 6.000
+#MOUSE 4 0.500 6.000
+#BIGPAUSE
+#MENU 0.500 6.000 "Structure Rotate" "180"
+#KEYSTATE 2
+#MOUSE 2 0.500 6.000
+#KEYSTATE 2
+#MOUSE 3 1.500 6.000
+#KEYSTATE 2
+#MOUSE 4 1.000 6.000
+#BIGPAUSE
+#MOUSE 6920 1.000 6.000
MESSAGE
_________________________________________
@@ -747,9 +776,10 @@ And add some labels.
END
STEP
COMMAND Text
-PARAMETER text fontsize 0 18
+PARAMETER text Fontsize 0 18
PARAMETER GROUP text
-PARAMETER text fontsize -1 48
+PARAMETER text Fontsize -1 48
+PARAMETER text Color 0
MOUSE 2 4.500 6.969
MOUSE 4 4.391 6.672
KEYSTATE 2
@@ -762,9 +792,9 @@ MOUSE 29704 4.391 6.672
MOUSE 2 4.500 6.656
MOUSE 4 4.812 6.625
MOUSE 3336 5.156 6.766
-PARAMETER text fontsize -1 48
-PARAMETER text fontsize 11 24
-PARAMETER text fontsize -1 24
+PARAMETER text Fontsize -1 48
+PARAMETER text Fontsize 11 24
+PARAMETER text Fontsize -1 24
MOUSE 2 0.500 5.016
MOUSE 4 0.641 5.016
KEYSTATE 2
@@ -776,7 +806,7 @@ MOUSE 29704 1.312 5.016
MOUSE 27656 1.312 5.016
MOUSE 25864 1.312 5.016
MOUSE 3336 3.031 3.859
-PARAMETER text fontsize -1 24
+PARAMETER text Fontsize -1 24
PARAMETER GROUP text
MOUSE 2 10.375 5.047
MOUSE 4 10.125 5.047
@@ -795,7 +825,7 @@ MOUSE 28424 10.125 5.047
MOUSE 2 10.094 5.125
MOUSE 4 9.891 5.000
MOUSE 3336 9.906 5.031
-PARAMETER text fontsize -1 24
+PARAMETER text Fontsize -1 24
PARAMETER GROUP text
CLEAR
MESSAGE
@@ -810,7 +840,7 @@ PARAMETER misc cmdGridEnable
MESSAGE
_________________________________________
-Lets move the spur track the left 3/4"
+Lets move the spur track to the left 3/4"
END
STEP
ORIG 1 5.000 4.000
@@ -839,11 +869,11 @@ MOUSE 2 7.500 6.641
MOUSE 4 11.625 4.047
BIGPAUSE
KEYSTATE 2
-MOUSE 2 8.875 4.422
+MOUSE 2 9.5 5.5
KEYSTATE 2
-MOUSE 3 8.875 4.422
+MOUSE 3 9.5 5.5
KEYSTATE 2
-MOUSE 4 7.531 4.391
+MOUSE 4 8.25 5.5
RESET
BIGPAUSE
MOUSE 6920 7.562 4.531
@@ -857,11 +887,17 @@ END
STEP
COMMAND Modify
MOUSE 2 10.984 6.047
+MOUSE 4 10.984 6.047
+MOUSE 2 10.984 6.047
BIGPAUSE
-MOUSE 4 9.672 6.000
-MOUSE 2 9.000 4.906
+MOUSE 4 9.772 6.000
+MOUSE 8200 9.672 6.000
+MOUSE 2 8.900 5.000
+MOUSE 4 8.900 5.000
+MOUSE 2 8.900 5.000
BIGPAUSE
-MOUSE 4 7.766 5.031
+MOUSE 4 7.666 5.000
+MOUSE 8200 7.666 5.000
ORIG 2 0.000 2.000
MESSAGE
_________________________________________
@@ -887,5 +923,213 @@ The cross-hairs on the LEDs and switch show the centers for drilling.
=========================================
END
+REGRESSION START 10 - control panel
+DRAW 18 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.333333 1.000000 6.000000 0 9.772000 6.000000 0
+ END
+DRAW 19 0 0 0 0 -1.250000 0.000000 0 0.000000
+ L3 0 0.333333 10.000000 6.000000 0 9.000000 5.000000 0
+ END
+DRAW 20 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.333333 7.666000 5.000000 0 3.000000 5.000000 0
+ END
+DRAW 21 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.333333 3.000000 5.000000 0 2.000000 6.000000 0
+ END
+DRAW 22 0 0 0 0 -0.813000 0.000000 0 0.000000
+ L3 0 0.333333 6.000000 5.000000 0 8.000000 3.000000 0
+ END
+STRUCTURE 23 0 0 0 0 DEMO 2 2.375000 6.000000 0 0.000000 "LED T1 Green LED "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.059000 0.000000 0.000000 0
+ A3 65280 0.013889 0.059000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.059000 0.000000 0 -0.059000 0.000000 0
+ L3 0 0.000000 0.000000 0.059000 0 0.000000 -0.059000 0
+ END
+STRUCTURE 24 0 0 0 0 DEMO 2 2.250000 5.750000 0 0.000000 "LED T1 Red LED "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.059000 0.000000 0.000000 0
+ A3 16711680 0.013889 0.059000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.059000 0.000000 0 -0.059000 0.000000 0
+ L3 0 0.000000 0.000000 0.059000 0 0.000000 -0.059000 0
+ END
+STRUCTURE 25 0 0 0 0 DEMO 2 8.375000 6.000000 0 0.000000 "LED T1 Green LED "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.059000 0.000000 0.000000 0
+ A3 65280 0.013889 0.059000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.059000 0.000000 0 -0.059000 0.000000 0
+ L3 0 0.000000 0.000000 0.059000 0 0.000000 -0.059000 0
+ END
+STRUCTURE 26 0 0 0 0 DEMO 2 8.500000 5.750000 0 0.000000 "LED T1 Red LED "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.059000 0.000000 0.000000 0
+ A3 16711680 0.013889 0.059000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.059000 0.000000 0 -0.059000 0.000000 0
+ L3 0 0.000000 0.000000 0.059000 0 0.000000 -0.059000 0
+ END
+STRUCTURE 27 0 0 0 0 DEMO 2 5.562000 5.000000 0 0.000000 "LED T1 Green LED "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.059000 0.000000 0.000000 0
+ A3 65280 0.013889 0.059000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.059000 0.000000 0 -0.059000 0.000000 0
+ L3 0 0.000000 0.000000 0.059000 0 0.000000 -0.059000 0
+ END
+STRUCTURE 28 0 0 0 0 DEMO 2 5.437000 4.750000 0 0.000000 "LED T1 Red LED "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.059000 0.000000 0.000000 0
+ A3 16711680 0.013889 0.059000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.059000 0.000000 0 -0.059000 0.000000 0
+ L3 0 0.000000 0.000000 0.059000 0 0.000000 -0.059000 0
+ END
+STRUCTURE 29 0 0 0 0 DEMO 2 2.750000 6.000000 0 0.000000 "Switch "" Push Button "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.125000 0.000000 0.000000 0
+ A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.013889 0.050000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
+ L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
+ END
+STRUCTURE 30 0 0 0 0 DEMO 2 2.500000 5.500000 0 0.000000 "Switch "" Push Button "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.125000 0.000000 0.000000 0
+ A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.013889 0.050000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
+ L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
+ END
+STRUCTURE 31 0 0 0 0 DEMO 2 8.000000 6.000000 0 0.000000 "Switch "" Push Button "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.125000 0.000000 0.000000 0
+ A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.013889 0.050000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
+ L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
+ END
+STRUCTURE 32 0 0 0 0 DEMO 2 8.250000 5.500000 0 0.000000 "Switch "" Push Button "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.125000 0.000000 0.000000 0
+ A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.013889 0.050000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
+ L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
+ END
+STRUCTURE 33 0 0 0 0 DEMO 2 5.937000 5.000000 0 0.000000 "Switch "" Push Button "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.125000 0.000000 0.000000 0
+ A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.013889 0.050000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
+ L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
+ END
+STRUCTURE 34 0 0 0 0 DEMO 2 5.687000 4.500000 0 0.000000 "Switch "" Push Button "
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.125000 0.000000 0.000000 0
+ A3 0 0.013889 0.125000 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.013889 0.050000 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.125000 0.000000 0 -0.125000 0.000000 0
+ L3 0 0.000000 0.000000 0.125000 0 0.000000 -0.125000 0
+ END
+STRUCTURE 35 0 0 0 0 DEMO 2 1.625000 5.578000 0 90.000000 "Signals Dbl Signal 2"
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.062500 0.000000 0.000000 0
+ A3 0 0.013889 0.062500 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.062500 0.000000 0 -0.062500 0.000000 0
+ L3 0 0.000000 0.000000 0.062500 0 0.000000 -0.062500 0
+ G3 16448250 0.000000 0.062500 0.000000 -0.220000 0
+ A3 0 0.013889 0.062500 0.000000 -0.220000 0 0.000000 360.000000
+ L3 0 0.000000 0.062500 -0.220000 0 -0.062500 -0.220000 0
+ L3 0 0.000000 0.000000 -0.282500 0 0.000000 -0.157500 0
+ A3 0 0.027778 0.109375 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.027778 0.109375 0.000000 -0.220000 0 0.000000 360.000000
+ L3 0 0.027778 0.000000 -0.320000 0 0.000000 -0.600000 0
+ L3 0 0.027778 -0.100000 -0.600000 0 0.100000 -0.600000 0
+ END
+STRUCTURE 36 0 0 0 0 DEMO 2 9.000000 6.375000 0 270.000000 "Signals Dbl Signal 2"
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.062500 0.000000 0.000000 0
+ A3 0 0.013889 0.062500 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.000000 0.062500 0.000000 0 -0.062500 0.000000 0
+ L3 0 0.000000 0.000000 0.062500 0 0.000000 -0.062500 0
+ G3 16448250 0.000000 0.062500 0.000000 -0.220000 0
+ A3 0 0.013889 0.062500 0.000000 -0.220000 0 0.000000 360.000000
+ L3 0 0.000000 0.062500 -0.220000 0 -0.062500 -0.220000 0
+ L3 0 0.000000 0.000000 -0.282500 0 0.000000 -0.157500 0
+ A3 0 0.027778 0.109375 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.027778 0.109375 0.000000 -0.220000 0 0.000000 360.000000
+ L3 0 0.027778 0.000000 -0.320000 0 0.000000 -0.600000 0
+ L3 0 0.027778 -0.100000 -0.600000 0 0.100000 -0.600000 0
+ END
+STRUCTURE 37 0 0 0 0 DEMO 2 3.250000 6.375000 0 270.000000 "Signals Sgl Signal 1"
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.062500 0.000000 0.000000 0
+ L3 0 0.000000 0.062500 0.000000 0 -0.062500 0.000000 0
+ L3 0 0.000000 0.000000 0.062500 0 0.000000 -0.062500 0
+ A3 0 0.013889 0.062500 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.027778 0.109375 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.027778 0.000000 -0.109375 0 0.000000 -0.600000 0
+ L3 0 0.027778 -0.100000 -0.600000 0 0.100000 -0.600000 0
+ END
+STRUCTURE 38 0 0 0 0 DEMO 2 3.250000 5.375000 0 270.000000 "Signals Sgl Signal 1"
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.062500 0.000000 0.000000 0
+ L3 0 0.000000 0.062500 0.000000 0 -0.062500 0.000000 0
+ L3 0 0.000000 0.000000 0.062500 0 0.000000 -0.062500 0
+ A3 0 0.013889 0.062500 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.027778 0.109375 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.027778 0.000000 -0.109375 0 0.000000 -0.600000 0
+ L3 0 0.027778 -0.100000 -0.600000 0 0.100000 -0.600000 0
+ END
+STRUCTURE 39 0 0 0 0 DEMO 2 7.500000 5.625000 0 90.000000 "Signals Sgl Signal 1"
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.062500 0.000000 0.000000 0
+ L3 0 0.000000 0.062500 0.000000 0 -0.062500 0.000000 0
+ L3 0 0.000000 0.000000 0.062500 0 0.000000 -0.062500 0
+ A3 0 0.013889 0.062500 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.027778 0.109375 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.027778 0.000000 -0.109375 0 0.000000 -0.600000 0
+ L3 0 0.027778 -0.100000 -0.600000 0 0.100000 -0.600000 0
+ END
+STRUCTURE 40 0 0 0 0 DEMO 2 7.500000 4.625000 0 90.000000 "Signals Sgl Signal 1"
+ D 0.000000 0.000000
+ G3 16448250 0.000000 0.062500 0.000000 0.000000 0
+ L3 0 0.000000 0.062500 0.000000 0 -0.062500 0.000000 0
+ L3 0 0.000000 0.000000 0.062500 0 0.000000 -0.062500 0
+ A3 0 0.013889 0.062500 0.000000 0.000000 0 0.000000 360.000000
+ A3 0 0.027778 0.109375 0.000000 0.000000 0 0.000000 360.000000
+ L3 0 0.027778 0.000000 -0.109375 0 0.000000 -0.600000 0
+ L3 0 0.027778 -0.100000 -0.600000 0 0.100000 -0.600000 0
+ END
+STRUCTURE 41 0 0 0 0 DEMO 2 3.000000 5.000000 0 0.000000 "Symbols "" DOT "
+ D 0.000000 0.000000
+ G3 0 0.000000 0.125000 0.000000 0.000000 0
+ END
+STRUCTURE 42 0 0 0 0 DEMO 2 7.750000 5.000000 0 0.000000 "Symbols "" DOT "
+ D 0.000000 0.000000
+ G3 0 0.000000 0.125000 0.000000 0.000000 0
+ END
+STRUCTURE 43 0 0 0 0 DEMO 2 9.750000 5.750000 0 0.000000 "Symbols Arrow "
+ D 0.000000 0.000000
+ F4 0 0.000000 3 0
+ 0.000000 0.503906 0
+ 0.000000 0.000000 0
+ 0.378906 0.250000 0
+ END
+STRUCTURE 44 0 0 0 0 DEMO 2 1.000000 6.250000 0 180.000000 "Symbols Arrow "
+ D 0.000000 0.000000
+ F4 0 0.000000 3 0
+ 0.000000 0.503906 0
+ 0.000000 0.000000 0
+ 0.378906 0.250000 0
+ END
+DRAW 45 0 0 0 0 3.937000 6.625000 0 0.000000
+ Z 0 0.000000 0.000000 0.000000 0 48.000000 "Summit"
+ END
+DRAW 46 0 0 0 0 0.641000 5.016000 0 0.000000
+ Z 0 0.000000 0.000000 0.000000 0 24.000000 "Seattle"
+ END
+DRAW 47 0 0 0 0 8.641000 5.000000 0 0.000000
+ Z 0 0.000000 0.000000 0.000000 0 24.000000 "Chicago"
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmdelund.xtr b/app/lib/demos/dmdelund.xtr
index f3c153c..5215c06 100644
--- a/app/lib/demos/dmdelund.xtr
+++ b/app/lib/demos/dmdelund.xtr
@@ -39,7 +39,9 @@ STEP
COMMAND Select
MOUSE 2 6.417 1.833
MOUSE 4 6.417 1.833
+KEYSTATE 4
MOUSE 2 11.833 2.083
+KEYSTATE 4
MOUSE 4 11.833 2.083
PARAMETER misc cmdDelete
MESSAGE
@@ -71,10 +73,18 @@ Note, only tracks within the selected area are deleted. Since the easement curv
END
STEP
MOUSE 2 3.167 3.333
+#MOUSE 3 3.167 3.333
+#MOUSE 3 22.083 0.667
MOUSE 4 22.083 0.667
PARAMETER misc cmdDelete
MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - delete
+CURVE 2 0 0 0 0 DEMO 2 21.833333 25.924310 0 24.125000 0 0.000000 0.000000
+ E4 40.128499 10.198454 40.681260 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 23.852360 1.883945 265.199288 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmdialog.xtr b/app/lib/demos/dmdialog.xtr
index 308428b..02b2bd2 100644
--- a/app/lib/demos/dmdialog.xtr
+++ b/app/lib/demos/dmdialog.xtr
@@ -14,13 +14,26 @@ MESSAGE
_________________________________________
Here we are going to make some changes to the Display dialog. Notice how this is simulated.
+First we are setting 'Draw Tunnel' to 'Normal'
END
STEP
PARAMETER display tunnels 2
+MESSAGE
+Now we're changing 'Label Font Size' to '56'
+END
+STEP
PARAMETER display description-fontsize 56
+MESSAGE
+We'll change some other options
+END
+STEP
+PAUSE 500
PARAMETER display layoutlabels 4
+PAUSE 500
PARAMETER display layoutlabels 0
+PAUSE 500
PARAMETER display mapscale 50
+PAUSE 500
PARAMETER display carhotbarlabels 4 Manuf/Proto
MESSAGE
_________________________________________
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
diff --git a/app/lib/demos/dmease.xtr b/app/lib/demos/dmease.xtr
index 0e8e406..aa55ee1 100644
--- a/app/lib/demos/dmease.xtr
+++ b/app/lib/demos/dmease.xtr
@@ -12,10 +12,128 @@ STRAIGHT 2 DEMO 1
REDRAW
RESET
MESSAGE
+_____________________________________
+
This example will show the effect of using easements while joining tracks.
-First, we'll enable easements.
+First, we will enable Cornu Easements and select Join
+END
+STEP
+PARAMETER misc cmdEasement
+PARAMETER easement val -1.0
+BIGPAUSE
+PARAMETER easement ok
+COMMAND JoinTrack
+STEP
+MESSAGE
+_____________________________________
+
+First select one end of the track
+
+END
+STEP
+MOUSE 1 1.917 12.167
+MOUSE 2 1.917 12.167
+MOUSE 3 1.917 13.167
+MOUSE 4 1.917 13.167
+MESSAGE
+_____________________________________
+
+Now the end of different track
+
+END
+STEP
+MOUSE 1 12.000 0.833
+MOUSE 2 12.000 0.833
+MOUSE 4 12.000 0.833
+MESSAGE
+_____________________________________
+
+You can reposition the ends by dragging them
+
+END
+STEP
+MOUSE 1 1.917 13.167
+MOUSE 2 1.917 13.167
+MOUSE 3 1.917 13.167
+MOUSE 3 1.917 15.000
+MOUSE 4 1.917 15.000
+MOUSE 1 12.000 0.833
+MOUSE 2 12.000 0.833
+MOUSE 3 15.000 0.833
+MOUSE 4 15.000 0.833
+MESSAGE
+_____________________________________
+
+When you are happy, Hit Enter or Space, if not use Esc
+
+END
+STEP
+MOUSE 8200 15.000 0.833
+MESSAGE
+_____________________________________
+
+The Curve is made up of Beziers parts that smooth the shape the best way it can be in the space available
+
END
+STEP
+COMMAND Describe
+PAUSE 100
+MOUSE 1 14.000 0.833
+MOUSE 2 14.000 0.833
+MOUSE 4 14.000 0.833
+BIGPAUSE
+STEP
+MESSAGE
+______________________________________
+
+Now, we'll show traditional easements instead.
+END
+REGRESSION START 10 - cornu easements
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 1.916667 32.771041 0.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 1.916667 15.000000 180.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 3 15.000000 0.833333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 37.083333 0.833333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CORNU 3 0 0 0 0 DEMO 2 1.916667 15.000000 0.000000 0.000000 0.000000 0.000000 15.000000 0.833333 90.000000 0.000000 0.000000 0.000000
+ T4 1 1.916667 15.000000 0.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 15.000000 0.833333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ W3 0 0.000000 1.916667 15.000000 1.916667 13.121710 1.928270 11.228345 2.313555 9.389995
+ SUBSEGS
+ C 0 0.000000 -51.927543 53.842537 14.583129 267.347511 3.112460
+ C 0 0.000000 -18.470423 20.421404 13.031742 258.628693 8.728303
+ SUBSEND
+ W3 0 0.000000 2.313555 9.389995 2.506197 8.470821 2.790377 7.569164 3.187261 6.718003
+ SUBSEGS
+ C 0 0.000000 -12.277827 14.343478 11.844781 245.319116 13.147641
+ SUBSEND
+ W3 0 0.000000 3.187261 6.718003 3.584145 5.866841 4.094090 5.067307 4.710759 4.358991
+ SUBSEGS
+ C 0 0.000000 -10.077407 12.331905 10.952342 229.135637 16.018322
+ SUBSEND
+ W3 0 0.000000 4.710759 4.358991 5.327429 3.650675 6.050166 3.035021 6.847004 2.537987
+ SUBSEGS
+ C 0 0.000000 -9.511226 11.881478 10.607528 211.959465 16.971764
+ SUBSEND
+ W3 0 0.000000 6.847004 2.537987 7.643842 2.040953 8.513257 1.663318 9.414707 1.399917
+ SUBSEGS
+ C 0 0.000000 -10.319905 12.273658 11.315906 196.083182 15.641856
+ SUBSEND
+ W3 0 0.000000 9.414707 1.399917 10.316158 1.136517 11.248390 0.987169 12.184477 0.911450
+ SUBSEGS
+ C 0 0.000000 -13.851949 13.192920 14.726643 184.174910 11.653463
+ SUBSEND
+ W3 0 0.000000 12.184477 0.911450 13.120565 0.835731 14.060855 0.833333 15.000000 0.833333
+ SUBSEGS
+ C 0 0.000000 -34.912615 14.559735 35.743172 179.277454 4.623642
+ SUBSEND
+ END
+REGRESSION END
+RESET
+PARAMETER misc cmdUndo
PARAMETER misc cmdEasement
STEP
PARAMETER easement val 0.500
@@ -29,10 +147,12 @@ We've selected sharp easements. The minimum radius curve we can use will be 9.7
Notice the label on the Easement button has changed to 'Sharp'.
END
STEP
-COMMAND Join
+COMMAND JoinTrack
+MOUSE 1 1.917 12.167
MOUSE 2 1.917 12.167
MOUSE 3 1.917 12.167
MOUSE 4 1.917 12.167
+MOUSE 1 12.000 0.833
MOUSE 2 12.000 0.833
MESSAGE
_________________________________________
@@ -59,14 +179,44 @@ The connecting curve is made of three tracks, the curve and two easement segment
END
STEP
COMMAND Describe
+MOUSE 1 5.750 4.083
MOUSE 2 5.750 4.083
MOUSE 4 5.750 4.083
+PAUSE 200
+MOUSE 1 14.333 0.500
MOUSE 2 14.333 0.500
MOUSE 4 14.333 0.500
+PAUSE 200
+MOUSE 1 1.917 13.333
MOUSE 2 1.917 13.333
MOUSE 4 1.917 13.333
-MESSAGE
-=========================================
-END
-STEP
+PAUSE 200
CLEAR
+
+REGRESSION START 10 - classic easements
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 1.916667 32.771041 0.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 1.916623 16.149427 180.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 6 17.232761 0.833333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 37.083333 0.833333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 4 0 0 0 0 DEMO 2 14.500000 13.416666 0 12.487372 0 0.000000 0.000000
+ T4 6 11.767239 1.231984 102.641024 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 2.315318 10.683905 347.358976 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+JOINT 5 0 0 0 0 DEMO 2 0.000000 5.465521 9.750000 7.000000 0 1 0 1.916623 16.149427 0 180.000000
+ T4 1 1.916623 16.149427 0.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 2.315318 10.683905 167.358976 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+JOINT 6 0 0 0 0 DEMO 2 0.000000 5.465521 9.750000 7.000000 0 0 0 17.232761 0.833333 0 269.999539
+ T4 2 17.232761 0.833333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 11.767239 1.231984 282.641024 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
+STEP
+
+
+
+
diff --git a/app/lib/demos/dmelev.xtr b/app/lib/demos/dmelev.xtr
index b0c524b..623c858 100644
--- a/app/lib/demos/dmelev.xtr
+++ b/app/lib/demos/dmelev.xtr
@@ -1,29 +1,29 @@
VERSION 7
DEMOINIT
-ORIG 12.000 0.000 0.000
+ORIG 6.000 0.000 0.000
PARAMETER display description-fontsize 72
-PARAMETER display labelenable 4
-CURVE 1 0 0 0 0 N -1 12.666667 13.666667 10.000000
+PARAMETER display labelenable 0
+CURVE 1 0 0 0 0 DEMO 2 12.666667 13.666667 10.000000
T 3 11.809617 3.703461 94.916566
T 5 22.410419 15.915955 167.001307
END
-STRAIGHT 2 0 0 0 0 N -1
+STRAIGHT 2 0 0 0 0 DEMO 2
T 3 27.376540 8.227390 232.674480
T 6 29.448408 9.807189 52.674480
END
-CURVE 3 0 0 0 0 N -1 13.737465 26.114701 22.494005
+CURVE 3 0 0 0 0 DEMO 2 13.737465 26.114701 22.494005
T 2 27.376540 8.227390 52.674480
T 1 11.809617 3.703461 274.916566
END
-STRAIGHT 4 0 0 0 0 N -1
+STRAIGHT 4 0 0 0 0 DEMO 2
T 5 37.111111 4.222222 270.000000
T 9 38.222222 4.222222 90.000000
END
-CURVE 5 0 0 0 0 N -1 37.111111 19.309524 15.087302
+CURVE 5 0 0 0 0 DEMO 2 37.111111 19.309524 15.087302
T 4 37.111111 4.222222 90.000000
T 1 22.410419 15.915955 347.001307
END
-TURNOUT 6 0 0 0 0 N -1 29.448408 9.807189 322.674480 "Peco-55 Medium Right SL-E395F"
+TURNOUT 6 0 0 0 0 DEMO 2 29.448408 9.807189 322.674480 "Peco-55 Medium Right SL-E395F"
T 2 29.448408 9.807189 232.674480
T 7 33.746482 13.084471 52.674480
T 8 34.035161 12.648152 62.360480
@@ -35,15 +35,15 @@ TURNOUT 6 0 0 0 0 N -1 29.448408 9.807189 322.674480 "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 7 0 0 0 0 N -1
+STRAIGHT 7 0 0 0 0 DEMO 2
T 19 42.270123 19.583746 52.674480
T 6 33.746482 13.084471 232.674480
END
-CURVE 8 0 0 0 0 N -1 45.574853 -9.388207 24.875000
+CURVE 8 0 0 0 0 DEMO 2 45.574853 -9.388207 24.875000
T 6 34.035161 12.648152 242.360480
T 18 51.462480 14.779984 103.691177
END
-TURNOUT 9 0 0 0 0 N -1 38.222222 4.222222 0.000000 "Peco-55 Medium Left SL-E396F"
+TURNOUT 9 0 0 0 0 DEMO 2 38.222222 4.222222 0.000000 "Peco-55 Medium Left SL-E396F"
T 4 38.222222 4.222222 270.000000
T 15 43.627222 4.222222 90.000000
T 13 43.592222 4.744222 80.314000
@@ -55,23 +55,23 @@ TURNOUT 9 0 0 0 0 N -1 38.222222 4.222222 0.000000 "Peco-55 Medium Left SL-E396
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 10 0 0 0 0 N -1
+STRAIGHT 10 0 0 0 0 DEMO 2
E 76.446137 4.222222 90.000000
T 14 72.333333 4.222222 270.000000
END
-STRAIGHT 11 0 0 0 0 N -1
+STRAIGHT 11 0 0 0 0 DEMO 2
T 12 49.777778 5.472222 270.000000
T 16 60.777778 5.472222 90.000000
END
-CURVE 12 0 0 0 0 N -1 49.777778 -17.192082 22.664304
+CURVE 12 0 0 0 0 DEMO 2 49.777778 -17.192082 22.664304
T 13 45.964542 5.149134 260.314000
T 11 49.777778 5.472222 90.000000
END
-STRAIGHT 13 0 0 0 0 N -1
+STRAIGHT 13 0 0 0 0 DEMO 2
T 9 43.592222 4.744222 260.314000
T 12 45.964542 5.149134 80.314000
END
-TURNOUT 14 0 0 0 0 N -1 72.333333 4.222222 180.000000 "Peco-55 Medium Right SL-E395F"
+TURNOUT 14 0 0 0 0 DEMO 2 72.333333 4.222222 180.000000 "Peco-55 Medium Right SL-E395F"
T 10 72.333333 4.222222 90.000000
T 15 66.928333 4.222222 270.000000
T 17 66.963333 4.744222 279.686000
@@ -83,36 +83,42 @@ TURNOUT 14 0 0 0 0 N -1 72.333333 4.222222 180.000000 "Peco-55 Medium Right SL-
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 15 0 0 0 0 N -1
+STRAIGHT 15 0 0 0 0 DEMO 2
T 9 43.627222 4.222222 270.000000
T 14 66.928333 4.222222 90.000000
END
-CURVE 16 0 0 0 0 N -1 60.777778 -17.192082 22.664304
+CURVE 16 0 0 0 0 DEMO 2 60.777778 -17.192082 22.664304
T 11 60.777778 5.472222 270.000000
T 17 64.591013 5.149134 99.686000
END
-STRAIGHT 17 0 0 0 0 N -1
+STRAIGHT 17 0 0 0 0 DEMO 2
T 14 66.963333 4.744222 99.686000
T 16 64.591013 5.149134 279.686000
END
-CURVE 18 0 0 0 0 N -1 64.332420 67.609950 54.375000
+CURVE 18 0 0 0 0 DEMO 2 64.332420 67.609950 54.375000
E 74.352464 14.166154 79.381036
T 8 51.462480 14.779984 283.691177
END
-CURVE 19 0 0 0 0 N -1 49.773613 9.743103 12.375000
+CURVE 19 0 0 0 0 DEMO 2 49.773613 9.743103 12.375000
T 7 42.270123 19.583746 232.674480
T 20 56.175027 20.333784 121.150374
END
-CURVE 20 0 0 0 0 N -1 64.968888 34.882599 17.000000
+CURVE 20 0 0 0 0 DEMO 2 64.968888 34.882599 17.000000
E 74.032528 20.500303 57.781104
T 19 56.175027 20.333784 301.150374
END
REDRAW
RESET
MESSAGE
-We have designed part of the layout with a siding, 2 branches and a spiral loop. We want to set Elevations.
+We have designed part of the layout with a siding, 2 branches and a spiral loop. We want to set elevations.
+
+Note: make sure you set endpoint elevations on the Display dialog.
END
STEP
+PARAMETER misc cmdDisplay
+PARAMETER display labelenable 4
+BIGPAUSE
+PARAMETER display ok
MESSAGE
_________________________________________
@@ -164,12 +170,14 @@ BIGPAUSE
MESSAGE
_________________________________________
-We can move the Elevations by using Right-Drag
+We can move the Elevation label by using Ctrl-Left-Drag
END
STEP
-MOUSE 5 74.307 14.173
-#MOUSE 6 74.227 13.453
-MOUSE 7 74.227 12.453
+KEYSTATE 4
+MOUSE 2 74.307 14.173
+#MOUSE 3 74.227 13.453
+KEYSTATE 4
+MOUSE 4 74.227 12.453
#PARAMETER elev ok
MESSAGE
_________________________________________
@@ -190,9 +198,12 @@ PARAMETER elev value 0.500000
BIGPAUSE
REDRAW
BIGPAUSE
-MOUSE 5 38.320 4.280
-MOUSE 6 38.240 3.480
-MOUSE 7 38.240 3.480
+KEYSTATE 4
+MOUSE 2 38.320 4.280
+KEYSTATE 4
+MOUSE 3 38.240 3.480
+KEYSTATE 4
+MOUSE 4 38.240 3.480
#PARAMETER elev ok
BIGPAUSE
MESSAGE
@@ -215,16 +226,19 @@ _________________________________________
We picked an End-Point on the upper track.
-XTrackCAD has computed the Elevation (2.34") at this point based on the Elevation at the siding and a combination of the of the first Elevations.
+XTrackCAD has computed the Elevation (2.33") at this point based on the Elevation at the siding and a combination of the of the first Elevations.
We create a Computed Elevation here that will be automatically adjusted whenever the other Elevations are changed.
END
STEP
PARAMETER elev mode 3
BIGPAUSE
-MOUSE 5 27.400 8.240
-MOUSE 6 28.480 7.840
-MOUSE 7 28.480 7.840
+KEYSTATE 4
+MOUSE 2 27.400 8.240
+KEYSTATE 4
+MOUSE 3 28.480 7.840
+KEYSTATE 4
+MOUSE 4 28.480 7.840
BIGPAUSE
MESSAGE
_________________________________________
@@ -244,7 +258,7 @@ REDRAW
MESSAGE
_________________________________________
-Notice at the End-Point where the tracks cross, we see the Elevation has changed from 2.34 to 2.64.
+Notice at the endpoint where the tracks cross, we see the elevation has changed from 2.33 to 2.64.
END
STEP
MESSAGE
@@ -260,9 +274,9 @@ STEP
MESSAGE
_________________________________________
-There is no End-Point on the lower track here.
+There is no endpoint on the lower track here.
-Use Shift-Left-Click to Split the track and create an End-Point we can use for an Elevation,
+Use Shift-Left-Click to Split the track and create an endpoint we can use for an elevation,
END
STEP
KEYSTATE 2
@@ -277,15 +291,18 @@ STEP
PARAMETER elev mode 3
BIGPAUSE
#REDRAW
-MOUSE 5 26.480 8.640
-MOUSE 6 25.320 8.400
-MOUSE 7 25.320 8.400
+KEYSTATE 4
+MOUSE 2 26.480 8.640
+KEYSTATE 4
+MOUSE 3 25.320 10.000
+KEYSTATE 4
+MOUSE 4 25.320 10.000
BIGPAUSE
#PARAMETER elev ok
MESSAGE
_________________________________________
-Now we want to label the Grade on this section of track.
+Now we want to label the grade on this section of track.
END
STEP
#COMMAND Elevation
@@ -294,7 +311,7 @@ STEP
MESSAGE
_________________________________________
-Again, since there is no End-Point nearby, we split the track to create an End-Point we can use,
+Again, since there is no endpoint nearby, we split the track to create an endpoint we can use,
END
STEP
KEYSTATE 2
@@ -302,14 +319,17 @@ MOUSE 2 24.280 6.240
KEYSTATE 2
MOUSE 4 24.280 6.240
MESSAGE
-and create a Grade marker.
+and create a grade marker.
END
STEP
PARAMETER elev mode 4
BIGPAUSE
-MOUSE 5 24.240 6.360
-MOUSE 6 25.680 5.1
-MOUSE 7 25.680 5.1
+KEYSTATE 4
+MOUSE 2 24.240 6.360
+KEYSTATE 4
+MOUSE 3 25.680 5.1
+KEYSTATE 4
+MOUSE 4 25.680 5.1
BIGPAUSE
#PARAMETER elev ok
MESSAGE
@@ -345,13 +365,134 @@ PARAMETER elev mode 5
BIGPAUSE
PARAMETER elev station New York City
BIGPAUSE
-MOUSE 5 55.120 5.480
-#MOUSE 6 54.960 6.120
-MOUSE 7 54.960 6.520
+KEYSTATE 4
+MOUSE 2 55.120 5.480
+#KEYSTATE 4
+#MOUSE 3 54.960 6.120
+KEYSTATE 4
+MOUSE 4 54.960 6.520
BIGPAUSE
PARAMETER elev ok
MESSAGE
=========================================
END
+REGRESSION START 10 - elevation
+CURVE 1 0 0 0 0 DEMO 2 12.666667 13.666667 0 10.000000 0 0.000000 0.000000
+ T4 3 11.809617 3.703461 94.916566 0 0.0 0.0 0.0 0.0 0 0 0 1.630665
+ T4 21 22.410419 15.915955 167.001307 0 0.0 0.0 0.0 0.0 0 0 0 1.630665
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 22 27.376540 8.227390 232.674480 10 1.103460 -0.387390 0.0 0.0 1 2 0 2.670102
+ T4 6 29.448408 9.807189 52.674480 0 0.0 0.0 0.0 0.0 0 0 0 2.670102
+ END
+CURVE 3 0 0 0 0 DEMO 2 13.737465 26.114701 0 22.494005 0 0.000000 0.000000
+ T4 22 24.278245 6.243309 62.056285 11 1.103460 -0.387390 0.0 0.0 1 3 0 2.372063
+ T4 1 11.809617 3.703461 274.916566 0 0.0 0.0 0.0 0.0 0 0 0 2.372063
+ END
+STRAIGHT 4 0 0 0 0 DEMO 2
+ T4 5 37.111111 4.222222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.514478
+ T4 9 38.222222 4.222222 90.000000 9 0.000000 0.000000 0.500000 0.500000 1 1 0 0.514478
+ END
+CURVE 5 0 0 0 0 DEMO 2 37.111111 19.309524 0 15.087302 0 0.000000 0.000000
+ T4 4 37.111111 4.222222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.681906
+ T4 21 26.521963 8.562588 314.576286 10 -1.201963 1.437412 0.0 0.0 1 2 0 0.681906
+ END
+TURNOUT 6 0 0 0 0 DEMO 2 29.448408 9.807189 0 322.674480 "Peco-55 Medium Right SL-E395F"
+ T4 2 29.448408 9.807189 232.674480 0 0.0 0.0 0.0 0.0 0 0 0 2.774644
+ T4 7 33.746482 13.084471 52.674480 0 0.0 0.0 0.0 0.0 0 0 0 2.774644
+ T4 8 34.035161 12.648152 62.360480 4 0.000000 0.000000 0.0 0.0 0 4 0 2.774644
+ 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 7 0 0 0 0 DEMO 2
+ T4 19 42.270123 19.583746 52.674480 0 0.0 0.0 0.0 0.0 0 0 0 2.984906
+ T4 6 33.746482 13.084471 232.674480 0 0.0 0.0 0.0 0.0 0 0 0 2.984906
+ END
+CURVE 8 0 0 0 0 DEMO 2 45.574853 -9.388207 0 24.875000 0 0.000000 0.000000
+ T4 6 34.035161 12.648152 242.360480 4 0.000000 0.000000 0.0 0.0 0 4 0 2.569257
+ T4 18 51.462480 14.779984 103.691177 0 0.0 0.0 0.0 0.0 0 0 0 2.569257
+ END
+TURNOUT 9 0 0 0 0 DEMO 2 38.222222 4.222222 0 0.000000 "Peco-55 Medium Left SL-E396F"
+ T4 4 38.222222 4.222222 270.000000 9 0.000000 0.000000 0.500000 0.500000 1 1 0 0.500000
+ T4 15 43.627222 4.222222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 13 43.592222 4.744222 80.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ 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 10 0 0 0 0 DEMO 2
+ E4 76.446137 4.222222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 14 72.333333 4.222222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ END
+STRAIGHT 11 0 0 0 0 DEMO 2
+ T4 23 55.080000 5.472222 270.000000 13 -0.120000 1.047778 "New York City" 0.0 1 5 0 0.500000
+ T4 16 60.777778 5.472222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ END
+CURVE 12 0 0 0 0 DEMO 2 49.777778 -17.192082 0 22.664304 0 0.000000 0.000000
+ T4 13 45.964542 5.149134 260.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 23 49.777778 5.472222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ END
+STRAIGHT 13 0 0 0 0 DEMO 2
+ T4 9 43.592222 4.744222 260.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 12 45.964542 5.149134 80.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ END
+TURNOUT 14 0 0 0 0 DEMO 2 72.333333 4.222222 0 180.000000 "Peco-55 Medium Right SL-E395F"
+ T4 10 72.333333 4.222222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 15 66.928333 4.222222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 17 66.963333 4.744222 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ 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 15 0 0 0 0 DEMO 2
+ T4 9 43.627222 4.222222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 14 66.928333 4.222222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ END
+CURVE 16 0 0 0 0 DEMO 2 60.777778 -17.192082 0 22.664304 0 0.000000 0.000000
+ T4 11 60.777778 5.472222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 17 64.591013 5.149134 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ END
+STRAIGHT 17 0 0 0 0 DEMO 2
+ T4 14 66.963333 4.744222 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 16 64.591013 5.149134 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ END
+CURVE 18 0 0 0 0 DEMO 2 64.332420 67.609950 0 54.375000 0 0.000000 0.000000
+ E4 74.352464 14.166154 79.381036 9 -0.125464 -1.713154 2.000000 2.000000 1 1 0 2.208882
+ T4 8 51.462480 14.779984 283.691177 0 0.0 0.0 0.0 0.0 0 0 0 2.208882
+ END
+CURVE 19 0 0 0 0 DEMO 2 49.773613 9.743103 0 12.375000 0 0.000000 0.000000
+ T4 7 42.270123 19.583746 232.674480 0 0.0 0.0 0.0 0.0 0 0 0 3.317291
+ T4 20 56.175027 20.333784 121.150374 0 0.0 0.0 0.0 0.0 0 0 0 3.317291
+ END
+CURVE 20 0 0 0 0 DEMO 2 64.968888 34.882599 0 17.000000 0 0.000000 0.000000
+ E4 74.032528 20.500303 57.781104 9 0.000000 0.000000 4.000000 4.000000 1 1 0 3.755003
+ T4 19 56.175027 20.333784 301.150374 0 0.0 0.0 0.0 0.0 0 0 0 3.755003
+ END
+CURVE 21 0 0 0 0 DEMO 2 37.111111 19.309524 0 15.087302 0 0.000000 0.000000
+ T4 5 26.521963 8.562588 134.576286 10 -1.201963 1.437412 0.0 0.0 1 2 0 0.946112
+ T4 1 22.410418 15.915955 347.001307 0 0.0 0.0 0.0 0.0 0 0 0 0.946112
+ END
+CURVE 22 0 0 0 0 DEMO 2 13.737465 26.114701 0 22.494005 0 0.000000 0.000000
+ T4 2 27.376540 8.227390 52.674480 0 0.0 0.0 0.0 0.0 0 0 0 2.588158
+ T4 3 24.278245 6.243309 242.056285 11 0.000000 0.000000 0.0 0.0 1 3 0 2.588158
+ END
+STRAIGHT 23 0 0 0 0 DEMO 2
+ T4 12 49.777778 5.472222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 11 55.080000 5.472222 90.000000 13 -0.120000 1.047778 "New York City" 0.0 1 5 0 0.500000
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmexcept.xtr b/app/lib/demos/dmexcept.xtr
index a507771..ae1c8aa 100644
--- a/app/lib/demos/dmexcept.xtr
+++ b/app/lib/demos/dmexcept.xtr
@@ -6,23 +6,23 @@ ORIG 4.000 0.000 0.000
PARAMETER display description-fontsize 64
PARAMETER layout mintrackradius 9.000000
PARAMETER layout maxtrackgrade 5.000000
-CURVE 1 0 128 0 0 N 2 9.328210 12.681510 0 9.000000 0 -0.662481 0.508964
+CURVE 1 0 128 0 0 DEMO 2 9.328210 12.681510 0 9.000000 0 -0.662481 0.508964
T 3 10.311823 3.735421 83.725592
E 0.736918 15.362872 17.333261
END
-STRAIGHT 2 0 0 0 0 N 2
+STRAIGHT 2 0 0 0 0 DEMO 2
T 3 18.591303 5.367316 253.974133
E 23.914162 6.896222 73.974133
END
-CURVE 3 0 0 0 0 N 2 4.886341 53.080886 0 49.642831 0 0.000000 0.000000
+CURVE 3 0 0 0 0 DEMO 2 4.886341 53.080886 0 49.642831 0 0.000000 0.000000
T 2 18.591303 5.367316 73.974133
T 1 10.311823 3.735421 263.725592
END
-STRAIGHT 4 0 0 0 0 N 2
+STRAIGHT 4 0 0 0 0 DEMO 2
E 4.698097 0.130693 253.974133 9 -0.010597 0.869307 1.000000
T 5 14.456557 2.933654 73.974133 11 0.855943 -1.308654
END
-STRAIGHT 5 0 0 0 0 N 2
+STRAIGHT 5 0 0 0 0 DEMO 2
E 23.748581 5.602640 73.974133 9 -1.123581 -1.415140 1.750000
T 4 14.456557 2.933654 253.974133 11 0.855943 -1.308654
END
@@ -86,4 +86,46 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - exception tracks
+CURVE 1 0 128 0 0 DEMO 2 9.437500 11.687500 0 8.000000 0 -0.662481 0.508964
+ T4 3 10.311823 3.735421 83.725592 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 1.800796 14.070933 17.333261 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 3 18.591303 5.367316 253.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 23.914162 6.896222 73.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 3 0 0 0 0 DEMO 2 4.886341 53.080886 0 49.642831 0 0.000000 0.000000
+ T4 2 18.591303 5.367316 73.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 1 10.311823 3.735421 263.725592 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 4 0 0 0 0 DEMO 2
+ E4 4.698097 0.130693 253.974133 9 -0.010597 0.869307 1.000000 1.000000 1 1 0 1.320151
+ T4 5 14.456557 2.933654 73.974133 11 0.855943 -1.308654 0.0 0.0 1 3 0 1.320151
+ END
+STRAIGHT 5 0 0 0 0 DEMO 2
+ E4 23.748581 5.602640 73.974130 9 -1.123581 -1.415140 2.250000 2.250000 1 1 0 1.945151
+ T4 4 14.456557 2.933654 253.974133 11 0.855943 -1.308654 0.0 0.0 1 3 0 1.945151
+ END
+CURVE 1 0 128 0 0 DEMO 2 9.437500 11.687500 0 8.000000 0 -0.662481 0.508964
+ T4 3 10.311823 3.735421 83.725592 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 1.800796 14.070933 17.333261 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 3 18.591303 5.367316 253.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 23.914162 6.896222 73.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 3 0 0 0 0 DEMO 2 4.886341 53.080886 0 49.642831 0 0.000000 0.000000
+ T4 2 18.591303 5.367316 73.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 1 10.311823 3.735421 263.725592 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 4 0 0 0 0 DEMO 2
+ E4 4.698097 0.130693 253.974133 9 -0.010597 0.869307 1.000000 1.000000 1 1 0 1.320151
+ T4 5 14.456557 2.933654 73.974133 11 0.855943 -1.308654 0.0 0.0 1 3 0 1.320151
+ END
+STRAIGHT 5 0 0 0 0 DEMO 2
+ E4 23.748581 5.602640 73.974130 9 -1.123581 -1.415140 2.250000 2.250000 1 1 0 1.945151
+ T4 4 14.456557 2.933654 253.974133 11 0.855943 -1.308654 0.0 0.0 1 3 0 1.945151
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmextend.xtr b/app/lib/demos/dmextend.xtr
index 1996c42..1b8deff 100644
--- a/app/lib/demos/dmextend.xtr
+++ b/app/lib/demos/dmextend.xtr
@@ -1,6 +1,6 @@
VERSION 2
DEMOINIT
-ORIG 8.000 0.000 0.000
+ORIG 4.000 0.000 0.000
TURNOUT 1 DEMO 1 6.916667 2.666667 0.000000 "Peco-55 Med Left SL-E396F"
E 6.916667 2.666667 270.000000
E 12.321667 2.666667 90.000000
@@ -19,14 +19,14 @@ STRAIGHT 2 DEMO 1
REDRAW
RESET
MESSAGE
-The unconnected End-Point of any track can be extended with the <Modify> command using Right-Drag.
+The unconnected endpoint of any track can also be extended with the <Modify> command using Right-Drag.
END
STEP
COMMAND Modify
MESSAGE
_________________________________________
-Select the End-Point and Right-Drag.
+Select the endoint and Right-Drag.
END
BIGPAUSE
MOUSE 5 12.250 2.750
@@ -51,12 +51,12 @@ MOUSE 7 26.333 12.417
MESSAGE
_________________________________________
-If you extend a Straight or Curved flex track and enable Easements then an Easement curve will be automatically generated when you extend the track.
+If you extend a straight or curved flex track and enable Easements then an Easement curve will be automatically generated when you extend the track.
END
STEP
PARAMETER misc cmdEasement
BIGPAUSE
-PARAMETER easement val 0.500
+PARAMETER easement val -1.0
BIGPAUSE
PARAMETER easement ok
MOUSE 5 12 1
@@ -66,4 +66,43 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - extend
+TURNOUT 1 0 0 0 0 DEMO 2 6.916667 2.666667 0 0.000000 "Peco-55 Med Left SL-E396F"
+ E4 6.916667 2.666667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 12.321667 2.666667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 12.286667 3.188667 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 2 0 0 0 0 DEMO 2
+ E4 2.000000 1.000000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 7.000000 1.000000 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 3 0 0 0 0 DEMO 2 12.321667 17.666667 0 15.000000 0 0.000000 0.000000
+ E4 26.387026 12.454596 20.332733 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 1 12.321667 2.666667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 4 0 0 0 0 DEMO 2 12.000000 19.456200 0 17.750000 0 0.000000 0.000000
+ E4 27.955056 11.678110 25.989234 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 21.407481 4.404230 237.994617 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CORNU 5 0 0 0 0 DEMO 2 7.000000 1.000000 270.000000 0.000000 0.000000 0.000000 21.407481 4.404230 57.994617 17.750000 12.000000 19.456200
+ T4 2 7.000000 1.000000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 21.407481 4.404230 57.994617 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ W3 0 0.000000 7.000000 1.000000 9.503384 1.000000 12.022315 1.089191 14.466729 1.629346
+ SUBSEGS
+ C 0 0.000000 -52.368193 7.316059 53.367239 176.234238 4.111563
+ C 0 0.000000 -25.732586 9.068549 26.789347 167.890545 8.350670
+ SUBSEND
+ W3 0 0.000000 14.466729 1.629346 16.911144 2.169502 19.284616 3.077439 21.407481 4.404230
+ SUBSEGS
+ C 0 0.000000 -22.076089 9.860159 23.219465 148.461646 19.494056
+ SUBSEND
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmflip.xtr b/app/lib/demos/dmflip.xtr
index b6ad7ab..80921d7 100644
--- a/app/lib/demos/dmflip.xtr
+++ b/app/lib/demos/dmflip.xtr
@@ -4,6 +4,7 @@ VERSION 10
DEMOINIT
ORIG 4.000 0.000 0.000
PARAMETER display description-fontsize 64
+PARAMETER display labelenable 15
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
@@ -186,5 +187,7 @@ REDRAW
MESSAGE
=========================================
END
+REGRESSION START 10 - flip
+REGRESSION END
STEP
CLEAR
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
diff --git a/app/lib/demos/dmhelix.xtr b/app/lib/demos/dmhelix.xtr
index 1a54c48..f02c1d6 100644
--- a/app/lib/demos/dmhelix.xtr
+++ b/app/lib/demos/dmhelix.xtr
@@ -3,11 +3,11 @@ DEMOINIT
ORIG 10.000 0.000 0.000
PARAMETER display labelscale 10
PARAMETER display description-fontsize 144
-STRAIGHT 1 0 0 0 0 N -1
+STRAIGHT 1 0 0 0 0 DEMO 2
E 23.086096 1.459535 254.675892
E 72.500000 15.000000 74.675892
END
-STRAIGHT 2 0 0 0 0 N -1
+STRAIGHT 2 0 0 0 0 DEMO 2
E 1.770859 28.642902 189.520022
E 5.625000 51.625000 9.520022
END
@@ -104,6 +104,10 @@ MOUSE 3 15.375 20.500
MOUSE 3 16.000 16.000
STEP
MOUSE 4 16.000 16.000
+PARAMETER display labelenable 1
+COMMAND MoveLabel
+MOUSE 2 16.000 16.000
+MOUSE 4 16.000 16.000
RESET
MESSAGE
_________________________________________
@@ -111,7 +115,7 @@ _________________________________________
Next, join the 2 straight tracks to the helix in the same way we join to a circle.
END
STEP
-COMMAND Join
+COMMAND JoinTrack
MOUSE 2 1.875 30.000
MOUSE 4 1.875 30.000
MOUSE 2 1.000 17.375
@@ -182,6 +186,7 @@ _________________________________________
The helix description can be moved by the <Move Label> command.
END
+PARAMETER display labelenable 1
COMMAND MoveLabel
MOUSE 2 15.875 16.125
MOUSE 3 16.125 6.250
@@ -189,5 +194,27 @@ MOUSE 4 16.125 6.250
MESSAGE
=========================================
END
+REGRESSION START 10 - helix
+STRAIGHT 1 0 0 0 0 DEMO 2
+ T4 5 25.749076 2.189249 254.675892 0 0.0 0.0 0.0 0.0 0 0 0 1.000000
+ E4 72.500000 15.000000 74.675892 0 0.0 0.0 0.0 0.0 0 0 0 1.000000
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 4 2.583150 33.486562 189.520022 0 0.0 0.0 0.0 0.0 0 0 0 13.000000
+ E4 5.625000 51.625000 9.520022 0 0.0 0.0 0.0 0.0 0 0 0 13.000000
+ END
+CURVE 3 0 0 0 0 DEMO 2 16.000000 16.000000 0 15.000000 4 0.125000 -9.750000
+ T4 5 15.375542 1.013004 92.385944 9 0.000000 0.000000 1.000000 1.000000 1 1 0 7.000000
+ T4 4 1.002118 16.252065 0.962864 9 0.000000 0.000000 13.000000 13.000000 1 1 0 7.000000
+ END
+CURVE 4 0 0 0 0 DEMO 2 116.974302 14.302953 0 115.988562 0 0.000000 0.000000
+ T4 3 1.002118 16.252065 180.962864 9 0.000000 0.000000 13.000000 13.000000 1 1 0 13.000000
+ T4 2 2.583150 33.486562 9.520022 0 0.0 0.0 0.0 0.0 0 0 0 13.000000
+ END
+CURVE 5 0 0 0 0 DEMO 2 16.787253 34.894082 0 33.910476 0 0.000000 0.000000
+ T4 1 25.749076 2.189249 74.675892 0 0.0 0.0 0.0 0.0 0 0 0 1.000000
+ T4 3 15.375542 1.013004 272.385944 9 0.000000 0.000000 1.000000 1.000000 1 1 0 1.000000
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmhndld.xtr b/app/lib/demos/dmhndld.xtr
index 2647818..cf3c477 100644
--- a/app/lib/demos/dmhndld.xtr
+++ b/app/lib/demos/dmhndld.xtr
@@ -3,11 +3,11 @@
VERSION 10
DEMOINIT
ORIG 4.000 13.000 6.000
-STRAIGHT 1 0 0 0 0 N 2
+STRAIGHT 1 0 0 0 0 DEMO 2
E 13.625000 6.625000 243.300294
E 34.875000 17.312500 63.300294
END
-CURVE 2 0 0 0 0 N 2 34.992582 -3.178627 0 16.250000 0 0.000000 0.000000
+CURVE 2 0 0 0 0 DEMO 2 34.992582 -3.178627 0 16.250000 0 0.000000 0.000000
E 19.937500 2.937500 202.109448
E 40.001921 12.279996 107.954824
END
@@ -107,5 +107,67 @@ RESET
MESSAGE
=========================================
END
+REGRESSION START 10 - handlaid turnout
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 13.625000 6.625000 243.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 20.692306 10.179439 63.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 2 0 0 0 0 DEMO 2 34.992582 -3.178627 0 16.250000 0 0.000000 0.000000
+ E4 19.937500 2.937500 202.109448 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 12 22.817510 7.583813 41.475827 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 3 0 0 0 0 DEMO 2
+ T4 7 21.323206 10.496745 243.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 34.875000 17.312500 63.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 4 0 0 0 0 DEMO 2
+ T4 7 21.310280 10.521238 241.053198 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 22.150312 10.985857 61.053198 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 5 0 0 0 0 DEMO 2 16.103354 21.918786 0 12.493784 0 0.000000 0.000000
+ T4 6 24.004126 12.240333 50.774343 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 22.150312 10.985857 241.053198 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 6 0 0 0 0 DEMO 2
+ T4 5 24.004126 12.240333 230.774343 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 24.277659 12.463625 50.774343 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 7 0 8 0 0 DEMO 2 20.692306 10.179439 0 243.300294 " Hand Laid Turnout, Angle=12.5 "
+ T4 1 20.692306 10.179439 243.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 21.323206 10.496745 63.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 21.310280 10.521238 61.053198 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ P "Reverse" 2
+ S 0 0.000000 0.000000 0.000000 0.000000 -0.706200
+ S 0 0.000000 0.000000 0.000000 0.027690 -0.705657
+ END
+CURVE 8 0 0 0 0 DEMO 2 34.992582 -3.178627 0 16.250000 0 0.000000 0.000000
+ T4 12 23.296269 8.102275 223.964248 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 40.001921 12.279996 107.954824 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 9 0 0 0 0 DEMO 2 29.929997 1.296563 0 9.492997 0 0.000000 0.000000
+ T4 12 23.303539 8.094140 225.730320 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 23.481733 8.263404 47.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 10 0 0 0 0 DEMO 2
+ T4 9 23.481733 8.263404 227.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 11 26.592848 11.142944 47.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 11 0 0 0 0 DEMO 2
+ T4 10 26.592848 11.142944 227.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 26.851986 11.382793 47.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 12 0 8 0 0 DEMO 2 22.817510 7.583813 0 221.475827 " Hand Laid Turnout, Angle=12.4 "
+ T4 2 22.817510 7.583813 221.475827 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 8 23.296269 8.102275 43.964248 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 9 23.303539 8.094140 45.730320 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D 0.000000 0.000000
+ P "Normal" 1
+ P "Reverse" 2
+ S 0 0.000000 0.000000 0.000000 -0.015323 -0.705534
+ S 0 0.000000 0.000000 0.000000 -0.026159 -0.704254
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmintro.xtr b/app/lib/demos/dmintro.xtr
index 602b436..200b441 100644
--- a/app/lib/demos/dmintro.xtr
+++ b/app/lib/demos/dmintro.xtr
@@ -1,6 +1,6 @@
VERSION 1
DEMOINIT
-ORIG 12.000 0.000 0.000
+ORIG 6.000 0.000 0.000
PARAMETER display description-fontsize 18
REDRAW
RESET
@@ -38,23 +38,23 @@ You can adjust the speed of the demonstration with the Speed control.
END
STEP
CLEAR
-DRAW 1 0 0 0 0 0.000000 0.000000 0 0.000000
+DRAW 1 0.000000 0.000000 0.000000
L3 0 0.444444 0.000000 0.000000 0 72.000000 0.000000 0
END
-DRAW 2 0 0 0 0 0.000000 0.000000 0 0.000000
- L3 0 0.444444 72.000000 0.000000 0 72.000000 36.000000 0
+DRAW 2 0.000000 0.000000 0.000000
+ L3 0 0.444444 72.000000 0.000000 0 72.000000 24.000000 0
END
-DRAW 3 0 0 0 0 0.000000 0.000000 0 0.000000
- L3 0 0.444444 72.000000 36.000000 0 0.000000 36.000000 0
+DRAW 3 0.000000 0.000000 0.000000
+ L3 0 0.444444 72.000000 24.000000 0 0.000000 24.000000 0
END
-DRAW 4 0 0 0 0 0.000000 0.000000 0 0.000000
- L3 0 0.444444 0.000000 36.000000 0 0.000000 0.000000 0
+DRAW 4 0.000000 0.000000 0.000000
+ L3 0 0.444444 0.000000 24.000000 0 0.000000 0.000000 0
END
-DRAW 5 0 0 0 0 0.000000 0.000000 0 0.000000
- L3 0 0.444444 0.000000 0.000000 0 72.000000 36.000000 0
+DRAW 5 0.000000 0.000000 0.000000
+ L3 0 0.444444 0.000000 0.000000 0 72.000000 24.000000 0
END
-DRAW 6 0 0 0 0 0.000000 0.000000 0 0.000000
- L3 0 0.444444 0.000000 36.000000 0 72.000000 0.000000 0
+DRAW 6 0.000000 0.000000 0 0.000000
+ L3 0 0.444444 0.000000 24.000000 0 72.000000 0.000000 0
END
REDRAW
MESSAGE
diff --git a/app/lib/demos/dmjcir.xtr b/app/lib/demos/dmjcir.xtr
index 9647e39..a8735f0 100644
--- a/app/lib/demos/dmjcir.xtr
+++ b/app/lib/demos/dmjcir.xtr
@@ -1,6 +1,6 @@
VERSION 2
DEMOINIT
-ORIG 8.000 0.000 0.000
+ORIG 6.000 0.000 0.000
CURVE 1 DEMO 1 12.633333 7.966667 6.000000
E 12.633333 13.966667 270.000000
E 12.633333 13.966667 90.000000
@@ -17,7 +17,7 @@ You can also join to and from circles. This will change the circles to curves.
In this example we will join two circles.
END
STEP
-COMMAND Join
+COMMAND JoinTrack
MOUSE 2 14.083 14.083
MOUSE 4 14.083 14.083
MOUSE 2 28.250 12.833
@@ -133,6 +133,20 @@ MOUSE 4 34.250 13.500
MESSAGE
=========================================
END
+REGRESSION START 10 - circle 1
+CURVE 1 0 0 0 0 DEMO 2 12.633333 7.966667 0 6.000000 0 0.000000 0.000000
+ E4 18.237313 10.110358 -20.933362 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 10.489642 13.570647 69.066638 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 2 0 0 0 0 DEMO 2 32.133333 7.966667 0 6.000000 0 0.000000 0.000000
+ T4 3 34.277024 13.570647 290.933362 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 26.529353 10.110358 380.933362 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 3 0 0 0 0 DEMO 2 22.383333 -17.521516 0 33.289375 0 0.000000 0.000000
+ T4 1 10.489642 13.570647 249.066638 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 34.277024 13.570647 110.933362 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
STEP
CLEAR
MESSAGE
@@ -140,7 +154,7 @@ Now let's try a cross connection.
END
STEP
PARAMETER misc cmdUndo
-COMMAND Join
+COMMAND JoinTrack
MOUSE 2 15.500 13.333
MOUSE 4 15.500 13.333
MOUSE 2 27.667 4.167
@@ -236,5 +250,19 @@ Note that the connection is from different 'ends' of the circle than in the last
=========================================
END
STEP
+REGRESSION START 10 - circle 2
+CURVE 1 0 0 0 0 DEMO 2 12.633333 7.966667 0 6.000000 0 0.000000 0.000000
+ E4 18.312924 6.032179 18.809012 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 14.567821 13.646258 108.809012 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 2 0 0 0 0 DEMO 2 32.133333 7.966667 0 6.000000 0 0.000000 0.000000
+ E4 28.539473 12.771266 233.203358 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 27.328734 4.372807 323.203358 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 4 0 0 0 0 DEMO 2 5.966820 -11.605994 0 26.676833 0 0.000000 0.000000
+ T4 1 14.567821 13.646258 288.809012 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 27.328734 4.372807 143.203358 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
RESET
CLEAR
diff --git a/app/lib/demos/dmjnabut.xtr b/app/lib/demos/dmjnabut.xtr
index e72c898..8874fa0 100644
--- a/app/lib/demos/dmjnabut.xtr
+++ b/app/lib/demos/dmjnabut.xtr
@@ -25,7 +25,7 @@ This examples shows joining tracks whose End-Points are aligned.
Note the 2 pairs of tracks have End-Points that are close and aligned but not connected.
END
STEP
-COMMAND Join
+COMMAND JoinTrack
MOUSE 2 20.167 4.500
MESSAGE
_________________________________________
@@ -55,5 +55,19 @@ END
MESSAGE
=========================================
END
+REGRESSION START 10 - join abut
+STRAIGHT 2 0 0 0 0 DEMO 2
+ E4 4.133333 4.466667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 19.216667 4.466687 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 3 0 0 0 0 DEMO 2 19.300229 18.466687 0 14.000000 0 0.000000 0.000000
+ E4 32.510491 13.831066 19.336606 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 19.300192 4.466687 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 35.216667 3.216667 90.000200 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 4.133333 3.216667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmjncs.xtr b/app/lib/demos/dmjncs.xtr
index f1bd27f..9707269 100644
--- a/app/lib/demos/dmjncs.xtr
+++ b/app/lib/demos/dmjncs.xtr
@@ -12,27 +12,40 @@ CURVE 2 DEMO 1 29.473372 12.727335 7.625000
REDRAW
RESET
MESSAGE
-The <Join> command can join straight and curved tracks (in either order).
+The <Join> command can also join straight and curved tracks (in either order).
+
+We will enable Cornu easements
+
END
+
STEP
-COMMAND Join
+PARAMETER misc cmdEasement
+PARAMETER easement val -1.0
+BIGPAUSE
+PARAMETER easement ok
+COMMAND JoinTrack
+MOUSE 1 34.167 6.917
MOUSE 2 34.167 6.917
MOUSE 4 34.167 6.917
+MOUSE 1 23.750 2.167
MOUSE 2 23.750 2.167
MESSAGE
_________________________________________
-A connecting track is drawn between the two tracks.
+A connecting cornu track is drawn between the two tracks.
END
STEP
MOUSE 3 23.750 2.083
MOUSE 3 19.417 2.000
+MOUSE 4 19.417 2.000
MESSAGE
_________________________________________
Notice that the curved track is extended as the connection point moves past the End-Point.
END
STEP
+MOUSE 1 34.167 6.917
+MOUSE 2 34.167 6.917
MOUSE 3 19.167 2.000
MOUSE 3 10.917 2.333
BIGPAUSE
@@ -41,24 +54,25 @@ MOUSE 3 28.250 2.250
MESSAGE
_________________________________________
-Here the connection makes the curved track wrap around.
+Here the connection makes the curved track wrap around. This is not a useful shape, there is a discontinuity at the end.
+Adjusting the end point will fix it.
END
STEP
MOUSE 3 28.250 2.250
-MOUSE 3 3.250 2.333
-MESSAGE
-_________________________________________
+MOUSE 4 28.250 2.250
-Now the cursor is about to be moved past the other (far) End-Point of the straight track. You will receive a warning and the connecting track turns Red.
-END
-STEP
-MOUSE 3 2.500 2.250
-MOUSE 3 0.667 2.167
-STEP
-MOUSE 3 0.667 2.167
-MOUSE 4 7.333 1.833
MESSAGE
=========================================
END
+REGRESSION START 10 - join curve and straight
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 1.883214 2.133372 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 31.050000 2.133333 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 29.473372 12.727335 0 7.625000 0 0.000000 0.000000
+ E4 37.081031 13.241282 356.135245 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 33.769610 6.427894 235.706018 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmjnmove.xtr b/app/lib/demos/dmjnmove.xtr
index 43626e6..a00f3fa 100644
--- a/app/lib/demos/dmjnmove.xtr
+++ b/app/lib/demos/dmjnmove.xtr
@@ -1,7 +1,6 @@
VERSION 2
DEMOINIT
ORIG 8.000 0.000 0.000
-PARAMETER cmdopt move-quick 2
STRAIGHT 1 DEMO 1
E 13.440000 4.160000 270.000000
E 30.186667 4.160000 90.000000
@@ -19,12 +18,20 @@ RESET
MESSAGE
The <Join> command can move one group of tracks to join with another.
-First <Select> the tracks you want to move.
+First <Select> the tracks you want to move with Ctrl so that they are both selected.
END
STEP
+KEYSTATE 4
+MOUSE 1 24.000 13.013
+KEYSTATE 4
MOUSE 2 24.000 13.013
+KEYSTATE 4
MOUSE 4 24.000 13.013
+KEYSTATE 4
+MOUSE 1 15.893 12.160
+KEYSTATE 4
MOUSE 2 15.893 12.160
+KEYSTATE 4
MOUSE 4 15.893 12.160
MESSAGE
_________________________________________
@@ -32,7 +39,7 @@ _________________________________________
Click <Join> and Shift-Left-Click on the two End-Points.
END
STEP
-COMMAND Join
+COMMAND JoinTrack
KEYSTATE 2
MOUSE 2 14.613 7.573
KEYSTATE 2
@@ -47,5 +54,19 @@ _________________________________________
The selected tracks are moved into position.
=========================================
END
+REGRESSION START 10 - move to join
+STRAIGHT 1 0 0 0 0 DEMO 2
+ T4 2 13.440000 4.160000 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 30.186667 4.160000 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 13.440000 9.409999 0 5.250000 0 0.000000 0.000000
+ T4 1 13.440000 4.160000 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 8.243218 10.155620 8.164927 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 3 0 0 0 0 DEMO 2
+ T4 2 8.243218 10.155620 188.164927 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 9.659037 20.023512 8.164927 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmjnss.xtr b/app/lib/demos/dmjnss.xtr
index 451fde4..6343fb8 100644
--- a/app/lib/demos/dmjnss.xtr
+++ b/app/lib/demos/dmjnss.xtr
@@ -12,13 +12,26 @@ STRAIGHT 2 DEMO 1
REDRAW
RESET
MESSAGE
-Two straight tracks are joined by selecting the two End-Points. The selected End-Points will be those closest to the cursor when the track is selected.
+Two straight tracks can be joined by selecting the two endoints. The selected endpoints will be those closest to the cursor when the track is selected.
+First, we will select Easements None and then select Join
END
STEP
-COMMAND Join
+PARAMETER misc cmdEasement
+PARAMETER easement val 0.0
+BIGPAUSE
+PARAMETER easement ok
+COMMAND JoinTrack
+STEP
+MESSAGE
+_____________________________________________________
+
+Now we select two points on the tracks
+END
+MOUSE 1 16.583 10.417
MOUSE 2 16.583 10.417
MOUSE 4 16.583 10.417
+MOUSE 1 17.083 4.583
MOUSE 2 17.083 4.583
MESSAGE
_________________________________________
@@ -57,5 +70,213 @@ MOUSE 4 -0.667 2.750
MESSAGE
=========================================
END
+REGRESSION START 11 - join straights - simple
+STRAIGHT 1 0 0 0 0 DEMO 2
+ T4 3 -0.667000 4.466667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 37.133333 4.466667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 3 0.206517 1.112893 240.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 27.383333 16.300000 60.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 3 0 0 0 0 DEMO 2 -0.667000 2.676023 0 1.790644 0 0.000000 0.000000
+ T4 2 0.206517 1.112893 60.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 1 -0.667000 4.466667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
STEP
CLEAR
+PARAMETER misc cmdUndo
+MESSAGE
+Now we will do this with Cornu Easements
+
+First, we will select Easements Cornu and then select Join
+END
+STEP
+PARAMETER misc cmdEasement
+PARAMETER easement val -1.0
+BIGPAUSE
+PARAMETER easement ok
+COMMAND JoinTrack
+STEP
+MESSAGE
+_____________________________________________________
+
+Now we again select two points on the tracks
+END
+MOUSE 1 16.583 10.417
+MOUSE 2 16.583 10.417
+MOUSE 4 16.583 10.417
+MOUSE 1 17.083 4.583
+MOUSE 2 17.083 4.583
+MESSAGE
+_________________________________________
+
+A connecting cornu is drawn between the two tracks. Notice how it behaves as the cursor is dragged along the second track.
+END
+STEP
+MOUSE 3 17.167 4.583
+MOUSE 3 21.917 4.583
+BIGPAUSE
+MOUSE 3 21.917 4.583
+MOUSE 3 14.833 4.250
+MESSAGE
+_________________________________________
+
+Note that either tracks can be extended if you move past the end of it.
+END
+STEP
+MOUSE 3 14.750 4.250
+MOUSE 3 9.000 4.000
+MESSAGE
+_________________________________________
+
+Notice this time what happens if you drag past the intersection points of the two tracks.
+END
+STEP
+MOUSE 3 8.833 4.000
+MOUSE 3 -0.667 2.750
+MESSAGE
+_________________________________________
+
+This is more useful because you can move the other end as well.
+END
+STEP
+MOUSE 4 -0.667 2.750
+MOUSE 1 16.583 10.417
+MOUSE 2 16.583 10.417
+MOUSE 3 26.900 15.800
+MOUSE 4 26.900 15.800
+MESSAGE
+_________________________________________
+
+You can add a pin to constrain the Cornu Curve to pass through it.
+END
+STEP
+MOUSE 1 16.400 12.680
+MOUSE 2 16.400 12.680
+MOUSE 3 20.000 10.500
+MOUSE 4 20.000 10.500
+MOUSE 8200 20.000 10.500
+MESSAGE
+=========================================
+END
+REGRESSION START 12 - join straights cornu
+# ../share/xtrkcad/demos/dmjnss.xtr - 151
+STRAIGHT 1 0 0 0 0 DEMO 2
+ T4 5 -0.667000 4.466667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 37.133333 4.466667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END$SEGS
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 4 26.802098 15.975192 240.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 27.383333 16.300000 60.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END$SEGS
+CORNU 4 0 0 0 0 DEMO 2 26.802098 15.975192 60.802413 0.000000 0.000000 0.000000 20.000000 10.500000 227.332778 50.468495 -14.204474 47.609607
+ T4 2 26.802098 15.975192 60.802413 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 20.000000 10.500000 227.332778 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ W3 0 0.000000 26.802098 15.975192 26.164180 15.618707 25.528914 15.255902 24.922701 14.847824
+ SUBSEGS
+ C 0 0.000000 -26.451833 39.457674 -7.252719 326.668083 4.748448
+ SUBSEND
+ W3 0 0.000000 24.922701 14.847824 24.316487 14.439746 23.739315 13.989295 23.188205 13.509400
+ SUBSEGS
+ C 0 0.000000 -17.691771 34.842861 0.198961 318.794523 7.099752
+ SUBSEND
+ W3 0 0.000000 23.188205 13.509400 22.085986 12.549608 21.074671 11.490540 20.000000 10.500000
+ SUBSEGS
+ C 0 0.000000 -65.215805 66.730294 -35.041479 315.224174 2.888986
+ S 0 0.000000 20.796534 11.253132 20.000000 10.500000
+ SUBSEND
+ END$SEGS
+CORNU 5 0 0 0 0 DEMO 2 20.000000 10.500000 47.332778 50.468495 -14.204474 47.609607 -0.667000 4.466667 90.000000 0.000000 0.000000 0.000000
+ T4 4 20.000000 10.500000 47.332778 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 1 -0.667000 4.466667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ W3 0 0.000000 20.000000 10.500000 19.318543 9.871891 18.615306 9.263690 17.848611 8.743033
+ SUBSEGS
+ C 0 0.000000 18.778714 7.078653 24.126404 136.521306 8.482677
+ SUBSEND
+ W3 0 0.000000 17.848611 8.743033 17.081916 8.222376 16.252171 7.790276 15.373060 7.496902
+ SUBSEGS
+ C 0 0.000000 10.145390 12.091979 17.097082 145.429938 15.701023
+ SUBSEND
+ W3 0 0.000000 15.373060 7.496902 14.493949 7.203529 13.567965 7.050061 12.641194 7.049336
+ SUBSEGS
+ C 0 0.000000 8.670868 12.623232 15.720186 161.510300 18.371006
+ SUBSEND
+ W3 0 0.000000 12.641194 7.049336 11.714424 7.048612 10.789413 7.199895 9.904422 7.475023
+ SUBSEGS
+ C 0 0.000000 9.217472 12.673408 16.266752 180.200242 17.281760
+ SUBSEND
+ W3 0 0.000000 9.904422 7.475023 9.019431 7.750151 8.175230 8.147494 7.376550 8.617616
+ SUBSEGS
+ C 0 0.000000 12.069936 13.578894 18.972049 197.723979 13.197787
+ SUBSEND
+ W3 0 0.000000 7.376550 8.617616 6.577870 9.087738 5.823862 9.629917 5.087234 10.192309
+ SUBSEGS
+ C 0 0.000000 23.166639 19.337296 28.457820 211.083842 6.876168
+ SUBSEND
+ W3 0 0.000000 5.087234 10.192309 3.613980 11.317093 2.191863 12.536086 0.541165 13.379184
+ SUBSEGS
+ S 0 0.000000 5.087234 10.192309 2.880741 11.891379
+ C 0 0.000000 -16.933355 -7.345233 -1.605583 27.757576 9.391814
+ SUBSEND
+ W3 0 0.000000 0.541165 13.379184 -0.284188 13.800738 -1.164915 14.124119 -2.079569 14.273530
+ SUBSEGS
+ C 0 0.000000 -8.978407 -3.634267 5.430753 9.971577 17.742051
+ SUBSEND
+ W3 0 0.000000 -2.079569 14.273530 -2.536896 14.348235 -3.001703 14.379353 -3.464645 14.358998
+ SUBSEGS
+ C 0 0.000000 -6.758837 -3.186180 7.605900 357.638745 11.784606
+ SUBSEND
+ W3 0 0.000000 -3.464645 14.358998 -3.927586 14.338644 -4.388609 14.266672 -4.833991 14.138748
+ SUBSEGS
+ C 0 0.000000 -5.903451 -3.218328 8.460688 344.116575 13.492114
+ SUBSEND
+ W3 0 0.000000 -4.833991 14.138748 -5.279372 14.010825 -5.708973 13.826821 -6.106104 13.588042
+ SUBSEGS
+ C 0 0.000000 -5.320524 -3.374332 9.022365 329.106732 14.970290
+ SUBSEND
+ W3 0 0.000000 -6.106104 13.588042 -6.503235 13.349262 -6.867684 13.055650 -7.182439 12.715565
+ SUBSEGS
+ C 0 0.000000 -4.925324 -3.573613 9.363671 312.886078 16.171430
+ SUBSEND
+ W3 0 0.000000 -7.182439 12.715565 -7.497194 12.375479 -7.762017 11.988983 -7.963009 11.571453
+ SUBSEGS
+ C 0 0.000000 -4.672075 -3.755935 9.539505 295.779781 17.047949
+ SUBSEND
+ W3 0 0.000000 -7.963009 11.571453 -8.164001 11.153923 -8.300973 10.705552 -8.366415 10.246808
+ SUBSEGS
+ C 0 0.000000 -4.537825 -3.874548 9.602610 278.161379 17.552270
+ SUBSEND
+ W3 0 0.000000 -8.366415 10.246808 -8.431857 9.788063 -8.425704 9.319225 -8.348802 8.862263
+ SUBSEGS
+ C 0 0.000000 -4.516107 -3.895246 9.611300 260.452854 17.636670
+ SUBSEND
+ W3 0 0.000000 -8.348802 8.862263 -8.271900 8.405300 -8.124342 7.960494 -7.915133 7.547020
+ SUBSEGS
+ C 0 0.000000 -4.616507 -3.797243 9.633913 243.124710 17.253123
+ SUBSEND
+ W3 0 0.000000 -7.915133 7.547020 -7.705924 7.133547 -7.435288 6.751601 -7.117962 6.413912
+ SUBSEGS
+ C 0 0.000000 -4.870580 -3.573517 9.754490 226.696048 16.353154
+ SUBSEND
+ W3 0 0.000000 -7.117962 6.413912 -6.800636 6.076224 -6.436897 5.782850 -6.043374 5.538171
+ SUBSEGS
+ C 0 0.000000 -5.350011 -3.229346 10.088321 211.734607 14.887748
+ SUBSEND
+ W3 0 0.000000 -6.043374 5.538171 -5.649850 5.293492 -5.226774 5.097437 -4.788767 4.946181
+ SUBSEGS
+ C 0 0.000000 -6.219072 -2.778742 10.831473 198.856757 12.807357
+ SUBSEND
+ W3 0 0.000000 -4.788767 4.946181 -4.350759 4.794925 -3.897938 4.688337 -3.440233 4.615986
+ SUBSEGS
+ C 0 0.000000 -7.915867 -2.239129 12.440198 188.727410 10.062079
+ SUBSEND
+ W3 0 0.000000 -3.440233 4.615986 -2.524822 4.471284 -1.593777 4.466669 -0.667000 4.466667
+ SUBSEGS
+ C 0 0.000000 -14.358484 -1.395250 18.828097 179.869603 8.318495
+ S 0 0.000000 -1.362572 4.469650 -0.667000 4.466667
+ SUBSEND
+ END$SEGS
+REGRESSION END
+STEP
diff --git a/app/lib/demos/dmjntt.xtr b/app/lib/demos/dmjntt.xtr
index 7835299..fa1d4f9 100644
--- a/app/lib/demos/dmjntt.xtr
+++ b/app/lib/demos/dmjntt.xtr
@@ -16,14 +16,22 @@ REDRAW
MESSAGE
You can connect from any track to a turntable
-Note: you cannot have a turntable as your first connection point.
+With a Cornu Easement you can have a turntable as the first point.
+
END
STEP
RESET
-COMMAND Join
+PARAMETER misc cmdEasement
+PARAMETER easement val -1.0
+BIGPAUSE
+PARAMETER easement ok
+COMMAND JoinTrack
+MOUSE 1 17.833 10.167
MOUSE 2 17.833 10.167
-MOUSE 4 17.833 10.167
+MOUSE 3 15.833 10.000
+MOUSE 4 15.833 10.000
BIGPAUSE
+MOUSE 1 22.000 8.167
MOUSE 2 22.000 8.167
BIGPAUSE
MOUSE 3 21.750 6.417
@@ -32,7 +40,7 @@ _________________________________________
You cannot place the connecting track too close to an existing stall track. How close you can get is controlled by the Turntable Angle on the Setup dialog.
-In this example it is set to 7.5 degrees.
+In this example it is set to 15 degrees.
END
STEP
MOUSE 3 21.750 6.167
@@ -41,7 +49,7 @@ BIGPAUSE
MOUSE 3 22.083 5.417
MOUSE 3 21.750 6.000
BIGPAUSE
-MOUSE 3 21.750 5.917
+MOUSE 3 21.750 5.00
MOUSE 3 22.083 4.833
MESSAGE
_________________________________________
@@ -103,7 +111,7 @@ MOUSE 3 30.250 8.083
MESSAGE
_________________________________________
-Now the cursor will be moved within the turntable. Notice the error message.
+Now the cursor will be moved within the turntable, but the end stays on the edge of the well.
END
BIGPAUSE
MOUSE 3 29.917 8.000
@@ -150,24 +158,14 @@ MOUSE 3 22.083 10.333
MOUSE 3 22.000 10.000
MOUSE 3 21.833 9.667
MOUSE 3 21.833 9.417
-MOUSE 3 21.750 9.167
-MOUSE 3 21.667 8.917
-MOUSE 3 21.667 8.667
-MOUSE 3 21.583 8.500
-MOUSE 3 21.500 8.333
-MOUSE 3 21.333 8.167
-MOUSE 3 21.333 8.000
-MOUSE 3 21.333 7.917
-MOUSE 3 21.250 7.917
-MOUSE 3 21.250 7.833
-MOUSE 3 21.333 7.833
MESSAGE
_________________________________________
All done.
END
BIGPAUSE
-MOUSE 4 21.333 7.833
+MOUSE 4 21.333 9.417
+MOUSE 8200 21.333 9.417
MESSAGE
=========================================
END
diff --git a/app/lib/demos/dmlines.xtr b/app/lib/demos/dmlines.xtr
index c37246c..9f2b66f 100644
--- a/app/lib/demos/dmlines.xtr
+++ b/app/lib/demos/dmlines.xtr
@@ -1,6 +1,6 @@
VERSION 2
DEMOINIT
-ORIG 4.000 0.000 0.000
+ORIG 2.000 0.000 0.000
PARAMETER display labelenable 4
STRAIGHT 1 DEMO 1
E 0.051703 4.160000 270.000000
@@ -47,37 +47,46 @@ MESSAGE
_________________________________________
Lines are drawn by clicking at the starting postion and dragging to the final position.
+
+By default, the new line will snap to existing objects. Hold down the <Ctrl> and <Alt> keys to prevent this from happening.
END
STEP
+KEYSTATE 12
MOUSE 2 0.533 4.693
+KEYSTATE 12
MOUSE 3 4.320 4.693
+KEYSTATE 12
MOUSE 4 4.320 4.693
+KEYSTATE 12
MOUSE 2 4.373 4.693
+KEYSTATE 12
MOUSE 3 4.533 5.120
+KEYSTATE 12
MOUSE 4 4.533 5.120
-MOUSE 2 0.267 5.120
-MOUSE 3 0.587 4.747
-MOUSE 4 0.587 4.747
+KEYSTATE 12
+MOUSE 2 0.533 4.693
+KEYSTATE 12
+MOUSE 3 0.533 4.693
+KEYSTATE 12
+MOUSE 4 0.267 5.120
+KEYSTATE 12
MOUSE 2 0.267 3.253
+KEYSTATE 12
MOUSE 3 0.533 3.787
+KEYSTATE 12
MOUSE 4 0.533 3.787
-MESSAGE
-_________________________________________
-
-Drawing lines with the Shift key held down will use the previous line End-Point as the starting position. This makes it easy to draw connected lines.
-END
STEP
-KEYSTATE 2
-MOUSE 2 3.520 3.680
-KEYSTATE 2
+KEYSTATE 12
+MOUSE 2 0.533 3.787
+KEYSTATE 12
MOUSE 3 4.320 3.787
-KEYSTATE 2
+KEYSTATE 12
MOUSE 4 4.320 3.787
-KEYSTATE 2
-MOUSE 2 4.533 3.307
-KEYSTATE 2
+KEYSTATE 12
+MOUSE 2 4.320 3.787
+KEYSTATE 12
MOUSE 3 4.533 3.307
-KEYSTATE 2
+KEYSTATE 12
MOUSE 4 4.533 3.307
MESSAGE
_________________________________________
@@ -85,25 +94,17 @@ _________________________________________
You also draw in various colors and line widths.
END
PARAMETER draw linecolor 255
-PARAMETER draw linewidth 2
+PARAMETER draw linewidth 6
STEP
MOUSE 2 0.747 4.800
MOUSE 4 0.693 6.560
-KEYSTATE 2
MOUSE 2 0.693 6.560
-KEYSTATE 2
MOUSE 4 1.493 7.573
-KEYSTATE 2
MOUSE 2 1.547 7.573
-KEYSTATE 2
MOUSE 4 3.147 7.467
-KEYSTATE 2
-MOUSE 2 3.787 6.773
-KEYSTATE 2
+MOUSE 2 3.147 7.467
MOUSE 4 4.213 5.813
-KEYSTATE 2
-MOUSE 2 4.107 5.173
-KEYSTATE 2
+MOUSE 2 4.207 5.800
MOUSE 4 4.107 4.693
MESSAGE
_________________________________________
@@ -114,6 +115,7 @@ Here we will draw a Curve by dragging from one End-Point to the other to define
END
STEP
COMMAND DrawCurveChord
+KEYSTATE 12
MOUSE 2 0.800 3.680
#MOUSE 3 0.800 3.573
#MOUSE 3 0.853 3.467
@@ -172,9 +174,12 @@ MOUSE 2 0.800 3.680
#MOUSE 3 3.947 3.680
#MOUSE 3 3.947 3.733
#MOUSE 3 3.947 3.787
+KEYSTATE 12
MOUSE 4 4.107 3.787
BIGPAUSE
+KEYSTATE 12
MOUSE 2 2.9 3.78
+KEYSTATE 12
MOUSE 4 2.9 1.5
MESSAGE
_________________________________________
@@ -207,17 +212,88 @@ MOUSE 2 11.307 6.400
MOUSE 4 11.307 6.400
#BIGPAUSE
#PARAMETER misc cmdDelete
+KEYSTATE 4
MOUSE 2 4.160 5.493
+KEYSTATE 4
MOUSE 4 4.160 5.493
#BIGPAUSE
#PARAMETER misc cmdDelete
+KEYSTATE 4
MOUSE 2 3.467 6.933
+KEYSTATE 4
MOUSE 4 3.467 6.933
BIGPAUSE
PARAMETER misc cmdDelete
MESSAGE
=========================================
END
+REGRESSION START 10 - lines
+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 Left 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.533000 4.693000 0 4.320000 4.693000 0
+ END
+DRAW 8 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.000000 4.373000 4.693000 0 4.533000 5.120000 0
+ END
+DRAW 9 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.000000 0.533000 4.693000 0 0.267000 5.120000 0
+ END
+DRAW 10 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.000000 0.267000 3.253000 0 0.533000 3.787000 0
+ END
+DRAW 11 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.000000 0.533000 3.787000 0 4.320000 3.787000 0
+ END
+DRAW 12 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.000000 4.320000 3.787000 0 4.533000 3.307000 0
+ END
+DRAW 13 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 255 0.083333 0.747000 4.693000 0 0.693000 6.560000 0
+ END
+DRAW 14 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 255 0.083333 0.693000 6.560000 0 1.493000 7.573000 0
+ END
+DRAW 15 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 255 0.083333 1.493000 7.573000 0 3.147000 7.467000 0
+ END
+DRAW 18 0 0 0 0 0.000000 0.000000 0 0.000000
+ A3 255 0.083333 1.732465 2.470132 3.219463 0 70.877480 214.538653
+ END
+DRAW 20 0 0 0 0 0.000000 0.000000 0 0.000000
+ A3 8421376 0.083333 1.288417 8.533000 5.920000 0 0.000000 360.000000
+ END
+REGRESSION END
STEP
CLEAR
RESET
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
diff --git a/app/lib/demos/dmmouse.xtr b/app/lib/demos/dmmouse.xtr
index 9bf8e97..295db36 100644
--- a/app/lib/demos/dmmouse.xtr
+++ b/app/lib/demos/dmmouse.xtr
@@ -4,187 +4,54 @@ ORIG 12.000 0.000 0.000
PARAMETER display description-fontsize 18
REDRAW
RESET
-MOUSE 1 0.160 1.120
+MOUSE 1 1.5 1.5
MESSAGE
-In the drawing area of the main window you can see an hollow arrow which represents the mouse cursor. In this demo the mouse will move about to show you the actions of different commands.
+In the drawing area of the main window you can see an hollow upwards arrow which represents the mouse cursor. In this demo the mouse will move about to show you the actions of different commands.
The hollow arrow represents the mouse cursor without a mouse button being pressed.
END
STEP
-MOUSE 1 0.480 1.280
-MOUSE 1 1.440 1.920
-MOUSE 1 2.080 2.560
-MOUSE 1 2.240 2.720
-MOUSE 1 2.400 2.880
-MOUSE 1 2.560 3.040
-MOUSE 1 2.720 3.040
-MOUSE 1 3.040 3.200
-MOUSE 1 3.040 3.360
-MOUSE 1 3.360 3.520
-MOUSE 1 3.520 3.680
-MOUSE 1 3.680 3.680
-MOUSE 1 4.000 3.840
-MOUSE 1 4.160 4.000
-MOUSE 1 4.320 4.160
-MOUSE 1 4.480 4.160
-MOUSE 1 4.480 4.320
-MOUSE 1 4.640 4.320
-MOUSE 1 4.800 4.480
-MOUSE 1 5.120 4.640
-MOUSE 1 5.280 4.800
-MOUSE 1 5.440 4.960
-MOUSE 1 5.600 5.120
-MOUSE 1 5.920 5.280
-MOUSE 1 6.080 5.600
-MOUSE 1 6.400 5.600
-MOUSE 1 6.560 5.920
-MOUSE 1 6.880 6.080
-MOUSE 1 7.040 6.240
-MOUSE 1 7.200 6.400
-MOUSE 1 7.520 6.560
-MOUSE 1 8.160 7.200
-MOUSE 1 8.480 7.360
-MOUSE 1 9.120 8.000
-MOUSE 1 9.280 8.160
-MOUSE 1 9.440 8.320
-MOUSE 1 9.760 8.480
-MOUSE 1 9.920 8.800
-MOUSE 1 10.240 8.960
-MOUSE 1 10.560 9.120
-MOUSE 1 11.200 10.080
-MOUSE 1 12.160 10.400
-MOUSE 1 12.800 11.040
-MOUSE 1 13.440 11.680
-MOUSE 1 13.760 11.840
-MOUSE 1 13.920 12.000
-MOUSE 1 14.080 12.160
-MOUSE 1 14.240 12.320
-MOUSE 1 14.880 12.960
-MOUSE 1 15.200 13.120
-MOUSE 1 15.360 13.280
-MOUSE 1 16.000 13.920
-MOUSE 1 16.320 14.080
-MOUSE 1 16.960 14.720
-MOUSE 1 17.280 14.880
-MOUSE 1 17.600 15.040
-MOUSE 1 17.760 15.200
-MOUSE 1 18.400 15.840
-MOUSE 1 18.720 16.000
-MOUSE 1 19.360 16.640
-MOUSE 1 19.520 16.800
-MOUSE 1 19.680 16.960
-MOUSE 1 20.000 17.120
-MOUSE 1 20.160 17.280
-MOUSE 1 20.320 17.440
-MOUSE 1 20.640 17.600
-MOUSE 1 20.800 17.920
-MOUSE 1 21.120 18.080
-MOUSE 1 21.440 18.240
-MOUSE 1 21.600 18.400
-MOUSE 1 21.760 18.560
-MOUSE 1 21.920 18.720
-MOUSE 1 22.080 18.880
-MOUSE 1 22.240 19.040
-MOUSE 1 22.560 19.200
-MOUSE 1 22.880 19.360
-MOUSE 1 23.040 19.520
-MOUSE 1 23.200 19.680
-MOUSE 1 23.360 19.840
-MOUSE 1 23.520 20.000
-MOUSE 1 23.680 20.160
-MOUSE 1 24.000 20.160
-MOUSE 1 24.160 20.320
-MOUSE 1 24.160 20.480
-MOUSE 1 24.320 20.640
-MOUSE 1 24.480 20.800
-MOUSE 1 24.640 20.800
-MOUSE 1 25.280 21.440
-MOUSE 1 25.440 21.600
-MOUSE 1 25.600 21.760
-MOUSE 1 25.760 21.760
-MOUSE 1 25.920 21.920
-MOUSE 1 26.080 22.080
-MOUSE 1 26.240 22.240
-MOUSE 1 26.560 22.400
-MOUSE 1 26.720 22.720
-MOUSE 1 26.880 22.720
-MOUSE 1 27.040 22.880
-MOUSE 1 27.200 23.040
-MOUSE 1 27.360 23.200
-MOUSE 1 27.520 23.360
-MOUSE 1 27.680 23.520
-MOUSE 1 27.840 23.520
-MOUSE 1 28.000 23.680
-MOUSE 1 28.160 23.840
-MOUSE 1 28.320 24.000
-MOUSE 1 28.480 24.160
-MOUSE 1 28.800 24.320
-MOUSE 1 29.120 24.480
-MOUSE 1 29.280 24.800
-MOUSE 1 29.440 24.800
-MOUSE 1 29.600 24.960
-MOUSE 1 29.760 25.120
-MOUSE 1 29.920 25.440
-MOUSE 1 30.080 25.440
-MOUSE 1 30.400 25.600
-MOUSE 1 30.560 25.760
-MOUSE 1 30.720 25.920
-MOUSE 1 31.040 26.080
-MOUSE 1 31.200 26.240
-MOUSE 1 31.520 26.400
-MOUSE 1 31.680 26.560
-MOUSE 1 31.840 26.560
-MOUSE 1 32.160 26.720
-MOUSE 1 32.320 26.880
-MOUSE 1 32.480 26.880
-MOUSE 1 32.640 26.880
-MOUSE 1 32.640 27.040
-MOUSE 1 32.800 27.040
-MOUSE 1 32.960 27.200
-MOUSE 1 33.280 27.360
-MOUSE 1 33.600 27.520
-MOUSE 1 33.760 27.680
-MOUSE 1 33.920 27.680
-MOUSE 1 34.080 27.840
-MOUSE 1 34.240 28.000
-MOUSE 1 34.400 28.000
MOUSE 1 34.560 28.000
CLEAR
MESSAGE
-When the left mouse button would be pressed, the mouse cursor appears to flash and the hollow arrow is replaced by a solid red arrow. While the left button is pressed the mouse cursor will be a solid arrow.
+When the left mouse button would be pressed, the mouse cursor appears to flash and the hollow arrow is replaced by a solid left-pointing red arrow while the button is pressed.
Note: these color changes occur only during the demo to simulate mouse button presses.
END
STEP
MOUSE 2 34.560 28.000
-RESET
-BIGPAUSE
+#RESET
MESSAGE
_________________________________________
Moving the mouse while a mouse button is pressed is called 'dragging'.
END
-BIGPAUSE
-MOUSE 3 34.400 28.000
+STEP
MOUSE 3 36.160 4.000
-RESET
+#RESET
MESSAGE
_________________________________________
-When the left mouse button is released, the mouse cursor flashes and the hollow arrow is restored.
+When the left mouse button is released, the mouse cursor flashes and the hollow up black arrow is restored.
END
STEP
MOUSE 4 36.160 4.000
+RESET
MESSAGE
_________________________________________
-Dragging with the right button is simulated by a blue solid cursor.
+Dragging with the right button is simulated by a blue right-facing solid cursor.
END
-BIGPAUSE
+STEP
MOUSE 5 36.160 4.000
-BIGPAUSE
MOUSE 6 3.680 4.800
-BIGPAUSE
+#RESET
+MESSAGE
+__________________________________________
+
+Release Right Click
+END
+STEP
MOUSE 7 3.680 4.800
RESET
MESSAGE
@@ -193,15 +60,72 @@ END
STEP
CLEAR
MESSAGE
-Sometimes the Shift key is held down while using the mouse for a Shift-Click or a Shift-Drag.
+Sometimes the Shift key is held down while using the mouse
+
+This is indicated by an outlined arrow with the letter S near the arrow.
+END
+STEP
+KEYSTATE 2
+MOUSE 1 7.520 26.080
+RESET
+MESSAGE
+__________________________________________
+
+The left mouse button is held down with the Shift and dragged for a Left-Shift-Drag.
-This is indicated by an outline drawn around the solid arrow.
END
STEP
KEYSTATE 2
-MOUSE 2 3.680 4.800
+MOUSE 2 7.520 26.080
+KEYSTATE 2
+MOUSE 3 7.520 4.800
KEYSTATE 2
-MOUSE 4 7.520 26.080
+MOUSE 4 7.520 4.800
+STEP
+CLEAR
+MESSAGE
+___________________________________________
+
+Sometimes the Control key is held down while using the mouse.
+
+This is indicated with an upward filled arrow head with the letter C near the arrow
+
+END
+STEP
+KEYSTATE 4
+MOUSE 1 7.520 26.080
+RESET
+MESSAGE
+__________________________________________
+
+If while the Control is held the Left mouse button is held down it is a Ctrl-Move and a Ctrl-Left-Drag.
+
+This is indicated by an an left-facing open-headed arrow with the letter C near it.
+
+END
+STEP
+KEYSTATE 4
+MOUSE 2 7.520 26.080
+KEYSTATE 4
+MOUSE 3 3.680 4.800
+KEYSTATE 4
+MOUSE 4 3.680 4.800
+RESET
+MESSAGE
+___________________________________________
+
+You can also use the Control key with the Right mouse button.
+
+This is indicated with a right-facing filled arrow with an open arrow head and the letter C near the arrow
+
+END
+STEP
+KEYSTATE 4
+MOUSE 5 3.680 4.080
+KEYSTATE 4
+MOUSE 6 26.520 26.080
+KEYSTATE 4
+MOUSE 7 26.520 26.080
RESET
MESSAGE
=========================================
diff --git a/app/lib/demos/dmmovabt.xtr b/app/lib/demos/dmmovabt.xtr
index a1125f2..97162a0 100644
--- a/app/lib/demos/dmmovabt.xtr
+++ b/app/lib/demos/dmmovabt.xtr
@@ -1,6 +1,7 @@
VERSION 2
DEMOINIT
ORIG 8.000 0.000 0.000
+PARAMETER display mapscale 32
CURVE 1 DEMO 1 24.000000 24.000000 18.000000
T 4 37.512875 12.108734 41.347736
T 3 37.546349 35.853119 138.813964
@@ -51,7 +52,7 @@ END
STEP
CLEAR
MESSAGE
-You can change what portion of the layout is shown by using the 'Map' window which shows a compressed version of the entire layout. A hilighted area of the 'Map' (in reverse video) shows what portion of the layout is displayed in the main drawing area.
+You can change what portion of the layout is shown by using the 'Map' window which shows a compressed version of the entire layout. A hilighted area of the 'Map' (in blue highlight) shows what portion of the layout is displayed in the main drawing area.
You can Left-Drag the hilighted area in the Map window to change the displayed portion of the layout.
END
diff --git a/app/lib/demos/dmnotes.xtr b/app/lib/demos/dmnotes.xtr
index 35c3d6a..6125354 100644
--- a/app/lib/demos/dmnotes.xtr
+++ b/app/lib/demos/dmnotes.xtr
@@ -7,7 +7,7 @@ MESSAGE
The <Note> command lets you attach notes to various spots on the layout.
END
STEP
-COMMAND Note
+COMMAND TextNote
MOUSE 2 15.167 7.833
MOUSE 3 9.917 7.167
MOUSE 4 9.917 7.167
@@ -30,6 +30,11 @@ MOUSE 2 9.917 7.167
MOUSE 4 9.917 7.167
STEP
MOUSE 6920 9.917 7.167
+REGRESSION START 10 - notes
+NOTE 1 0 0 0 9.917000 7.167000 0 32
+Replace this text with your note
+ END
+REGRESSION END
CLEAR
MESSAGE
This is the end of the XTrackCAD Demos.
diff --git a/app/lib/demos/dmparall.xtr b/app/lib/demos/dmparall.xtr
index 7b99b58..394a304 100644
--- a/app/lib/demos/dmparall.xtr
+++ b/app/lib/demos/dmparall.xtr
@@ -27,12 +27,13 @@ CURVE 4 DEMO 1 26.550055 14.883322 12.000000
END
REDRAW
PARAMETER parallel separation 0.0
+PARAMETER parallel factor 0.0
RESET
MESSAGE
This example shows how to create parallel tracks.
END
STEP
-COMMAND Parallel
+COMMAND ParallelTrack
MESSAGE
_________________________________________
@@ -180,4 +181,42 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - parallel tracks
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 1.883333 2.883333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 16.966667 2.883353 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 16.966667 2.883353 0 0.000000 "Peco-55 Medium Left SL-E396F"
+ T4 1 16.966667 2.883353 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 22.371667 2.883353 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 22.336667 3.405353 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 3 0 0 0 0 DEMO 2
+ T4 4 26.550000 2.883322 90.000262 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 22.371667 2.883336 270.000262 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 4 0 0 0 0 DEMO 2 26.550055 14.883322 0 12.000000 0 0.000000 0.000000
+ E4 38.427321 13.171435 8.201723 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 26.550000 2.883322 270.000110 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 5 0 0 0 0 DEMO 2
+ E4 1.883333 4.133333 269.999924 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 16.966667 4.133353 89.999924 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 6 0 0 0 0 DEMO 2
+ T4 7 26.550006 4.133322 90.000192 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 22.371673 4.133336 270.000192 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 7 0 0 0 0 DEMO 2 26.550055 14.883322 0 10.750000 0 0.000000 0.000000
+ E4 37.190103 13.349741 8.201723 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 26.550034 4.133322 270.000110 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmplymod.xtr b/app/lib/demos/dmplymod.xtr
index 2c66bc0..a0bf12d 100644
--- a/app/lib/demos/dmplymod.xtr
+++ b/app/lib/demos/dmplymod.xtr
@@ -17,22 +17,40 @@ DRAW 2 0 0 0 0 0.000000 0.000000 0.000000
REDRAW
RESET
MESSAGE
-Polylines and Polygons (created with the <Draw> command) can be modified by dragging on their Corners or Edges.
+Polylines and polygons (created with the <Draw> command) can be modified by dragging on their corners or edges.
+
+First Left Click on the shape you want to modify.
END
STEP
COMMAND Modify
MOUSE 2 11.333 18.889
+MOUSE 4 11.333 18.889
+BIGPAUSE
+MESSAGE
+
+Then drag on the point you want to move
+END
+MOUSE 2 11.333 18.889
MOUSE 3 18.889 19.333
MOUSE 4 18.889 19.333
MOUSE 2 4.000 4.444
MOUSE 3 4.111 19.333
MOUSE 4 4.111 19.333
+MESSAGE
+
+And finally press the Space bar to finish the change
+END
+MOUSE 8200 4.111 19.333
+STEP
+MOUSE 2 31.222 18.889
+MOUSE 4 31.222 18.889
MOUSE 2 31.222 18.889
MOUSE 3 38.889 19.667
MOUSE 4 38.889 19.667
MOUSE 2 24.222 4.667
MOUSE 3 24.778 19.667
MOUSE 4 24.778 19.667
+MOUSE 8200 24.778 19.667
MESSAGE
_________________________________________
@@ -40,37 +58,87 @@ If you select the middle of an Edge a new Corner is created.
END
STEP
MOUSE 2 10.556 12.667
+MOUSE 4 10.556 12.667
+MOUSE 2 10.556 12.667
MOUSE 3 4.111 4.333
MOUSE 4 4.111 4.333
+MOUSE 8200 4.111 4.333
+MOUSE 2 31.556 12.333
+MOUSE 4 31.556 12.333
MOUSE 2 31.556 12.333
MOUSE 3 24.889 4.333
MOUSE 4 24.889 4.333
+MOUSE 8200 24.889 4.333
MESSAGE
_________________________________________
-If you drag a Corner to another Corner the two are merged and the Edge between them is removed.
+To delete a corner, select and then press Delete or Backspace
END
STEP
-MOUSE 2 4.333 19.222
-MOUSE 3 4.000 4.444
+#MOUSE 2 4.333 19.222
+#MOUSE 4 4.333 19.222
+#MOUSE 2 4.333 19.222
+#MOUSE 3 4.000 4.444
+MOUSE 2 4.000 4.444
MOUSE 4 4.000 4.444
-MOUSE 2 25.111 19.667
-MOUSE 3 25.111 4.444
+MOUSE 2 4.000 4.444
+MOUSE 4 4.000 4.444
+MOUSE 2056 4.000 4.444
+MOUSE 8200 4.000 4.444
+#MOUSE 2 25.111 19.667
+#MOUSE 4 25.111 19.667
+#MOUSE 2 25.111 19.667
+#MOUSE 3 25.111 4.444
+MOUSE 2 25.111 4.444
MOUSE 4 25.111 4.444
+MOUSE 2 25.111 4.444
+MOUSE 4 25.111 4.444
+MOUSE 2056 25.111 4.444
+MOUSE 8200 25.111 4.444
MESSAGE
_________________________________________
But you cannot have a Poly-shape with less than 3 sides.
END
STEP
-MOUSE 2 4.000 4.444
-MOUSE 3 18.900 4.333
+#MOUSE 2 4.000 4.444
+#MOUSE 4 4.000 4.444
+#MOUSE 2 4.000 4.444
+#MOUSE 3 18.900 4.333
+MOUSE 2 18.900 4.333
MOUSE 4 18.900 4.333
-MOUSE 2 25.111 4.444
-MOUSE 3 39.111 4.778
+MOUSE 2 18.900 4.333
+MOUSE 4 18.900 4.333
+MOUSE 2056 18.900 4.333
+STEP
+MOUSE 8200 18.900 4.333
+#MOUSE 2 25.111 4.444
+#MOUSE 4 25.111 4.444
+#MOUSE 2 25.111 4.444
+#MOUSE 3 39.111 4.778
+MOUSE 2 39.111 4.778
+MOUSE 4 39.111 4.778
+MOUSE 2 39.111 4.778
MOUSE 4 39.111 4.778
+MOUSE 2056 39.111 4.778
+STEP
+MOUSE 8200 39.111 4.778
MESSAGE
=========================================
END
+REGRESSION START 10 - modify polygons
+DRAW 1 0 0 0 0 0.000000 0.000000 0 0.000000
+ Y4 255 0.333333 3 0
+ 4.111000 19.333000 0
+ 18.889000 19.333000 0
+ 18.900000 4.333000 0
+ END
+DRAW 2 0 0 0 0 0.000000 0.000000 0 0.000000
+ F4 255 0.333333 3 0
+ 24.778000 19.667000 0
+ 38.889000 19.667000 0
+ 39.111000 4.778000 0
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmprof.xtr b/app/lib/demos/dmprof.xtr
index 3cbe1b0..595fca5 100644
--- a/app/lib/demos/dmprof.xtr
+++ b/app/lib/demos/dmprof.xtr
@@ -4,27 +4,27 @@ ORIG 9.000 23.000 2.000
PARAMETER display description-fontsize 96
PARAMETER display labelenable 4
PARAMETER display labelscale 12
-CURVE 1 0 0 0 0 N -1 12.666667 13.666667 10.000000
+CURVE 1 0 0 0 0 DEMO 2 12.666667 13.666667 10.000000
T 3 11.809617 3.703461 94.916566
T 21 22.410419 15.915955 167.001307
END
-STRAIGHT 2 0 0 0 0 N -1
+STRAIGHT 2 0 0 0 0 DEMO 2
T 22 27.376540 8.227390 232.674480 10 1.103460 -0.387390
T 6 29.448408 9.807189 52.674480
END
-CURVE 3 0 0 0 0 N -1 13.737465 26.114701 22.494005
+CURVE 3 0 0 0 0 DEMO 2 13.737465 26.114701 22.494005
T 22 24.278245 6.243309 62.056285 11 0.401755 -0.563309
T 1 11.809617 3.703461 274.916566
END
-STRAIGHT 4 0 0 0 0 N -1
+STRAIGHT 4 0 0 0 0 DEMO 2
T 5 37.111111 4.222222 270.000000
T 9 38.222222 4.222222 90.000000 9 0.001462 -0.748538 0.500000
END
-CURVE 5 0 0 0 0 N -1 37.111111 19.309524 15.087302
+CURVE 5 0 0 0 0 DEMO 2 37.111111 19.309524 15.087302
T 4 37.111111 4.222222 90.000000
T 21 26.521963 8.562588 314.576286 10 -1.201963 -0.162588
END
-TURNOUT 6 0 0 0 0 N -1 29.448408 9.807189 322.674480 "Peco-55 Medium Right SL-E395F"
+TURNOUT 6 0 0 0 0 DEMO 2 29.448408 9.807189 322.674480 "Peco-55 Medium Right SL-E395F"
T 2 29.448408 9.807189 232.674480
T 7 33.746482 13.084471 52.674480
T 8 34.035161 12.648152 62.360480
@@ -36,15 +36,15 @@ TURNOUT 6 0 0 0 0 N -1 29.448408 9.807189 322.674480 "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 7 0 0 0 0 N -1
+STRAIGHT 7 0 0 0 0 DEMO 2
T 19 42.270123 19.583746 52.674480
T 6 33.746482 13.084471 232.674480
END
-CURVE 8 0 0 0 0 N -1 45.574853 -9.388207 24.875000
+CURVE 8 0 0 0 0 DEMO 2 45.574853 -9.388207 24.875000
T 6 34.035161 12.648152 242.360480
T 18 51.462480 14.779984 103.691177
END
-TURNOUT 9 0 0 0 0 N -1 38.222222 4.222222 0.000000 "Peco-55 Medium Left SL-E396F"
+TURNOUT 9 0 0 0 0 DEMO 2 38.222222 4.222222 0.000000 "Peco-55 Medium Left SL-E396F"
T 4 38.222222 4.222222 270.000000 9 0.000000 0.000000 0.500000
T 15 43.627222 4.222222 90.000000
T 13 43.592222 4.744222 80.314000
@@ -56,23 +56,23 @@ TURNOUT 9 0 0 0 0 N -1 38.222222 4.222222 0.000000 "Peco-55 Medium Left SL-E396
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 10 0 0 0 0 N -1
+STRAIGHT 10 0 0 0 0 DEMO 2
E 76.446137 4.222222 90.000000
T 14 72.333333 4.222222 270.000000 9 -0.017544 -0.722222 1.000000
END
-STRAIGHT 11 0 0 0 0 N -1
+STRAIGHT 11 0 0 0 0 DEMO 2
T 23 55.000000 5.472222 270.000000 13 -0.040000 0.647778 "New York City"
T 16 60.777778 5.472222 90.000000
END
-CURVE 12 0 0 0 0 N -1 49.777778 -17.192082 22.664304
+CURVE 12 0 0 0 0 DEMO 2 49.777778 -17.192082 22.664304
T 13 45.964542 5.149134 260.314000
T 23 49.777778 5.472222 90.000000
END
-STRAIGHT 13 0 0 0 0 N -1
+STRAIGHT 13 0 0 0 0 DEMO 2
T 9 43.592222 4.744222 260.314000
T 12 45.964542 5.149134 80.314000
END
-TURNOUT 14 0 0 0 0 N -1 72.333333 4.222222 180.000000 "Peco-55 Medium Right SL-E395F"
+TURNOUT 14 0 0 0 0 DEMO 2 72.333333 4.222222 180.000000 "Peco-55 Medium Right SL-E395F"
T 10 72.333333 4.222222 90.000000 9 0.000000 0.000000 1.000000
T 15 66.928333 4.222222 270.000000
T 17 66.963333 4.744222 279.686000
@@ -84,39 +84,39 @@ TURNOUT 14 0 0 0 0 N -1 72.333333 4.222222 180.000000 "Peco-55 Medium Right SL-
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 15 0 0 0 0 N -1
+STRAIGHT 15 0 0 0 0 DEMO 2
T 9 43.627222 4.222222 270.000000
T 14 66.928333 4.222222 90.000000
END
-CURVE 16 0 0 0 0 N -1 60.777778 -17.192082 22.664304
+CURVE 16 0 0 0 0 DEMO 2 60.777778 -17.192082 22.664304
T 11 60.777778 5.472222 270.000000
T 17 64.591013 5.149134 99.686000
END
-STRAIGHT 17 0 0 0 0 N -1
+STRAIGHT 17 0 0 0 0 DEMO 2
T 14 66.963333 4.744222 99.686000
T 16 64.591013 5.149134 279.686000
END
-CURVE 18 0 0 0 0 N -1 64.332420 67.609950 54.375000
+CURVE 18 0 0 0 0 DEMO 2 64.332420 67.609950 54.375000
E 74.352464 14.166154 79.381036 9 -0.128780 -0.718786 2.000000
T 8 51.462480 14.779984 283.691177
END
-CURVE 19 0 0 0 0 N -1 49.773613 9.743103 12.375000
+CURVE 19 0 0 0 0 DEMO 2 49.773613 9.743103 12.375000
T 7 42.270123 19.583746 232.674480
T 20 56.175027 20.333784 121.150374
END
-CURVE 20 0 0 0 0 N -1 64.968888 34.882599 17.000000
+CURVE 20 0 0 0 0 DEMO 2 64.968888 34.882599 17.000000
E 74.032528 20.500303 57.781104 9 0.099051 -0.789777 4.000000
T 19 56.175027 20.333784 301.150374
END
-CURVE 21 0 0 0 0 N -1 37.111111 19.309524 15.087302
+CURVE 21 0 0 0 0 DEMO 2 37.111111 19.309524 15.087302
T 5 26.521963 8.562588 134.576286 10 0.000000 0.000000
T 1 22.410418 15.915955 347.001307
END
-CURVE 22 0 0 0 0 N -1 13.737465 26.114701 22.494005
+CURVE 22 0 0 0 0 DEMO 2 13.737465 26.114701 22.494005
T 2 27.376540 8.227390 52.674480 10 0.000000 0.000000
T 3 24.278245 6.243309 242.056285 11 0.000000 0.000000
END
-STRAIGHT 23 0 0 0 0 N -1
+STRAIGHT 23 0 0 0 0 DEMO 2
T 12 49.777778 5.472222 270.000000
T 11 55.000000 5.472222 90.000000 13 0.000000 0.000000 "New York City"
END
@@ -327,4 +327,122 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - profile
+CURVE 1 0 0 0 0 DEMO 2 12.666667 13.666667 0 10.000000 0 0.000000 0.000000
+ T4 3 11.809617 3.703461 94.916566 0 0.0 0.0 0.0 0.0 0 0 0 0.896923
+ T4 21 22.410419 15.915955 167.001307 0 0.0 0.0 0.0 0.0 0 0 0 0.896923
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ T4 22 27.376540 8.227390 232.674480 10 1.103460 -0.387390 0.0 0.0 1 2 0 1.415360
+ T4 6 29.448408 9.807189 52.674480 0 0.0 0.0 0.0 0.0 0 0 0 1.415360
+ END
+CURVE 3 0 0 0 0 DEMO 2 13.737465 26.114701 0 22.494005 0 0.000000 0.000000
+ T4 22 24.278245 6.243309 62.056285 11 0.401755 -0.563309 0.0 0.0 1 3 0 1.266708
+ T4 1 11.809617 3.703461 274.916566 0 0.0 0.0 0.0 0.0 0 0 0 1.266708
+ END
+STRAIGHT 4 0 0 0 0 DEMO 2
+ T4 5 37.111111 4.222222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 9 38.222222 4.222222 90.000000 9 0.001462 -0.748538 0.500000 0.500000 1 1 0 0.500000
+ END
+CURVE 5 0 0 0 0 DEMO 2 37.111111 19.309524 0 15.087302 0 0.000000 0.000000
+ T4 4 37.111111 4.222222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.500000
+ T4 21 26.521963 8.562588 314.576286 9 -1.201963 -0.162588 0.500000 0.500000 1 1 0 0.500000
+ END
+TURNOUT 6 0 0 0 0 DEMO 2 29.448408 9.807189 0 322.674480 "Peco-55 Medium Right SL-E395F"
+ T4 2 29.448408 9.807189 232.674480 0 0.0 0.0 0.0 0.0 0 0 0 1.467439
+ T4 7 33.746482 13.084471 52.674480 12 0.000000 0.000000 0.0 0.0 1 4 0 1.467439
+ T4 8 34.035161 12.648152 62.360480 0 0.0 0.0 0.0 0.0 0 0 0 1.467439
+ 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 7 0 0 0 0 DEMO 2
+ T4 19 42.270123 19.583746 52.674480 0 0.0 0.0 0.0 0.0 0 0 0 1.922697
+ T4 6 33.746482 13.084471 232.674480 12 0.000000 0.000000 0.0 0.0 1 4 0 1.922697
+ END
+CURVE 8 0 0 0 0 DEMO 2 45.574853 -9.388207 0 24.875000 0 0.000000 0.000000
+ T4 6 34.035161 12.648152 242.360480 0 0.0 0.0 0.0 0.0 0 0 0 1.619204
+ T4 18 51.462480 14.779984 103.691177 9 0.000000 0.000000 1.735822 1.735822 1 1 0 1.619204
+ END
+TURNOUT 9 0 0 0 0 DEMO 2 38.222222 4.222222 0 0.000000 "Peco-55 Medium Left SL-E396F"
+ T4 4 38.222222 4.222222 270.000000 9 0.000000 0.000000 0.500000 0.500000 1 1 0 0.552670
+ T4 15 43.627222 4.222222 90.000000 12 0.000000 0.000000 0.0 0.0 1 4 0 0.552670
+ T4 13 43.592222 4.744222 80.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.552670
+ 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 10 0 0 0 0 DEMO 2
+ E4 76.446137 4.222222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 1.000000
+ T4 14 72.333333 4.222222 270.000000 9 -0.017544 -0.722222 1.000000 1.000000 1 1 0 1.000000
+ END
+STRAIGHT 11 0 0 0 0 DEMO 2
+ T4 23 55.000000 5.472222 270.000000 13 -0.040000 0.647778 "New York City" 0.0 1 5 0 0.788168
+ T4 16 60.777778 5.472222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.788168
+ END
+CURVE 12 0 0 0 0 DEMO 2 49.777778 -17.192082 0 22.664304 0 0.000000 0.000000
+ T4 13 45.964542 5.149134 260.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.642059
+ T4 23 49.777778 5.472222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.642059
+ END
+STRAIGHT 13 0 0 0 0 DEMO 2
+ T4 9 43.592222 4.744222 260.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.596609
+ T4 12 45.964542 5.149134 80.314000 0 0.0 0.0 0.0 0.0 0 0 0 0.596609
+ END
+TURNOUT 14 0 0 0 0 DEMO 2 72.333333 4.222222 0 180.000000 "Peco-55 Medium Right SL-E395F"
+ T4 10 72.333333 4.222222 90.000000 9 0.000000 0.000000 1.000000 1.000000 1 1 0 0.947570
+ T4 15 66.928333 4.222222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.947570
+ T4 17 66.963333 4.744222 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.947570
+ 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 15 0 0 0 0 DEMO 2
+ T4 9 43.627222 4.222222 270.000000 12 0.000000 0.000000 0.0 0.0 1 4 0 0.750120
+ T4 14 66.928333 4.222222 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.750120
+ END
+CURVE 16 0 0 0 0 DEMO 2 60.777778 -17.192082 0 22.664304 0 0.000000 0.000000
+ T4 11 60.777778 5.472222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.858180
+ T4 17 64.591013 5.149134 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.858180
+ END
+STRAIGHT 17 0 0 0 0 DEMO 2
+ T4 14 66.963333 4.744222 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.903630
+ T4 16 64.591013 5.149134 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.903630
+ END
+CURVE 18 0 0 0 0 DEMO 2 64.332420 67.609950 0 54.375000 0 0.000000 0.000000
+ E4 74.352464 14.166154 79.381036 9 -0.128780 -0.718786 2.000000 2.000000 1 1 0 1.867911
+ T4 8 51.462480 14.779984 283.691177 9 0.000000 0.000000 1.735822 1.735822 1 1 0 1.867911
+ END
+CURVE 19 0 0 0 0 DEMO 2 49.773613 9.743103 0 12.375000 0 0.000000 0.000000
+ T4 7 42.270123 19.583746 232.674480 0 0.0 0.0 0.0 0.0 0 0 0 2.605178
+ T4 20 56.175027 20.333784 121.150374 0 0.0 0.0 0.0 0.0 0 0 0 2.605178
+ END
+CURVE 20 0 0 0 0 DEMO 2 64.968888 34.882599 0 17.000000 0 0.000000 0.000000
+ E4 74.032528 20.500303 57.781104 9 0.099051 -0.789777 4.000000 4.000000 1 1 0 3.456904
+ T4 19 56.175027 20.333784 301.150374 0 0.0 0.0 0.0 0.0 0 0 0 3.456904
+ END
+CURVE 21 0 0 0 0 DEMO 2 37.111111 19.309524 0 15.087302 0 0.000000 0.000000
+ T4 5 26.521963 8.562588 134.576286 9 0.000000 0.000000 0.500000 0.500000 1 1 0 0.555491
+ T4 1 22.410418 15.915955 347.001307 0 0.0 0.0 0.0 0.0 0 0 0 0.555491
+ END
+CURVE 22 0 0 0 0 DEMO 2 13.737465 26.114701 0 22.494005 0 0.000000 0.000000
+ T4 2 27.376540 8.227390 52.674480 10 0.000000 0.000000 0.0 0.0 1 2 0 1.374489
+ T4 3 24.278245 6.243309 242.056285 11 0.000000 0.000000 0.0 0.0 1 3 0 1.374489
+ END
+STRAIGHT 23 0 0 0 0 DEMO 2
+ T4 12 49.777778 5.472222 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.708023
+ T4 11 55.000000 5.472222 90.000000 13 0.000000 0.000000 "New York City" 0.0 1 5 0 0.708023
+ END
+REGRESSION END
CLEAR
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
diff --git a/app/lib/demos/dmrotate.xtr b/app/lib/demos/dmrotate.xtr
index 074aea5..ed04a77 100644
--- a/app/lib/demos/dmrotate.xtr
+++ b/app/lib/demos/dmrotate.xtr
@@ -1,7 +1,7 @@
VERSION 10
DEMOINIT
-ORIG 4.000 0.000 0.000
-STRUCTURE 1 0 0 0 0 N 2 2.000000 3.062500 0 0.000000 "Walthers Interstate Fuel - Loading Rack 933-32000a"
+ORIG 3.000 0.000 0.000
+STRUCTURE 1 0 0 0 0 DEMO 2 2.000000 3.062500 0 0.000000 "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
@@ -31,15 +31,15 @@ STRUCTURE 1 0 0 0 0 N 2 2.000000 3.062500 0 0.000000 "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 2.250000 0.062500 236.697715
E 19.375000 11.312500 56.697715
END
-CURVE 3 0 0 0 0 N 2 22.859949 -1.206745 0 11.250000 0 0.000000 0.000000
+CURVE 3 0 0 0 0 DEMO 2 22.859949 -1.206745 0 11.250000 0 0.000000 0.000000
E 11.625000 -0.625000 182.964125
E 20.250359 9.736405 76.587298
END
-STRUCTURE 4 0 0 0 0 N 2 8.625000 7.750000 0 0.000000 "Walthers Shady Jct Water Tower 933-3205a"
+STRUCTURE 4 0 0 0 0 DEMO 2 8.625000 7.750000 0 0.000000 "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
@@ -78,427 +78,524 @@ RESET
COMMAND Select
MOUSE 2 5.562 5.000
MOUSE 4 5.562 5.000
+#COMMAND Rotate
+#MOUSE 5 4.062 4.500
+#MOUSE 6 4.062 4.438
+#MOUSE 7 4.062 4.438
+#MOUSE 2 4.062 4.625
+#MOUSE 3 4.062 4.625
+#MOUSE 3 4.062 4.688
+#MOUSE 3 4.062 4.812
+#MOUSE 3 4.125 4.938
+#MOUSE 3 4.125 5.000
+#MOUSE 3 4.125 5.000
+#MOUSE 3 4.125 5.062
+#MOUSE 3 4.125 5.125
+#MOUSE 3 4.125 5.188
+#MOUSE 3 4.125 5.250
+#MOUSE 3 4.188 5.312
+#MOUSE 3 4.188 5.312
+#MOUSE 3 4.188 5.375
+#MOUSE 3 4.188 5.438
+#MOUSE 3 4.188 5.500
+#MOUSE 3 4.250 5.500
+#MOUSE 3 4.250 5.562
+#MOUSE 3 4.250 5.625
+#MOUSE 3 4.312 5.625
+#MOUSE 3 4.312 5.688
+#MOUSE 3 4.312 5.750
+#MOUSE 3 4.312 5.812
+#MOUSE 3 4.312 5.812
+#MOUSE 3 4.312 5.875
+#MOUSE 3 4.312 5.938
+#MOUSE 3 4.375 5.938
+#MOUSE 3 4.375 6.000
+#MOUSE 3 4.375 6.000
+#MOUSE 3 4.438 6.000
+#MOUSE 3 4.500 6.000
+#MOUSE 3 4.562 6.000
+#MOUSE 3 4.562 6.062
+#MOUSE 3 4.625 6.062
+#MOUSE 3 4.625 6.062
+#MOUSE 3 4.688 6.062
+#MOUSE 3 4.688 6.125
+#MOUSE 3 4.750 6.125
+#MOUSE 3 4.812 6.125
+#MOUSE 3 4.938 6.125
+#MOUSE 3 5.000 6.125
+#MOUSE 4 5.000 6.125
+COMMAND Select
+MOUSE 2 4.25 4.5
+MOUSE 4 4.25 4.5
COMMAND Rotate
-MOUSE 5 4.062 4.500
-MOUSE 6 4.062 4.438
-MOUSE 7 4.062 4.438
-MOUSE 2 4.062 4.625
-MOUSE 3 4.062 4.625
-MOUSE 3 4.062 4.688
-MOUSE 3 4.062 4.812
-MOUSE 3 4.125 4.938
-MOUSE 3 4.125 5.000
-MOUSE 3 4.125 5.000
-MOUSE 3 4.125 5.062
-MOUSE 3 4.125 5.125
-MOUSE 3 4.125 5.188
-MOUSE 3 4.125 5.250
-MOUSE 3 4.188 5.312
-MOUSE 3 4.188 5.312
-MOUSE 3 4.188 5.375
-MOUSE 3 4.188 5.438
-MOUSE 3 4.188 5.500
-MOUSE 3 4.250 5.500
-MOUSE 3 4.250 5.562
-MOUSE 3 4.250 5.625
-MOUSE 3 4.312 5.625
-MOUSE 3 4.312 5.688
-MOUSE 3 4.312 5.750
-MOUSE 3 4.312 5.812
-MOUSE 3 4.312 5.812
-MOUSE 3 4.312 5.875
-MOUSE 3 4.312 5.938
-MOUSE 3 4.375 5.938
-MOUSE 3 4.375 6.000
-MOUSE 3 4.375 6.000
-MOUSE 3 4.438 6.000
-MOUSE 3 4.500 6.000
-MOUSE 3 4.562 6.000
-MOUSE 3 4.562 6.062
-MOUSE 3 4.625 6.062
-MOUSE 3 4.625 6.062
-MOUSE 3 4.688 6.062
-MOUSE 3 4.688 6.125
-MOUSE 3 4.750 6.125
-MOUSE 3 4.812 6.125
-MOUSE 3 4.938 6.125
-MOUSE 3 5.000 6.125
-MOUSE 4 5.000 6.125
+KEYSTATE 2
+MOUSE 2 4.25 4.5
+MOUSE 3 12.000 18.000
+MOUSE 4 1.000 10.000
MESSAGE
_________________________________________
-The <Rotate> command will restrict the rotation to increments of 15 if you hold down the Control key.
+The <Rotate> command will restrict the rotation to increments of 15 if you hold down the <Shift> and <Ctrl> keys.
END
STEP
PARAMETER misc cmdUndo
RESET
COMMAND Rotate
-KEYSTATE 4
-MOUSE 2 4.125 4.625
-KEYSTATE 4
-MOUSE 3 4.125 4.688
-KEYSTATE 4
-MOUSE 3 4.188 4.688
-KEYSTATE 4
-MOUSE 3 4.188 4.750
-KEYSTATE 4
-MOUSE 3 4.188 4.812
-KEYSTATE 4
-MOUSE 3 4.188 4.875
-KEYSTATE 4
-MOUSE 3 4.125 4.875
-KEYSTATE 4
-MOUSE 3 4.125 4.938
-KEYSTATE 4
-MOUSE 3 4.125 5.000
-KEYSTATE 4
-MOUSE 3 4.125 5.000
-KEYSTATE 4
-MOUSE 3 4.125 5.062
-KEYSTATE 4
-MOUSE 3 4.125 5.125
-KEYSTATE 4
-MOUSE 3 4.125 5.188
-KEYSTATE 4
-MOUSE 3 4.125 5.312
-KEYSTATE 4
-MOUSE 3 4.125 5.312
-KEYSTATE 4
-MOUSE 3 4.188 5.438
-KEYSTATE 4
-MOUSE 3 4.188 5.500
-KEYSTATE 4
-MOUSE 3 4.188 5.562
-KEYSTATE 4
-MOUSE 3 4.188 5.625
-KEYSTATE 4
-MOUSE 3 4.188 5.625
-KEYSTATE 4
-MOUSE 3 4.188 5.688
-KEYSTATE 4
-MOUSE 3 4.188 5.750
-KEYSTATE 4
-MOUSE 3 4.250 5.812
-KEYSTATE 4
-MOUSE 3 4.250 5.875
-KEYSTATE 4
-MOUSE 3 4.250 6.000
-KEYSTATE 4
-MOUSE 3 4.312 6.000
-KEYSTATE 4
-MOUSE 3 4.312 6.062
-KEYSTATE 4
-MOUSE 3 4.312 6.125
-KEYSTATE 4
-MOUSE 3 4.312 6.188
-KEYSTATE 4
-MOUSE 3 4.312 6.250
-KEYSTATE 4
-MOUSE 3 4.375 6.250
-KEYSTATE 4
-MOUSE 3 4.438 6.250
-KEYSTATE 4
-MOUSE 3 4.500 6.250
-KEYSTATE 4
-MOUSE 3 4.562 6.312
-KEYSTATE 4
-MOUSE 3 4.625 6.312
-KEYSTATE 4
-MOUSE 3 4.625 6.375
-KEYSTATE 4
-MOUSE 3 4.688 6.375
-KEYSTATE 4
-MOUSE 3 4.750 6.375
-KEYSTATE 4
-MOUSE 3 4.750 6.438
-KEYSTATE 4
-MOUSE 3 4.750 6.500
-KEYSTATE 4
-MOUSE 3 4.812 6.500
-KEYSTATE 4
-MOUSE 3 4.812 6.562
-KEYSTATE 4
-MOUSE 3 4.875 6.562
-KEYSTATE 4
-MOUSE 3 4.938 6.562
-KEYSTATE 4
-MOUSE 3 5.000 6.562
-KEYSTATE 4
-MOUSE 3 5.000 6.562
-KEYSTATE 4
-MOUSE 3 5.062 6.562
-KEYSTATE 4
-MOUSE 3 5.125 6.562
-KEYSTATE 4
-MOUSE 3 5.188 6.562
-KEYSTATE 4
-MOUSE 3 5.250 6.562
-KEYSTATE 4
-MOUSE 3 5.312 6.562
-KEYSTATE 4
-MOUSE 3 5.312 6.500
-KEYSTATE 4
-MOUSE 3 5.312 6.438
-KEYSTATE 4
-MOUSE 3 5.312 6.375
-KEYSTATE 4
-MOUSE 3 5.375 6.375
-KEYSTATE 4
-MOUSE 3 5.438 6.375
-KEYSTATE 4
-MOUSE 3 5.438 6.312
-KEYSTATE 4
-MOUSE 3 5.438 6.312
-KEYSTATE 4
-MOUSE 3 5.500 6.312
-KEYSTATE 4
-MOUSE 3 5.500 6.250
-KEYSTATE 4
-MOUSE 3 5.562 6.250
-KEYSTATE 4
-MOUSE 3 5.562 6.188
-KEYSTATE 4
-MOUSE 3 5.562 6.125
-KEYSTATE 4
-MOUSE 3 5.625 6.125
-KEYSTATE 4
-MOUSE 3 5.625 6.062
-KEYSTATE 4
-MOUSE 3 5.625 6.062
-KEYSTATE 4
-MOUSE 3 5.625 6.000
-KEYSTATE 4
-MOUSE 3 5.625 6.000
-KEYSTATE 4
-MOUSE 3 5.688 6.000
-KEYSTATE 4
-MOUSE 3 5.688 5.938
-KEYSTATE 4
-MOUSE 3 5.750 5.938
-KEYSTATE 4
-MOUSE 3 5.750 5.875
-KEYSTATE 4
-MOUSE 3 5.812 5.875
-KEYSTATE 4
-MOUSE 3 5.812 5.812
-KEYSTATE 4
-MOUSE 3 5.875 5.750
-KEYSTATE 4
-MOUSE 3 5.875 5.688
-KEYSTATE 4
-MOUSE 3 5.938 5.688
-KEYSTATE 4
-MOUSE 3 5.938 5.625
-KEYSTATE 4
-MOUSE 3 5.938 5.625
-KEYSTATE 4
-MOUSE 3 6.000 5.625
-KEYSTATE 4
-MOUSE 4 6.000 5.625
-MESSAGE
-_________________________________________
-
-Shift-Right-Click will display a popup-menu that you can use to rotate by fixed amount (15, 30, 45, 90 or 180). The demonstration cannot show the popup-menu but it can show the effects.
-
-Here we will rotate by 90 clockwise (CW).
-END
-STEP
-KEYSTATE 2
-MOUSE 5 3.812 4.688
-KEYSTATE 2
-MOUSE 7 3.812 4.688
-MENU 3.812 4.688 "Move Draw Mode " "90 CW"
-MESSAGE
-_________________________________________
-
-Another option of the <Rotate> command popup-menu is to Align the Selected object with some other object.
-
-First we will click on one line of the Selected object. The angle of this part of the object will be Aligned.
-END
-STEP
-KEYSTATE 2
-MOUSE 5 5.875 5.000
-KEYSTATE 2
-MOUSE 7 5.875 5.000
-MENU 5.875 5.000 "Move Draw Mode " "Align"
-MOUSE 2 5.812 5.125
-MOUSE 4 5.812 5.125
-MESSAGE
-_________________________________________
-
-Next, we click on an Unselected object. The Selected structure will be rotated so that the line we clicked on will be parallel to the straight track.
-END
-STEP
-MOUSE 2 6.625 3.062
-MESSAGE
-_________________________________________
-
-If we drag the mouse across the track, we can flip the structure by 180. This is similar to how we place turnouts.
-END
-STEP
-MOUSE 3 6.750 2.750
-BIGPAUSE
-MOUSE 3 6.625 3.062
-BIGPAUSE
-MOUSE 3 6.750 2.750
+#KEYSTATE 2
+#MOUSE 2 4.125 4.625
+#KEYSTATE 2
+#MOUSE 3 4.125 4.688
+#KEYSTATE 2
+#MOUSE 3 4.188 4.688
+#KEYSTATE 2
+#MOUSE 3 4.188 4.750
+#KEYSTATE 2
+#MOUSE 3 4.188 4.812
+#KEYSTATE 2
+#MOUSE 3 4.188 4.875
+#KEYSTATE 2
+#MOUSE 3 4.125 4.875
+#KEYSTATE 2
+#MOUSE 3 4.125 4.938
+#KEYSTATE 2
+#MOUSE 3 4.125 5.000
+#KEYSTATE 2
+#MOUSE 3 4.125 5.000
+#KEYSTATE 2
+#MOUSE 3 4.125 5.062
+#KEYSTATE 2
+#MOUSE 3 4.125 5.125
+#KEYSTATE 2
+#MOUSE 3 4.125 5.188
+#KEYSTATE 2
+#MOUSE 3 4.125 5.312
+#KEYSTATE 2
+#MOUSE 3 4.125 5.312
+#KEYSTATE 2
+#MOUSE 3 4.188 5.438
+#KEYSTATE 2
+#MOUSE 3 4.188 5.500
+#KEYSTATE 2
+#MOUSE 3 4.188 5.562
+#KEYSTATE 2
+#MOUSE 3 4.188 5.625
+#KEYSTATE 2
+#MOUSE 3 4.188 5.625
+#KEYSTATE 2
+#MOUSE 3 4.188 5.688
+#KEYSTATE 2
+#MOUSE 3 4.188 5.750
+#KEYSTATE 2
+#MOUSE 3 4.250 5.812
+#KEYSTATE 2
+#MOUSE 3 4.250 5.875
+#KEYSTATE 2
+#MOUSE 3 4.250 6.000
+#KEYSTATE 2
+#MOUSE 3 4.312 6.000
+#KEYSTATE 2
+#MOUSE 3 4.312 6.062
+#KEYSTATE 2
+#MOUSE 3 4.312 6.125
+#KEYSTATE 2
+#MOUSE 3 4.312 6.188
+#KEYSTATE 2
+#MOUSE 3 4.312 6.250
+#KEYSTATE 2
+#MOUSE 3 4.375 6.250
+#KEYSTATE 2
+#MOUSE 3 4.438 6.250
+#KEYSTATE 2
+#MOUSE 3 4.500 6.250
+#KEYSTATE 2
+#MOUSE 3 4.562 6.312
+#KEYSTATE 2
+#MOUSE 3 4.625 6.312
+#KEYSTATE 2
+#MOUSE 3 4.625 6.375
+#KEYSTATE 2
+#MOUSE 3 4.688 6.375
+#KEYSTATE 2
+#MOUSE 3 4.750 6.375
+#KEYSTATE 2
+#MOUSE 3 4.750 6.438
+#KEYSTATE 2
+#MOUSE 3 4.750 6.500
+#KEYSTATE 2
+#MOUSE 3 4.812 6.500
+#KEYSTATE 2
+#MOUSE 3 4.812 6.562
+#KEYSTATE 2
+#MOUSE 3 4.875 6.562
+#KEYSTATE 2
+#MOUSE 3 4.938 6.562
+#KEYSTATE 2
+#MOUSE 3 5.000 6.562
+#KEYSTATE 2
+#MOUSE 3 5.000 6.562
+#KEYSTATE 2
+#MOUSE 3 5.062 6.562
+#KEYSTATE 2
+#MOUSE 3 5.125 6.562
+#KEYSTATE 2
+#MOUSE 3 5.188 6.562
+#KEYSTATE 2
+#MOUSE 3 5.250 6.562
+#KEYSTATE 2
+#MOUSE 3 5.312 6.562
+#KEYSTATE 2
+#MOUSE 3 5.312 6.500
+#KEYSTATE 2
+#MOUSE 3 5.312 6.438
+#KEYSTATE 2
+#MOUSE 3 5.312 6.375
+#KEYSTATE 2
+#MOUSE 3 5.375 6.375
+#KEYSTATE 2
+#MOUSE 3 5.438 6.375
+#KEYSTATE 2
+#MOUSE 3 5.438 6.312
+#KEYSTATE 2
+#MOUSE 3 5.438 6.312
+#KEYSTATE 2
+#MOUSE 3 5.500 6.312
+#KEYSTATE 2
+#MOUSE 3 5.500 6.250
+#KEYSTATE 2
+#MOUSE 3 5.562 6.250
+#KEYSTATE 2
+#MOUSE 3 5.562 6.188
+#KEYSTATE 2
+#MOUSE 3 5.562 6.125
+#KEYSTATE 2
+#MOUSE 3 5.625 6.125
+#KEYSTATE 2
+#MOUSE 3 5.625 6.062
+#KEYSTATE 2
+#MOUSE 3 5.625 6.062
+#KEYSTATE 2
+#MOUSE 3 5.625 6.000
+#KEYSTATE 2
+#MOUSE 3 5.625 6.000
+#KEYSTATE 2
+#MOUSE 3 5.688 6.000
+#KEYSTATE 2
+#MOUSE 3 5.688 5.938
+#KEYSTATE 2
+#MOUSE 3 5.750 5.938
+#KEYSTATE 2
+#MOUSE 3 5.750 5.875
+#KEYSTATE 2
+#MOUSE 3 5.812 5.875
+#KEYSTATE 2
+#MOUSE 3 5.812 5.812
+#KEYSTATE 2
+#MOUSE 3 5.875 5.750
+#KEYSTATE 2
+#MOUSE 3 5.875 5.688
+#KEYSTATE 2
+#MOUSE 3 5.938 5.688
+#KEYSTATE 2
+#MOUSE 3 5.938 5.625
+#KEYSTATE 2
+#MOUSE 3 5.938 5.625
+#KEYSTATE 2
+#MOUSE 3 6.000 5.625
+#KEYSTATE 2
+#MOUSE 4 6.000 5.625
+COMMAND Select
+MOUSE 2 4.25 4.5
+MOUSE 4 4.25 4.5
+COMMAND Rotate
+KEYSTATE 6
+MOUSE 2 4.25 4.5
+KEYSTATE 6
+MOUSE 3 12.000 18.000
+KEYSTATE 6
+MOUSE 4 1.000 10.000
MESSAGE
_________________________________________
-We can also align to curved shapes. The Selected object will be rotated to be parallel to the curve under the cursor.
-END
-STEP
-MOUSE 3 12.250 3.250
-MESSAGE
-_________________________________________
+There are Rotate options that you can access by Shift-Right-Click command menu and choosing 'Rotate...'.
-As we drag along the curved track the Selected object rotates to follow the curve.
-END
-STEP
-MOUSE 3 12.250 3.312
-MOUSE 3 12.312 3.312
-MOUSE 3 12.312 3.438
-MOUSE 3 12.312 3.562
-MOUSE 3 12.312 3.625
-MOUSE 3 12.312 3.750
-MOUSE 3 12.375 3.812
-MOUSE 3 12.375 3.938
-MOUSE 3 12.500 4.000
-MOUSE 3 12.562 4.062
-MOUSE 3 12.625 4.125
-MOUSE 3 12.688 4.250
-MOUSE 3 12.750 4.312
-MOUSE 3 12.812 4.312
-MOUSE 3 12.875 4.375
-MOUSE 3 12.938 4.438
-MOUSE 3 13.000 4.500
-MOUSE 3 13.062 4.625
-MOUSE 3 13.125 4.625
-MOUSE 3 13.188 4.688
-MOUSE 3 13.250 4.812
-MOUSE 3 13.312 4.875
-MOUSE 3 13.312 4.938
-MOUSE 3 13.312 5.000
-MOUSE 3 13.375 5.125
-MOUSE 3 13.438 5.250
-MOUSE 3 13.500 5.312
-MOUSE 3 13.500 5.438
-MOUSE 3 13.562 5.500
-MOUSE 3 13.625 5.562
-MOUSE 3 13.625 5.625
-MOUSE 3 13.625 5.688
-MOUSE 3 13.625 5.812
-MOUSE 3 13.688 5.938
-MOUSE 3 13.750 6.000
-MOUSE 3 13.812 6.125
-MOUSE 3 13.812 6.250
-MOUSE 3 13.875 6.312
-MOUSE 3 13.938 6.312
-MOUSE 3 14.000 6.375
-MOUSE 3 14.062 6.375
-MOUSE 3 14.188 6.438
-MOUSE 3 14.250 6.500
-MOUSE 3 14.312 6.562
-MOUSE 3 14.438 6.562
-MESSAGE
-_________________________________________
+You can rotate the selected object by a fixed rotatation (15, 30, 45, 90, 180) either clockwise or counter-clockwise, or by manually entering any angle.
-Again, if we drag across the track we can flip the stucture.
-END
-STEP
-MOUSE 3 14.600 6.200
-BIGPAUSE
-MESSAGE
-_________________________________________
-
-We can also Align to another Structure or any object.
+The other option is 'Align' which allows you align selected objects with an unselected object. This is useful to align railside buildings with track.
+Unfortunately, we can not currently demonstrate these features.
END
-STEP
-MOUSE 3 8.500 7.812
-MOUSE 3 8.500 7.875
-MOUSE 3 8.500 7.938
-MOUSE 3 8.500 8.000
-MOUSE 3 8.500 8.000
-MOUSE 3 8.500 8.062
-MOUSE 3 8.500 8.125
-MOUSE 3 8.500 8.188
-MOUSE 3 8.500 8.250
-MOUSE 3 8.500 8.312
-MOUSE 3 8.500 8.312
-MOUSE 3 8.500 8.375
-MOUSE 3 8.500 8.438
-MOUSE 3 8.500 8.500
-MOUSE 3 8.500 8.562
-MOUSE 3 8.500 8.625
-MOUSE 3 8.500 8.625
-MOUSE 3 8.500 8.688
-MOUSE 3 8.500 8.750
-MOUSE 3 8.562 8.812
-MOUSE 3 8.562 8.875
-MOUSE 3 8.562 8.938
-MOUSE 3 8.562 9.000
-MOUSE 3 8.625 9.000
-MOUSE 3 8.625 9.000
-MOUSE 3 8.625 9.062
-MOUSE 3 8.625 9.125
-MOUSE 3 8.625 9.188
-MOUSE 3 8.625 9.250
-MOUSE 3 8.625 9.312
-MOUSE 3 8.625 9.312
-MOUSE 3 8.625 9.375
-MOUSE 3 8.625 9.438
-MOUSE 3 8.625 9.375
-MOUSE 3 8.625 9.375
-MOUSE 3 8.688 9.312
-MOUSE 3 8.750 9.312
-MOUSE 3 8.750 9.312
-MOUSE 3 8.875 9.312
-MOUSE 3 8.938 9.312
-MOUSE 3 9.000 9.312
-MOUSE 3 9.000 9.312
-MOUSE 3 9.062 9.312
-MOUSE 3 9.062 9.312
-MOUSE 3 9.125 9.312
-MOUSE 3 9.188 9.312
-MOUSE 3 9.250 9.312
-MOUSE 3 9.312 9.312
-MOUSE 3 9.312 9.312
-MOUSE 3 9.375 9.312
-MOUSE 3 9.438 9.312
-MOUSE 3 9.500 9.312
-MOUSE 3 9.562 9.312
-MOUSE 3 9.625 9.312
-MOUSE 3 9.625 9.312
-MOUSE 3 9.688 9.312
-MOUSE 3 9.750 9.312
-MOUSE 3 9.812 9.312
-MOUSE 3 9.875 9.312
-MOUSE 3 9.938 9.312
-MOUSE 3 10.000 9.312
-MOUSE 3 10.000 9.312
-MOUSE 3 10.062 9.312
-MOUSE 3 10.125 9.312
-MOUSE 3 10.125 9.312
-MOUSE 3 10.125 9.250
-MOUSE 3 10.125 9.188
-MOUSE 3 10.125 9.125
-MOUSE 3 10.125 9.062
-MOUSE 3 10.062 9.062
-MOUSE 3 10.062 9.000
-MOUSE 3 10.062 9.000
-MOUSE 3 10.062 8.938
-MOUSE 3 10.062 8.875
-MOUSE 3 10.062 8.812
-MOUSE 3 10.125 8.812
-MOUSE 3 10.125 8.750
-MOUSE 3 10.125 8.688
-MOUSE 3 10.125 8.625
-MOUSE 3 10.125 8.625
-MOUSE 3 10.125 8.562
-MOUSE 3 10.125 8.500
-MOUSE 4 10.125 8.500
+#MESSAGE
+#_________________________________________
+#
+#Shift-Right-Click will display a popup-menu that you can use to rotate by fixed amount (15, 30, 45, 90 or 180).
+#
+#We can not currently show this command.
+#END
+#STEP
+#KEYSTATE 2
+#MOUSE 2 3.812 4.688
+#KEYSTATE 2
+#MOUSE 4 3.812 4.688
+#MENU 3.812 4.688 "Track Selected Menu " "90 CW"
+#MESSAGE
+#_________________________________________
+#
+#Another option of the <Rotate> command popup-menu is to Align the Selected object with some other object.
+#
+#First we will click on one line of the Selected object. The angle of this part of the object will be Aligned.
+#END
+#STEP
+#KEYSTATE 2
+#MOUSE 5 5.875 5.000
+#KEYSTATE 2
+#MOUSE 7 5.875 5.000
+#MENU 5.875 5.000 "Track Selected Menu " "Align"
+#MOUSE 2 5.812 5.125
+#MOUSE 4 5.812 5.125
+#MESSAGE
+#_________________________________________
+#
+#Next, we click on an Unselected object. The Selected structure will be rotated so that the line we clicked on will be parallel to the straight track.
+#END
+#STEP
+#MOUSE 2 6.625 3.062
+#MESSAGE
+#_________________________________________
+#
+#If we drag the mouse across the track, we can flip the structure by 180. This is similar to how we place turnouts.
+#END
+#STEP
+#MOUSE 3 6.750 2.750
+#BIGPAUSE
+#MOUSE 3 6.625 3.062
+#BIGPAUSE
+#MOUSE 3 6.750 2.750
+#MESSAGE
+#_________________________________________
+#
+#We can also align to curved shapes. The Selected object will be rotated to be parallel to the curve under the cursor.
+#END
+#STEP
+#MOUSE 3 12.250 3.250
+#MESSAGE
+#_________________________________________
+#
+#As we drag along the curved track the Selected object rotates to follow the curve.
+#END
+#STEP
+#MOUSE 3 12.250 3.312
+#MOUSE 3 12.312 3.312
+#MOUSE 3 12.312 3.438
+#MOUSE 3 12.312 3.562
+#MOUSE 3 12.312 3.625
+#MOUSE 3 12.312 3.750
+#MOUSE 3 12.375 3.812
+#MOUSE 3 12.375 3.938
+#MOUSE 3 12.500 4.000
+#MOUSE 3 12.562 4.062
+#MOUSE 3 12.625 4.125
+#MOUSE 3 12.688 4.250
+#MOUSE 3 12.750 4.312
+#MOUSE 3 12.812 4.312
+#MOUSE 3 12.875 4.375
+#MOUSE 3 12.938 4.438
+#MOUSE 3 13.000 4.500
+#MOUSE 3 13.062 4.625
+#MOUSE 3 13.125 4.625
+#MOUSE 3 13.188 4.688
+#MOUSE 3 13.250 4.812
+#MOUSE 3 13.312 4.875
+#MOUSE 3 13.312 4.938
+#MOUSE 3 13.312 5.000
+#MOUSE 3 13.375 5.125
+#MOUSE 3 13.438 5.250
+#MOUSE 3 13.500 5.312
+#MOUSE 3 13.500 5.438
+#MOUSE 3 13.562 5.500
+#MOUSE 3 13.625 5.562
+#MOUSE 3 13.625 5.625
+#MOUSE 3 13.625 5.688
+#MOUSE 3 13.625 5.812
+#MOUSE 3 13.688 5.938
+#MOUSE 3 13.750 6.000
+#MOUSE 3 13.812 6.125
+#MOUSE 3 13.812 6.250
+#MOUSE 3 13.875 6.312
+#MOUSE 3 13.938 6.312
+#MOUSE 3 14.000 6.375
+#MOUSE 3 14.062 6.375
+#MOUSE 3 14.188 6.438
+#MOUSE 3 14.250 6.500
+#MOUSE 3 14.312 6.562
+#MOUSE 3 14.438 6.562
+#MESSAGE
+#_________________________________________
+#
+#Again, if we drag across the track we can flip the stucture.
+#END
+#STEP
+#MOUSE 3 14.600 6.200
+#BIGPAUSE
+#MESSAGE
+#_________________________________________
+#
+#We can also Align to another Structure or any object.
+#
+#END
+#STEP
+#MOUSE 3 8.500 7.812
+#MOUSE 3 8.500 7.875
+#MOUSE 3 8.500 7.938
+#MOUSE 3 8.500 8.000
+#MOUSE 3 8.500 8.000
+#MOUSE 3 8.500 8.062
+#MOUSE 3 8.500 8.125
+#MOUSE 3 8.500 8.188
+#MOUSE 3 8.500 8.250
+#MOUSE 3 8.500 8.312
+#MOUSE 3 8.500 8.312
+#MOUSE 3 8.500 8.375
+#MOUSE 3 8.500 8.438
+#MOUSE 3 8.500 8.500
+#MOUSE 3 8.500 8.562
+#MOUSE 3 8.500 8.625
+#MOUSE 3 8.500 8.625
+#MOUSE 3 8.500 8.688
+#MOUSE 3 8.500 8.750
+#MOUSE 3 8.562 8.812
+#MOUSE 3 8.562 8.875
+#MOUSE 3 8.562 8.938
+#MOUSE 3 8.562 9.000
+#MOUSE 3 8.625 9.000
+#MOUSE 3 8.625 9.000
+#MOUSE 3 8.625 9.062
+#MOUSE 3 8.625 9.125
+#MOUSE 3 8.625 9.188
+#MOUSE 3 8.625 9.250
+#MOUSE 3 8.625 9.312
+#MOUSE 3 8.625 9.312
+#MOUSE 3 8.625 9.375
+#MOUSE 3 8.625 9.438
+#MOUSE 3 8.625 9.375
+#MOUSE 3 8.625 9.375
+#MOUSE 3 8.688 9.312
+#MOUSE 3 8.750 9.312
+#MOUSE 3 8.750 9.312
+#MOUSE 3 8.875 9.312
+#MOUSE 3 8.938 9.312
+#MOUSE 3 9.000 9.312
+#MOUSE 3 9.000 9.312
+#MOUSE 3 9.062 9.312
+#MOUSE 3 9.062 9.312
+#MOUSE 3 9.125 9.312
+#MOUSE 3 9.188 9.312
+#MOUSE 3 9.250 9.312
+#MOUSE 3 9.312 9.312
+#MOUSE 3 9.312 9.312
+#MOUSE 3 9.375 9.312
+#MOUSE 3 9.438 9.312
+#MOUSE 3 9.500 9.312
+#MOUSE 3 9.562 9.312
+#MOUSE 3 9.625 9.312
+#MOUSE 3 9.625 9.312
+#MOUSE 3 9.688 9.312
+#MOUSE 3 9.750 9.312
+#MOUSE 3 9.812 9.312
+#MOUSE 3 9.875 9.312
+#MOUSE 3 9.938 9.312
+#MOUSE 3 10.000 9.312
+#MOUSE 3 10.000 9.312
+#MOUSE 3 10.062 9.312
+#MOUSE 3 10.125 9.312
+#MOUSE 3 10.125 9.312
+#MOUSE 3 10.125 9.250
+#MOUSE 3 10.125 9.188
+#MOUSE 3 10.125 9.125
+#MOUSE 3 10.125 9.062
+#MOUSE 3 10.062 9.062
+#MOUSE 3 10.062 9.000
+#MOUSE 3 10.062 9.000
+#MOUSE 3 10.062 8.938
+#MOUSE 3 10.062 8.875
+#MOUSE 3 10.062 8.812
+#MOUSE 3 10.125 8.812
+#MOUSE 3 10.125 8.750
+#MOUSE 3 10.125 8.688
+#MOUSE 3 10.125 8.625
+#MOUSE 3 10.125 8.625
+#MOUSE 3 10.125 8.562
+#MOUSE 3 10.125 8.500
+#MOUSE 4 10.125 8.500
MESSAGE
=========================================
END
+REGRESSION START 10 - rotate
+STRUCTURE 1 0 0 0 0 DEMO 2 4.369912 1.832693 0 300.000000 "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 2.250000 0.062500 236.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 19.375000 11.312500 56.697715 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 3 0 0 0 0 DEMO 2 22.859949 -1.206745 0 11.250000 0 0.000000 0.000000
+ E4 11.625000 -0.625000 182.964125 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 20.250359 9.736405 76.587298 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRUCTURE 4 0 0 0 0 DEMO 2 8.625000 7.750000 0 0.000000 "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
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmruler.xtr b/app/lib/demos/dmruler.xtr
index 7c24ef9..593fde8 100644
--- a/app/lib/demos/dmruler.xtr
+++ b/app/lib/demos/dmruler.xtr
@@ -43,4 +43,7 @@ MESSAGE
=========================================
END
STEP
+MOUSE 2 29.250 5.750
+MOUSE 4 29.250 5.750
+COMMAND Ruler
CLEAR
diff --git a/app/lib/demos/dmselect.xtr b/app/lib/demos/dmselect.xtr
index 99fecc3..06bed0c 100644
--- a/app/lib/demos/dmselect.xtr
+++ b/app/lib/demos/dmselect.xtr
@@ -1,6 +1,6 @@
VERSION 2
DEMOINIT
-ORIG 8.000 0.000 0.000
+ORIG 4 0.000 0.000
PARAMETER pref dragtimeout 2000
STRAIGHT 1 DEMO 1
T 2 7.466667 2.666667 270.000000
@@ -168,67 +168,116 @@ DRAW 20 0.000000 0.000000 0.000000
END
REDRAW
RESET
+CLEAR
+MOUSE 1 1.000 1.000
MESSAGE
The <Select> command is used to select tracks.
Selected tracks can be moved or rotated during the <Select> command.
Selected tracks can also be deleted, hidden, listed and exported.
+
+When you move the cursor near a track that could be selected, the track is drawn with think blue lines.
END
-BIGPAUSE
+STEP
+COMMAND Select
MESSAGE
_________________________________________
-A single Left-Click selects tracks.
+A Left-Click selects a track
END
STEP
MOUSE 2 18.347 2.773
MOUSE 4 18.347 2.773
+MESSAGE
+================================================
+The selected track will have red X's drawn where it is connected to unselected tracks. This indicates where the track will be disconnected if the selected tracks are moved, rotated or deleted.
+
+A Ctrl-Left-Click adds tracks to the selection
+END
+STEP
+KEYSTATE 4
MOUSE 2 27.733 6.613
+KEYSTATE 4
MOUSE 4 27.733 6.613
+KEYSTATE 4
MOUSE 2 30.720 9.920
+KEYSTATE 4
MOUSE 4 30.720 9.920
+KEYSTATE 4
MOUSE 2 12.373 13.013
+KEYSTATE 4
MOUSE 4 12.373 13.013
-BIGPAUSE
MESSAGE
-_________________________________________
+___________________________________________
-Selecting a selected track de-selects it.
+Selecting a selected track re-selects only it.
END
STEP
MOUSE 2 27.840 8.213
MOUSE 4 27.840 8.213
MESSAGE
+___________________________________________
+
+Selecting off all tracks de-selects them.
+END
+STEP
+MOUSE 2 12.840 8.213
+MOUSE 4 12.840 8.213
+MESSAGE
=========================================
END
STEP
CLEAR
MESSAGE
+To demonstrate Select Connected, first select two tracks at the end of a part to be selected
+
+END
+STEP
+#KEYSTATE 4
+#MOUSE 2 10.347 2.773
+#KEYSTATE 4
+#MOUSE 4 10.347 2.773
+MOUSE 2 2.5 6.6
+MOUSE 4 2.5 6.6
+KEYSTATE 4
+MOUSE 2 27.733 6.613
+KEYSTATE 4
+MOUSE 4 27.733 6.613
+#CLEAR
+MESSAGE
+__________________________________________
+
Shift-Left-Click on a track will select all unselected tracks connected to the track. Selection stops at a previously selected track.
END
STEP
KEYSTATE 2
-MOUSE 2 27.627 14.400
+#MOUSE 2 27.627 14.400
+MOUSE 2 10.347 2.773
KEYSTATE 2
-MOUSE 4 27.627 14.400
+#MOUSE 4 27.627 14.400
+MOUSE 4 10.347 2.773
MESSAGE
_________________________________________
-Be careful with this because its easy to select all tracks this way.
+Be careful with this because its very easy to select all tracks this way
END
STEP
+MOUSE 2 19.840 2.560
+MOUSE 4 19.840 2.560
+BIGPAUSE
KEYSTATE 2
MOUSE 2 19.840 2.560
KEYSTATE 2
MOUSE 4 19.840 2.560
+STEP
MESSAGE
_________________________________________
The <esc> key will deselect all objects.
END
STEP
-MOUSE 6920 19.840 2.560
+MOUSE 6200 19.840 2.560
RESET
MESSAGE
=========================================
@@ -246,167 +295,310 @@ MOUSE 4 37.480 -1.600
MESSAGE
_________________________________________
-And Right-Drag de-selects all tracks within an area.
-END
-STEP
-MOUSE 5 12.480 2.453
-MOUSE 7 37.707 0.107
-MESSAGE
-=========================================
-END
-STEP
-CLEAR
-MESSAGE
Shift-Left-Drag is used to move selected tracks.
When you move selected tracks that are connected to unselected tracks, the tracks will be disconnected. These points are marked by a Red cross on the layout.
-END
-STEP
-KEYSTATE 2
-MOUSE 2 14.827 8.960
-KEYSTATE 2
-MOUSE 3 21.653 8.640
-KEYSTATE 2
-MOUSE 4 21.653 8.640
-MESSAGE
-=========================================
-END
-STEP
-CLEAR
-MESSAGE
-Drawing the tracks while moving can be very time-consuming. We had just used the "Normal" method of drawing tracks.
-
-The Command Options dialog (from the Options menu) contains a Radio button group which you can use to pick the drawing method.
-
-You can also popup the Command Options Menu by pressing Shift-Right-Click which includes options for setting the drawing method. These options are also available for the Move and Rotate Command Options Menu.
-END
-STEP
-PARAMETER misc cmdCmdopt
-MESSAGE
-_________________________________________
-The next method is "Simple" draws. Here tracks are drawn using one line, no End-Points are drawn, lines are not drawn and structures are drawn using a box outline.
-
-Note: you can move the Command Options dialog if it obscures the main window.
+If the unconnected end point of a track and one being moved are close enough, two circles are displayed, showing where the tracks will be snapped together.
END
STEP
-PARAMETER cmdopt move-quick 1
-BIGPAUSE
KEYSTATE 2
-MOUSE 2 24.533 2.027
+MOUSE 1 13.370000 2.144667
KEYSTATE 2
-MOUSE 3 20.267 2.453
+MOUSE 2 13.370000 2.144667
KEYSTATE 2
-MOUSE 4 20.267 2.453
+MOUSE 3 35.735615 16.2
+KEYSTATE 2
+MOUSE 4 35.735615 16.2
MESSAGE
-_________________________________________
+__________________________________________
-The next method is to just draw the End-Points of the selected tracks.
-
-Unconnected End-Points are indicated by Red crosses, and connected End-Points are indicated by Red lines.
+Let's move the Main window to see what's going on next
END
STEP
-PARAMETER cmdopt move-quick 2
-BIGPAUSE
-KEYSTATE 2
-MOUSE 2 17.493 0.427
-KEYSTATE 2
-MOUSE 3 17.493 3.427
-KEYSTATE 2
-MOUSE 4 15.787 1.600
+ORIG 4 27.000000 14.000000
MESSAGE
-_________________________________________
+__________________________________________
-Now we will go back to using the Normal method again.
+Ctrl-Left-Drag rotates the selected tracks about the pivot point (which is where you started the drag)
END
STEP
-PARAMETER cmdopt move-quick 0
-BIGPAUSE
-PARAMETER cmdopt ok
+KEYSTATE 4
+MOUSE 2 45.0 24.0
+KEYSTATE 4
+MOUSE 3 60.0 24.0
+KEYSTATE 4
+MOUSE 3 60.0 36.0
+KEYSTATE 4
+MOUSE 3 45.0 36.0
+KEYSTATE 4
+MOUSE 4 45.0 36.0
+#KEYSTATE 4
+#MOUSE 1 35.735615 15.54695
+#BIGPAUSE
+#KEYSTATE 4
+#MOUSE 2 35.7 16.4
+#STEP
+#KEYSTATE 4
+#MOUSE 3 41.653 18.640
+#PAUSE 200
+#KEYSTATE 4
+#MOUSE 3 44.960 19.813
+#PAUSE 200
+#KEYSTATE 4
+#MOUSE 3 45.067 20.240
+#KEYSTATE 4
+#MOUSE 3 45.173 20.453
+#KEYSTATE 4
+#MOUSE 3 45.280 20.773
+#KEYSTATE 4
+#MOUSE 3 45.387 21.093
+#KEYSTATE 4
+#MOUSE 3 45.493 21.520
+#STEP
+#KEYSTATE 4
+#MOUSE 3 45.813 21.947
+#KEYSTATE 4
+#MOUSE 3 46.133 22.480
+#KEYSTATE 4
+#MOUSE 3 46.453 22.800
+#KEYSTATE 4
+#MOUSE 3 46.987 22.907
+#KEYSTATE 4
+#MOUSE 3 47.627 23.227
+#KEYSTATE 4
+#MOUSE 3 48.053 23.227
+#KEYSTATE 4
+#MOUSE 3 48.267 23.227
+#KEYSTATE 4
+#MOUSE 3 48.480 23.227
+#KEYSTATE 4
+#MOUSE 3 48.267 23.227
+#KEYSTATE 4
+#MOUSE 3 48.373 23.227
+#STEP
+#KEYSTATE 4
+#MOUSE 4 48.373 23.227
MESSAGE
=========================================
END
STEP
CLEAR
MESSAGE
-Shift-Right-Drag rotates the selected tracks about the pivot point (which is where you started the drag)
+Next we select the <Join Tracks> command to demonstrate "Move To Join"
END
STEP
-KEYSTATE 2
-MOUSE 5 25.280 9.387
-PAUSE 200
-KEYSTATE 2
-MOUSE 6 24.960 9.387
-PAUSE 200
-KEYSTATE 2
-MOUSE 6 24.960 9.813
-PAUSE 200
-KEYSTATE 2
-MOUSE 6 25.067 10.240
-KEYSTATE 2
-MOUSE 6 25.173 10.453
-KEYSTATE 2
-MOUSE 6 25.280 10.773
-KEYSTATE 2
-MOUSE 6 25.387 11.093
-KEYSTATE 2
-MOUSE 6 25.493 11.520
-KEYSTATE 2
-MOUSE 6 25.813 11.947
-KEYSTATE 2
-MOUSE 6 26.133 12.480
-KEYSTATE 2
-MOUSE 6 26.453 12.800
-KEYSTATE 2
-MOUSE 6 26.987 12.907
-KEYSTATE 2
-MOUSE 6 27.627 13.227
-KEYSTATE 2
-MOUSE 6 28.053 13.227
-KEYSTATE 2
-MOUSE 6 28.267 13.227
-KEYSTATE 2
-MOUSE 6 28.480 13.227
-KEYSTATE 2
-MOUSE 6 28.267 13.227
-KEYSTATE 2
-MOUSE 6 28.373 13.227
-KEYSTATE 2
-MOUSE 7 28.373 13.227
+COMMAND JoinTrack
MESSAGE
-=========================================
-END
-STEP
-CLEAR
-MESSAGE
-Next we select the <Join Tracks> command. You can use Shift-Left-Click to move an End-Point of a selected track to join with an unselected track.
+__________________________________________
+
+You can use Shift-Left-Click to select an open endpoint of a selected track to join with an unselected track.
-Note: because of differing display resolutions the next mouse click may not be positioned correctly in this demo and the Move-To-Join operation may not be demonstrated.
+We'll move the Main window again.
END
STEP
-COMMAND Join
-BIGPAUSE
-#MOUSE 5 14.40 12.37
-#MOUSE 7 14.40 12.37
-#MOUSE 5 14.40 14.61
-#MOUSE 7 14.40 14.61
-#MOUSE 5 13.90 14.287
-#MOUSE 7 13.90 14.287
-#MOUSE 5 14.21 13.95
-#MOUSE 7 14.21 13.95
+ORIG 4 0 0
+#KEYSTATE 2
+#MOUSE 1 52.50 14.35
+#PAUSE 500
+#KEYSTATE 2
+#MOUSE 2 52.50 14.35
+#KEYSTATE 2
+#MOUSE 4 52.50 14.35
KEYSTATE 2
-MOUSE 2 13.077 10.857
-#MOUSE 2 16.39 14.51
+MOUSE 1 42.5 14
+PAUSE 500
KEYSTATE 2
-MOUSE 4 13.077 10.857
-#MOUSE 4 16.39 14.51
-BIGPAUSE
+MOUSE 2 42.5 14
KEYSTATE 2
-MOUSE 2 13.333 2.773
-KEYSTATE 2
-MOUSE 4 13.333 2.773
+MOUSE 4 42.5 14
MESSAGE
-=========================================
+__________________________________________
+
+You then Left-Click on an endpoint of a unselected track to move the selected tracks to join.
+
+END
+STEP
+#MOUSE 1 13.405000 2.666667
+#PAUSE 500
+#MOUSE 2 13.405000 2.666667
+#MOUSE 4 13.405000 2.666667
+MOUSE 1 13 13
+PAUSE 500
+MOUSE 2 13 13
+MOUSE 4 13 13
+MESSAGE
+================================================
END
+REGRESSION START 10 - select final
+STRAIGHT 1 0 0 0 0 DEMO 2
+ T4 2 7.466667 2.666667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 8.000000 2.666667 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 7.466667 7.916667 0 5.250000 0 0.000000 0.000000
+ T4 1 7.466667 2.666667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 8 7.471737 13.166664 90.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 3 0 0 0 0 DEMO 2 8.000000 2.666667 0 0.000000 "Peco-55 Medium Right SL-E395F"
+ T4 1 8.000000 2.666667 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 13.405000 2.666667 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 13.370000 2.144667 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 4 0 0 0 0 DEMO 2
+ T4 9 22.720003 2.666672 89.999981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 13.405003 2.666669 269.999981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 5 0 0 0 0 DEMO 2
+ T4 3 13.370004 2.144669 279.685981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 17.844754 1.380912 99.685981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 6 0 0 0 0 DEMO 2
+ E4 32.964242 1.166675 89.999981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 20.373337 1.166671 269.999981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 7 0 0 0 0 DEMO 2 20.373332 16.195529 0 15.028859 0 0.000000 0.000000
+ T4 6 20.373337 1.166671 89.999981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 17.844754 1.380912 279.685981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 8 0 0 0 0 DEMO 2
+ T4 2 7.471737 13.166664 270.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 8.533996 13.165638 90.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 9 0 0 0 0 DEMO 2 22.720002 7.909304 0 5.242633 0 0.000000 0.000000
+ T4 11 22.720000 13.151937 269.999981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 22.720003 2.666672 269.999981 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 10 0 0 0 0 DEMO 2 8.533996 13.165638 0 0.055338 "Peco-55 Medium Left SL-E396F"
+ T4 8 8.533996 13.165638 270.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 11 13.938993 13.160418 90.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 12 13.904497 13.682451 80.369338 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 11 0 0 0 0 DEMO 2
+ T4 9 22.720000 13.151937 90.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 13.938993 13.160418 270.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 12 0 0 0 0 DEMO 2
+ T4 10 13.904497 13.682453 260.369319 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 13 15.746779 13.995067 80.369319 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 13 0 0 0 0 DEMO 2 15.746779 13.995064 0 350.369338 "Peco-55 Medium Right SL-E395F"
+ T4 12 15.746779 13.995064 260.369338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 14 21.075605 14.899301 80.369338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 21.128427 14.378802 90.055338 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 14 0 0 0 0 DEMO 2
+ T4 17 26.016207 15.737661 80.369338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 13 21.075605 14.899301 260.369338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 15 0 0 0 0 DEMO 2
+ T4 13 21.128427 14.378802 270.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 35.757013 14.364673 90.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 16 0 0 0 0 DEMO 2
+ T4 17 27.626441 15.872527 270.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 35.735615 15.864695 90.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 17 0 0 0 0 DEMO 2 27.617198 6.302742 0 9.569789 0 0.000000 0.000000
+ T4 14 26.016207 15.737661 260.369338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 16 27.626441 15.872527 90.055338 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRUCTURE 18 0 0 0 0 N 2 29.120001 8.853340 0 359.999981 "Walthers 933-3212 Red Wing Milling Co"
+ D 0.000000 0.000000
+ L3 0 0.000000 4.500000 0.000000 0 4.500000 0.375000 0
+ L3 0 0.000000 6.625000 0.375000 0 4.500000 0.375000 0
+ L3 0 0.000000 6.625000 4.875000 0 2.062500 4.875000 0
+ L3 0 0.000000 2.062500 4.875000 0 2.062500 4.500000 0
+ L3 0 0.000000 2.062500 4.437500 0 0.000000 4.437500 0
+ L3 0 0.000000 0.375000 0.750000 0 3.250000 0.750000 0
+ L3 0 0.000000 3.250000 0.750000 0 3.250000 1.625000 0
+ L3 0 0.000000 3.250000 1.625000 0 0.375000 1.625000 0
+ L3 0 0.000000 0.375000 1.625000 0 0.375000 0.750000 0
+ L3 0 0.000000 3.062500 1.437500 0 2.625000 1.437500 0
+ L3 0 0.000000 2.625000 1.437500 0 2.625000 1.062500 0
+ L3 0 0.000000 2.625000 1.062500 0 3.062500 1.062500 0
+ L3 0 0.000000 3.062500 1.062500 0 3.062500 1.437500 0
+ L3 0 0.000000 4.500000 0.000000 0 4.500000 -0.687500 0
+ L3 0 0.000000 4.500000 -0.687500 0 2.000000 -0.687500 0
+ L3 0 0.000000 2.000000 -0.687500 0 2.000000 0.375000 0
+ L3 0 0.000000 2.000000 0.375000 0 0.000000 0.375000 0
+ L3 0 0.000000 4.500000 0.375000 0 2.000000 0.375000 0
+ L3 0 0.000000 2.000000 0.000000 0 0.000000 0.000000 0
+ L3 0 0.000000 2.250000 0.375000 0 2.250000 -0.062500 0
+ L3 0 0.000000 2.250000 -0.062500 0 4.062500 -0.062500 0
+ L3 0 0.000000 4.062500 -0.062500 0 4.062500 0.375000 0
+ A3 0 0.000000 0.139754 3.187500 0.125000 0 0.000000 360.000000
+ A3 0 0.000000 0.139754 3.812500 0.125000 0 0.000000 360.000000
+ A3 0 0.000000 0.139754 2.625000 0.125000 0 0.000000 360.000000
+ A3 0 0.000000 0.062500 3.812500 0.125000 0 0.000000 360.000000
+ A3 0 0.000000 0.062500 3.187500 0.125000 0 0.000000 360.000000
+ A3 0 0.000000 0.000000 2.625000 0.125000 0 0.000000 360.000000
+ A3 0 0.000000 0.062500 2.625000 0.125000 0 0.000000 360.000000
+ L3 0 0.000000 6.625000 4.875000 0 6.625000 0.375000 0
+ L3 0 0.000000 2.062500 4.437500 0 6.625000 4.437500 0
+ L3 0 0.055556 2.937500 -0.062500 0 2.937500 -0.562500 0
+ L3 0 0.055556 1.312500 0.375000 0 1.312500 -0.062500 0
+ L3 0 0.000000 0.000000 4.437500 0 0.000000 4.437500 0
+ L3 0 0.000000 0.000000 4.437500 0 0.000000 0.000000 0
+ END
+DRAW 19 0 0 0 0 0.347240 -1.465102 0 356.869372
+ L3 0 0.000000 23.293333 3.226667 0 25.933333 4.400000 0
+ L3 0 0.000000 25.933333 4.400000 0 25.880000 4.746667 0
+ L3 0 0.000000 23.300000 3.226667 0 23.020000 3.466667 0
+ L3 0 0.000000 23.453333 1.973333 0 23.533333 2.346667 0
+ L3 0 0.000000 23.506667 2.346667 0 26.440000 3.440000 0
+ L3 0 0.000000 26.413333 3.440000 0 26.680000 3.146667 0
+ END
+DRAW 20 0 0 0 0 0.000004 -0.000003 0 359.999981
+ L3 255 0.000000 24.026667 2.186667 0 24.666667 1.653333 0
+ L3 255 0.000000 24.666667 1.653333 0 25.573333 1.973333 0
+ L3 255 0.000000 25.573333 1.973333 0 26.693333 1.760000 0
+ L3 255 0.000000 26.693333 1.760000 0 27.706667 2.026667 0
+ L3 255 0.000000 27.706667 2.026667 0 28.720000 1.920000 0
+ L3 255 0.000000 28.720000 1.920000 0 29.573333 1.920000 0
+ L3 255 0.000000 29.573333 1.920000 0 29.946667 2.346667 0
+ L3 255 0.000000 29.946667 2.346667 0 30.160000 3.840000 0
+ L3 255 0.000000 30.160000 3.840000 0 29.626667 4.266667 0
+ L3 255 0.000000 29.626667 4.266667 0 28.400000 3.946667 0
+ L3 255 0.000000 28.400000 3.946667 0 28.133333 3.040000 0
+ L3 255 0.000000 28.133333 3.040000 0 27.120000 2.613333 0
+ L3 255 0.000000 27.120000 2.613333 0 26.320000 2.826667 0
+ L3 255 0.000000 26.320000 2.826667 0 25.413333 2.826667 0
+ L3 255 0.000000 23.653333 3.253333 0 23.066667 4.320000 0
+ L3 255 0.000000 23.066667 4.320000 0 22.266667 4.960000 0
+ L3 255 0.000000 22.266667 4.960000 0 20.720000 5.173333 0
+ L3 255 0.000000 20.720000 5.173333 0 19.706667 5.226667 0
+ L3 255 0.000000 19.706667 5.226667 0 18.746667 5.333333 0
+ L3 255 0.000000 18.746667 5.333333 0 18.266667 5.653333 0
+ L3 255 0.000000 18.266667 5.653333 0 17.893333 6.080000 0
+ L3 255 0.000000 17.893333 6.080000 0 18.320000 5.813333 0
+ L3 255 0.000000 18.320000 5.813333 0 19.280000 5.440000 0
+ L3 255 0.000000 19.280000 5.440000 0 20.506667 5.653333 0
+ L3 255 0.000000 20.506667 5.653333 0 22.480000 5.386667 0
+ L3 255 0.000000 22.480000 5.386667 0 23.813333 5.066667 0
+ L3 255 0.000000 23.813333 5.066667 0 24.293333 4.533333 0
+ L3 255 0.000000 24.293333 4.533333 0 24.613333 3.786667 0
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmsplit.xtr b/app/lib/demos/dmsplit.xtr
index 52ce3f6..2e4a4d9 100644
--- a/app/lib/demos/dmsplit.xtr
+++ b/app/lib/demos/dmsplit.xtr
@@ -73,9 +73,13 @@ STEP
COMMAND Select
MOUSE 2 27.333 4.750
MOUSE 4 27.333 4.750
+KEYSTATE 4
MOUSE 2 21.333 3.000
+KEYSTATE 4
MOUSE 4 21.333 3.000
+KEYSTATE 4
MOUSE 2 16.250 2.667
+KEYSTATE 4
MOUSE 4 16.250 2.667
BIGPAUSE
PARAMETER misc cmdTunnel
@@ -97,4 +101,42 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - split tracks and tunnels
+STRAIGHT 1 0 0 0 0 DEMO 2
+ T4 5 10.000000 2.633343 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 17.550000 2.633353 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 2 0 0 0 0 DEMO 0 17.550000 2.633353 0 0.000000 "Peco-55 Medium Left SL-E396F"
+ T4 1 17.550000 2.633353 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 22.955000 2.633353 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 22.920000 3.155353 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 3 0 0 0 0 DEMO 2
+ E4 33.417000 2.633340 90.000125 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 22.955000 2.633349 270.000125 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 4 0 0 0 0 DEMO 0 20.249057 18.804049 0 15.875000 0 0.000000 0.000000
+ T4 6 31.018207 7.140386 47.283470 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 22.920000 3.155353 260.314152 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 5 0 0 0 0 DEMO 2
+ E4 2.466667 2.633333 269.999924 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 1 10.000000 2.633343 89.999924 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 6 0 0 0 0 DEMO 2 20.249057 18.804049 0 15.875000 0 0.000000 0.000000
+ E4 34.679884 12.188397 24.628563 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 31.018207 7.140386 227.283470 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 7 0 0 0 0 DEMO 2
+ E4 40.800000 2.633333 90.000051 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 33.417000 2.633340 270.000051 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmstrtrk.xtr b/app/lib/demos/dmstrtrk.xtr
index a37b90c..d48ceef 100644
--- a/app/lib/demos/dmstrtrk.xtr
+++ b/app/lib/demos/dmstrtrk.xtr
@@ -28,4 +28,10 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 Straight track
+STRAIGHT 1 0 0 0 0 DEMO 2
+ E4 6.833000 3.667000 258.375734 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 36.000000 9.667000 78.375734 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmtbledg.xtr b/app/lib/demos/dmtbledg.xtr
index d2caf81..4e00dcd 100644
--- a/app/lib/demos/dmtbledg.xtr
+++ b/app/lib/demos/dmtbledg.xtr
@@ -1,20 +1,20 @@
VERSION 7
DEMOINIT
-ORIG 10.000 0.000 0.000
+ORIG 7.000 0.000 0.000
PARAMETER display description-fontsize 24
-CURVE 1 0 0 0 0 DEMO -1 12.000000 14.555556 10.000000
+CURVE 1 0 0 0 0 DEMO 2 12.000000 14.555556 10.000000
T 4 18.000000 6.555556 53.130102
T 3 18.207029 22.396014 128.367485
END
-CURVE 2 0 0 0 0 DEMO -1 44.666667 14.333333 10.000000
+CURVE 2 0 0 0 0 DEMO 2 44.666667 14.333333 10.000000
T 4 38.666667 22.333333 233.130102
T 3 38.459637 6.492875 308.367485
END
-STRAIGHT 3 0 0 0 0 DEMO -1
+STRAIGHT 3 0 0 0 0 DEMO 2
T 1 18.207029 22.396014 308.140387
T 2 38.459637 6.492875 128.140387
END
-STRAIGHT 4 0 0 0 0 DEMO -1
+STRAIGHT 4 0 0 0 0 DEMO 2
T 1 18.000000 6.555556 232.640407
T 2 38.666667 22.333333 52.640407
END
@@ -36,11 +36,14 @@ MOUSE 3 36.500 2.667
MOUSE 4 36.500 2.667
MOUSE 2 36.500 2.667
MOUSE 3 58.000 2.667
+STEP
MOUSE 4 58.000 2.667
BIGPAUSE
MOUSE 2 0.000 26.167
MOUSE 3 58.000 26.167
+STEP
MOUSE 4 58.000 26.167
+MOUSE 1 58.000 26.167
MESSAGE
_________________________________________
@@ -124,8 +127,8 @@ MOUSE 3 58.167 1.667
MOUSE 3 58.167 1.833
MOUSE 3 58.000 1.833
MOUSE 3 57.833 1.833
-MOUSE 3 57.667 1.833
-MOUSE 4 57.667 1.833
+MOUSE 3 57.667 2.000
+MOUSE 4 57.667 2.000
MESSAGE
_________________________________________
@@ -135,6 +138,8 @@ END
STEP
COMMAND Modify
MOUSE 2 27.667 9.333
+MOUSE 4 27.667 9.333
+MOUSE 2 27.667 9.333
MOUSE 3 28.333 8.667
MOUSE 3 29.000 8.000
MOUSE 3 29.167 7.667
@@ -171,12 +176,15 @@ MOUSE 3 28.333 5.667
MOUSE 3 28.333 5.833
MOUSE 3 28.333 6.000
MOUSE 4 28.333 6.000
+MOUSE 8200 28.333 6.000
MESSAGE
_________________________________________
If you hold down the Control key while dragging then the Table Edge will be attracted to other objects.
END
STEP
+MOUSE 2 28.167 9.333
+MOUSE 4 28.167 9.333
KEYSTATE 4
MOUSE 2 28.167 9.333
KEYSTATE 4
@@ -205,9 +213,46 @@ KEYSTATE 4
MOUSE 3 28.333 6.000
KEYSTATE 4
MOUSE 4 28.167 5.667
+MOUSE 8200 28.167 5.667
STEP
MESSAGE
=========================================
END
+REGRESSION START 10 - table edge
+CURVE 1 0 0 0 0 DEMO 2 12.000000 14.555556 0 10.000000 0 0.000000 0.000000
+ T4 4 18.000000 6.555556 53.130102 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 18.207029 22.396014 128.367485 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 2 0 0 0 0 DEMO 2 44.666667 14.333333 0 10.000000 0 0.000000 0.000000
+ T4 4 38.666667 22.333333 233.130102 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 38.459637 6.492875 308.367485 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 3 0 0 0 0 DEMO 2
+ T4 1 18.207029 22.396014 308.140387 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 38.459637 6.492875 128.140387 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 4 0 0 0 0 DEMO 2
+ T4 1 18.000000 6.555556 232.640407 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 38.666667 22.333333 52.640407 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+DRAW 5 0 0 0 0 0.000000 0.000000 0 0.000000
+ Q3 0 0.291667 0.000000 2.667000 0 19.833000 2.667000 0
+ END
+DRAW 6 0 0 0 0 0.000000 0.000000 0 0.000000
+ Q3 0 0.291667 19.833000 2.667000 0 28.333000 6.000000 0
+ END
+DRAW 7 0 0 0 0 0.000000 0.000000 0 0.000000
+ Q3 0 0.291667 28.333000 6.000000 0 36.500000 2.667000 0
+ END
+DRAW 8 0 0 0 0 0.000000 0.000000 0 0.000000
+ Q3 0 0.291667 36.500000 2.667000 0 58.000000 2.667000 0
+ END
+DRAW 9 0 0 0 0 0.000000 0.000000 0 0.000000
+ Q3 0 0.291667 0.000000 26.167000 0 58.000000 26.167000 0
+ END
+DRAW 10 0 0 0 0 0.000000 0.000000 0 0.000000
+ Q3 0 0.291667 58.000000 26.167000 0 58.000000 2.667000 0
+ END
+REGRESSION END
STEP
CLEAR
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
diff --git a/app/lib/demos/dmtotrim.xtr b/app/lib/demos/dmtotrim.xtr
index 6ec656f..03a549e 100644
--- a/app/lib/demos/dmtotrim.xtr
+++ b/app/lib/demos/dmtotrim.xtr
@@ -4,7 +4,7 @@ VERSION 10
DEMOINIT
ORIG 1.000 0.000 0.000
PARAMETER display labelenable 4
-TURNOUT 2 0 0 0 0 N 2 0.218750 1.390625 0 0.000000 "Peco-55 Medium Left SL-E396F"
+TURNOUT 2 0 0 0 0 DEMO 2 0.218750 1.390625 0 0.000000 "Peco-55 Medium Left SL-E396F"
E 0.218750 1.390625 270.000000
E 5.623750 1.390625 90.000000
E 5.588750 1.912625 80.314000
@@ -93,4 +93,30 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 12 - turnout trim
+# ../share/xtrkcad/demos/dmtotrim.xtr - 96
+TURNOUT 2 0 64 0 0 DEMO 2 0.218750 1.390625 0 0.000000 "Peco-55 Medium Left SL-E396F"
+ E4 0.218750 1.390625 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 5.094000 1.390625 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 3.465544 1.572565 82.809773 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ D -0.015000 -1.136000
+ P "Normal" 1 2
+ P "Reverse" 1 3
+ S 0 0.000000 0.000000 0.000000 0.353000 0.000000
+ S 0 0.000000 0.353000 0.000000 4.875250 0.000000
+ C 0 0.000000 -23.136000 0.351000 23.136000 172.809773 7.187227
+ END$SEGS
+STRAIGHT 4 0 0 0 0 DEMO 2
+ T4 2 5.094000 1.390625 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 5.938592 1.390625 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END$SEGS
+CURVE 5 0 0 0 0 DEMO 2 0.569750 24.526625 0 23.136000 0 0.000000 0.000000
+ T4 6 4.469114 1.721594 80.297000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 3.465544 1.572565 262.809773 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END$SEGS
+STRAIGHT 6 0 0 0 0 DEMO 2
+ T4 5 4.469750 1.721625 260.313640 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 5.588750 1.912625 80.313640 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END$SEGS
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmtoyard.xtr b/app/lib/demos/dmtoyard.xtr
index a6d3de0..bff62af 100644
--- a/app/lib/demos/dmtoyard.xtr
+++ b/app/lib/demos/dmtoyard.xtr
@@ -1,6 +1,6 @@
VERSION 2
DEMOINIT
-ORIG 8.000 0.000 0.000
+ORIG 4.000 0.000 0.000
PARAMETER display description-fontsize 24
PARAMETER turnout hide 1
STRAIGHT 1 DEMO 1
@@ -24,10 +24,12 @@ END
STEP
PARAMETER turnout list 0 Peco-55 SL-E395F Medium Right
MOUSE 2 35.417 1.917
+#BIGPAUSE
+MOUSE 3 36.5 1.917
+#BIGPAUSE
+MOUSE 3 36.5 1.917
BIGPAUSE
-MOUSE 3 36.417 1.917
-BIGPAUSE
-MOUSE 4 36.417 1.917
+MOUSE 4 36.5 1.917
PARAMETER turnout ok
RESET
MESSAGE
@@ -47,8 +49,9 @@ _________________________________________
Now create a track parallel to the main line. Make sure the separation is reasonable for your scale.
END
STEP
-COMMAND Parallel
+COMMAND ParallelTrack
PARAMETER parallel separation 1.25
+PARAMETER parallel factor 0
MOUSE 2 23.083 1.917
PARAMETER parallel separation 1.250000
MOUSE 3 23.083 1.917
@@ -70,6 +73,7 @@ ORIG 2.000 21.333 1.000
BIGPAUSE
COMMAND Turnout
PARAMETER turnout list 0 Peco-55 SL-E396F Medium Left
+MOUSE 1 29.500 2.542
MOUSE 2 29.500 2.542
MESSAGE
_________________________________________
@@ -78,12 +82,7 @@ Notice how we control which way the turnout is facing by moving the mouse across
END
STEP
-MOUSE 3 29.500 2.563
-#MOUSE 3 29.500 2.604
-#MOUSE 3 29.521 2.604
-#MOUSE 3 29.542 2.583
-#MOUSE 3 29.542 2.521
-#MOUSE 3 29.500 2.438
+MOUSE 3 29.500 2.542
MOUSE 3 29.500 2.438
#MOUSE 3 29.604 2.583
BIGPAUSE
@@ -101,6 +100,7 @@ XTrackCAD adjusts the turnout position for the best fit to minimize any connecti
END
STEP
MOUSE 4 29.625 2.667
+#MOUSE 4 27.625 2.9
PARAMETER turnout ok
#RESET
MESSAGE
@@ -116,7 +116,7 @@ MOUSE 2 30.229 3.042
MOUSE 4 30.229 3.042
PARAMETER misc cmdDelete
BIGPAUSE
-ORIG 8.000 0.000 0.000
+ORIG 4.000 0.000 0.000
MESSAGE
_________________________________________
@@ -124,7 +124,7 @@ Repeat the process for the other tracks in the yard.
END
STEP
BIGPAUSE
-COMMAND Parallel
+COMMAND ParallelTrack
PARAMETER parallel separation 1.250
MOUSE 2 16.667 3.167
MOUSE 3 16.417 3.583
@@ -145,7 +145,7 @@ MOUSE 2 22.688 4.438
MOUSE 4 22.688 4.438
PARAMETER misc cmdDelete
BIGPAUSE
-ORIG 8.000 0.000 0.000
+ORIG 4.000 0.000 0.000
MESSAGE
_________________________________________
@@ -153,8 +153,9 @@ For the last track we will join with a curve instead of a turnout.
END
STEP
BIGPAUSE
-COMMAND Parallel
+COMMAND ParallelTrack
PARAMETER parallel separation 1.250
+MOUSE 1 10.750 4.333
MOUSE 2 10.750 4.333
MOUSE 3 10.750 5.000
MOUSE 4 10.750 5.000
@@ -165,40 +166,106 @@ RESET
#PAN 7 12.667 6.667
BIGPAUSE
ORIG 2.0 5.0 4.0
-COMMAND Join
+PARAMETER misc cmdEasement
+PARAMETER easement val -1.0
+BIGPAUSE
+PARAMETER easement ok
+COMMAND JoinTrack
+MOUSE 1 10.354 5.604
MOUSE 2 10.354 5.604
-MOUSE 4 10.354 5.604
-MOUSE 2 12.417 5.521
-MOUSE 3 12.438 5.521
-MOUSE 3 12.458 5.521
-MOUSE 3 12.583 5.479
-MOUSE 3 12.646 5.479
-MOUSE 3 12.813 5.458
-MOUSE 3 13.021 5.438
-MOUSE 3 13.042 5.438
-MOUSE 3 13.104 5.438
-MOUSE 3 13.125 5.438
-MOUSE 3 13.146 5.438
-MOUSE 3 13.188 5.438
-MOUSE 3 13.208 5.438
-MOUSE 3 13.583 5.396
-MOUSE 3 13.604 5.396
-MOUSE 3 13.646 5.375
-MOUSE 3 13.708 5.354
-MOUSE 3 13.729 5.354
-MOUSE 3 13.750 5.354
-MOUSE 3 13.771 5.354
-MOUSE 3 13.813 5.354
-MOUSE 3 13.875 5.354
-MOUSE 3 13.875 5.333
-MOUSE 3 13.896 5.333
-MOUSE 3 13.917 5.313
-MOUSE 3 13.979 5.313
-MOUSE 4 14.000 5.313
-BIGPAUSE
-ORIG 8.000 0.000 0.000
+MOUSE 3 9.000 5.604
+MOUSE 4 9.000 5.604
+MOUSE 1 12.417 5.000
+MOUSE 2 12.417 5.000
+MOUSE 3 14.000 5.000
+MOUSE 4 14.000 5.000
+MOUSE 3336 14.000 5.000
+BIGPAUSE
+ORIG 4.000 0.000 0.000
MESSAGE
=========================================
END
+REGRESSION START 10 - turnout yard
+STRAIGHT 1 0 0 0 0 DEMO 2
+ T4 4 36.500000 1.833333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 41.833333 1.833333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 2 0 0 0 0 DEMO 2
+ E4 3.666667 1.833333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 4 31.095000 1.833333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 4 0 0 0 0 DEMO 2 36.500000 1.833333 0 180.000000 "Peco-55 Medium Right SL-E395F"
+ T4 1 36.500000 1.833333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 31.095000 1.833333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 5 31.130000 2.355333 279.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 5 0 0 0 0 DEMO 2
+ T4 4 31.130000 2.355333 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 29.143471 2.694397 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
+ E4 3.666667 3.083333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 23.762196 3.083333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 7 0 0 0 0 DEMO 2
+ T4 10 23.815521 3.603780 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 21.819895 3.944397 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 10 0 0 0 0 DEMO 2 29.143471 2.694397 0 189.686000 "Peco-55 Medium Left SL-E396F"
+ T4 5 29.143471 2.694397 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 23.815521 3.603780 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 23.762196 3.083333 270.000000 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 11 0 0 0 0 DEMO 2
+ E4 3.666667 4.333333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 16.438621 4.333333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 12 0 0 0 0 DEMO 2
+ T4 15 16.491945 4.853780 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 17 14.046290 5.271209 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 15 0 0 0 0 DEMO 2 21.819895 3.944397 0 189.686000 "Peco-55 Medium Left SL-E396F"
+ T4 7 21.819895 3.944397 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 12 16.491945 4.853780 279.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 11 16.438621 4.333333 270.000000 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 16 0 0 0 0 DEMO 2
+ E4 3.666667 5.583333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 17 9.000000 5.583333 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CORNU 17 0 0 0 0 DEMO 2 9.000000 5.583333 270.000000 0.000000 0.000000 0.000000 14.046290 5.271209 99.686000 0.000000 0.000000 0.000000
+ T4 16 9.000000 5.583333 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 12 14.046290 5.271209 99.686000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ W3 0 0.000000 9.000000 5.583333 9.844213 5.583333 10.688875 5.595997 11.532347 5.560635
+ SUBSEGS
+ C 0 0.000000 60.451079 9.724476 -54.863405 359.313322 2.400441
+ SUBSEND
+ W3 0 0.000000 11.532347 5.560635 12.375820 5.525273 13.214112 5.413246 14.046290 5.271209
+ SUBSEGS
+ C 0 0.000000 19.919595 10.515659 -14.332997 2.925627 7.283654
+ SUBSEND
+ END
+REGRESSION END
STEP
CLEAR
diff --git a/app/lib/demos/dmtrkwid.xtr b/app/lib/demos/dmtrkwid.xtr
index 20c5261..1b7ff0f 100644
--- a/app/lib/demos/dmtrkwid.xtr
+++ b/app/lib/demos/dmtrkwid.xtr
@@ -1,16 +1,16 @@
# XTrkCad Version: 3.0.1, Date: Sat Sep 23 20:43:53 2000
VERSION 10
DEMOINIT
-ORIG 8.000 0.000 0.000
-STRAIGHT 1 0 0 0 0 N 2
+ORIG 6.000 0.000 0.000
+STRAIGHT 1 0 0 0 0 DEMO 2
T 3 42.054708 20.137016 244.163246
E 51.919948 24.913870 64.163246
END
-STRAIGHT 2 0 0 0 0 N 2
+STRAIGHT 2 0 0 0 0 DEMO 2
T 5 34.508258 16.482946 244.163246
T 3 37.189995 17.781471 64.163246
END
-TURNOUT 3 0 0 0 0 N 2 42.054708 20.137016 0 154.163246 "Peco-55 Medium Right SL-E395F"
+TURNOUT 3 0 0 0 0 DEMO 2 42.054708 20.137016 0 154.163246 "Peco-55 Medium Right SL-E395F"
T 1 42.054708 20.137016 64.163246
T 2 37.189995 17.781471 244.163246
T 8 36.994004 18.266545 253.849246
@@ -22,11 +22,11 @@ TURNOUT 3 0 0 0 0 N 2 42.054708 20.137016 0 154.163246 "Peco-55 Medium Right SL
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 4 0 0 0 0 N 2
+STRAIGHT 4 0 0 0 0 DEMO 2
E 0.187643 -0.135457 244.163246
T 13 3.966453 1.694282 64.163246
END
-TURNOUT 5 0 0 0 0 N 2 34.508258 16.482946 0 154.163246 "Peco-55 Medium Left SL-E396F"
+TURNOUT 5 0 0 0 0 DEMO 2 34.508258 16.482946 0 154.163246 "Peco-55 Medium Left SL-E396F"
T 2 34.508258 16.482946 64.163246
T 12 29.643545 14.127401 244.163246
T 11 29.902538 13.672833 234.477246
@@ -38,35 +38,35 @@ TURNOUT 5 0 0 0 0 N 2 34.508258 16.482946 0 154.163246 "Peco-55 Medium Left SL-
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 6 0 0 0 0 N 2
+STRAIGHT 6 0 0 0 0 DEMO 2
T 14 13.474033 7.686781 244.163246
T 7 31.510368 16.420164 64.163246
END
-CURVE 7 0 0 0 0 N 2 39.096711 0.752716 0 17.407514 0 0.000000 0.000000
+CURVE 7 0 0 0 0 DEMO 2 39.096711 0.752716 0 17.407514 0 0.000000 0.000000
T 6 31.510368 16.420164 244.163246
T 8 34.254539 17.473210 73.849246
END
-STRAIGHT 8 0 0 0 0 N 2
+STRAIGHT 8 0 0 0 0 DEMO 2
T 3 36.994004 18.266545 73.849246
T 7 34.254539 17.473210 253.849246
END
-STRAIGHT 9 0 0 0 0 N 2
+STRAIGHT 9 0 0 0 0 DEMO 2
E 10.161432 3.305128 244.163246
T 10 25.105135 10.541027 64.163246
END
-CURVE 10 0 0 0 0 N 2 17.814223 25.598343 0 16.729620 0 0.000000 0.000000
+CURVE 10 0 0 0 0 DEMO 2 17.814223 25.598343 0 16.729620 0 0.000000 0.000000
T 11 27.534571 11.982359 54.477246
T 9 25.105135 10.541027 244.163246
END
-STRAIGHT 11 0 0 0 0 N 2
+STRAIGHT 11 0 0 0 0 DEMO 2
T 5 29.902538 13.672833 54.477246
T 10 27.534571 11.982359 234.477246
END
-STRAIGHT 12 0 0 0 0 N 2
+STRAIGHT 12 0 0 0 0 DEMO 2
T 5 29.643545 14.127401 64.163246
T 13 8.831166 4.049828 244.163246
END
-TURNOUT 13 0 0 0 0 N 2 3.966453 1.694282 0 334.163246 "Peco-55 Medium Left SL-E396F"
+TURNOUT 13 0 0 0 0 DEMO 2 3.966453 1.694282 0 334.163246 "Peco-55 Medium Left SL-E396F"
T 4 3.966453 1.694282 244.163246
T 12 8.831166 4.049828 64.163246
T 15 8.572172 4.504395 54.477246
@@ -78,11 +78,11 @@ TURNOUT 13 0 0 0 0 N 2 3.966453 1.694282 0 334.163246 "Peco-55 Medium Left SL-E
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
-CURVE 14 0 0 0 0 N 2 21.361899 -8.603379 0 18.099385 0 0.000000 0.000000
+CURVE 14 0 0 0 0 DEMO 2 21.361899 -8.603379 0 18.099385 0 0.000000 0.000000
T 15 10.845682 6.127436 234.477246
T 6 13.474033 7.686781 64.163246
END
-STRAIGHT 15 0 0 0 0 N 2
+STRAIGHT 15 0 0 0 0 DEMO 2
T 13 8.572172 4.504395 234.477246
T 14 10.845682 6.127436 54.477246
END
@@ -97,24 +97,40 @@ STEP
COMMAND Select
MOUSE 2 2.500 0.125
MOUSE 4 2.500 0.125
+KEYSTATE 4
MOUSE 2 6.000 3.000
+KEYSTATE 4
MOUSE 4 6.000 3.000
+KEYSTATE 4
MOUSE 2 16.750 7.625
+KEYSTATE 4
MOUSE 4 16.750 7.625
+KEYSTATE 4
MOUSE 3 32.500 15.500
+KEYSTATE 4
MOUSE 2 32.500 15.500
+KEYSTATE 4
MOUSE 4 32.500 15.500
+KEYSTATE 4
MOUSE 2 36.125 17.750
+KEYSTATE 4
MOUSE 3 36.250 17.750
+KEYSTATE 4
MOUSE 4 36.375 17.625
+KEYSTATE 4
MOUSE 2 39.500 19.125
+KEYSTATE 4
MOUSE 4 39.500 19.125
+KEYSTATE 4
MOUSE 2 47.000 22.750
+KEYSTATE 4
MOUSE 4 47.000 22.750
MESSAGE
_________________________________________
And then select Medium Tracks from the Edit menu.
+
+We can't show the Edit menu, but we can show the effect.
END
STEP
PARAMETER misc cmdWidth2
@@ -133,4 +149,90 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - track width
+STRAIGHT 1 0 3 0 0 DEMO 2
+ T4 3 42.054708 20.137016 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ E4 51.919948 24.913870 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 2 0 3 0 0 DEMO 2
+ T4 5 34.508258 16.482946 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 3 37.189995 17.781471 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 3 0 3 0 0 DEMO 2 42.054708 20.137016 0 154.163246 "Peco-55 Medium Right SL-E395F"
+ T4 1 42.054708 20.137016 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 2 37.189995 17.781471 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 8 36.994004 18.266545 253.849246 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 4 0 3 0 0 DEMO 2
+ E4 0.187643 -0.135457 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 13 3.966453 1.694282 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 5 0 3 0 0 DEMO 2 34.508258 16.482946 0 154.163246 "Peco-55 Medium Left SL-E396F"
+ T4 2 34.508258 16.482946 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 12 29.643545 14.127401 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 11 29.902538 13.672833 234.477246 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 6 0 0 0 0 DEMO 2
+ T4 14 13.474033 7.686781 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 31.510368 16.420164 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 7 0 0 0 0 DEMO 2 39.096711 0.752716 0 17.407514 0 0.000000 0.000000
+ T4 6 31.510368 16.420164 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 8 34.254539 17.473210 73.849246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 8 0 0 0 0 DEMO 2
+ T4 3 36.994004 18.266545 73.849246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 7 34.254539 17.473210 253.849246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 9 0 0 0 0 DEMO 2
+ E4 10.161432 3.305128 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 25.105135 10.541027 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+CURVE 10 0 0 0 0 DEMO 2 17.814223 25.598343 0 16.729620 0 0.000000 0.000000
+ T4 11 27.534571 11.982359 54.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 9 25.105135 10.541027 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 11 0 0 0 0 DEMO 2
+ T4 5 29.902538 13.672833 54.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 10 27.534571 11.982359 234.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 12 0 3 0 0 DEMO 2
+ T4 5 29.643545 14.127401 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 13 8.831166 4.049828 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+TURNOUT 13 0 3 0 0 DEMO 2 3.966453 1.694282 0 334.163246 "Peco-55 Medium Left SL-E396F"
+ T4 4 3.966453 1.694282 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 12 8.831166 4.049828 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 15 8.572172 4.504395 54.477246 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
+CURVE 14 0 0 0 0 DEMO 2 21.361899 -8.603379 0 18.099385 0 0.000000 0.000000
+ T4 15 10.845682 6.127436 234.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 6 13.474033 7.686781 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+STRAIGHT 15 0 0 0 0 DEMO 2
+ T4 13 8.572172 4.504395 234.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ T4 14 10.845682 6.127436 54.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000
+ END
+REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmtrntab.xtr b/app/lib/demos/dmtrntab.xtr
index 22f8d42..fcb26d6 100644
--- a/app/lib/demos/dmtrntab.xtr
+++ b/app/lib/demos/dmtrntab.xtr
@@ -23,4 +23,8 @@ MESSAGE
=========================================
END
STEP
+REGRESSION START 10 - turntable
+TURNTABLE 1 0 0 0 0 DEMO 2 6.000000 6.000000 0 3.750000 0
+ END
+REGRESSION END
CLEAR