summaryrefslogtreecommitdiff
path: root/app/lib/demos
diff options
context:
space:
mode:
Diffstat (limited to 'app/lib/demos')
-rw-r--r--app/lib/demos/CMakeLists.txt5
-rw-r--r--app/lib/demos/dmadjend.xtr20
-rw-r--r--app/lib/demos/dmcancel.xtr10
-rw-r--r--app/lib/demos/dmconn1.xtr12
-rw-r--r--app/lib/demos/dmconn2.xtr24
-rw-r--r--app/lib/demos/dmctlpnl.xtr114
-rw-r--r--app/lib/demos/dmdelund.xtr2
-rw-r--r--app/lib/demos/dmdimlin.xtr3
-rw-r--r--app/lib/demos/dmexcept.xtr4
-rw-r--r--app/lib/demos/dmextend.xtr6
-rw-r--r--app/lib/demos/dmgroup.xtr101
-rw-r--r--app/lib/demos/dmhelix.xtr8
-rw-r--r--app/lib/demos/dmlines.xtr63
-rw-r--r--app/lib/demos/dmlines2.xtr6
-rw-r--r--app/lib/demos/dmnotes.xtr53
-rw-r--r--app/lib/demos/dmrescal.xtr10
-rw-r--r--app/lib/demos/dmrotate.xtr6
-rw-r--r--app/lib/demos/dmselect.xtr34
-rw-r--r--app/lib/demos/dmtbledg.xtr57
-rw-r--r--app/lib/demos/dmtosel.xtr66
-rw-r--r--app/lib/demos/dmtoyard.xtr53
21 files changed, 406 insertions, 251 deletions
diff --git a/app/lib/demos/CMakeLists.txt b/app/lib/demos/CMakeLists.txt
deleted file mode 100644
index 712902c..0000000
--- a/app/lib/demos/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-FILE(GLOB DEMO_FILES *.xtr)
-INSTALL(
- FILES ${DEMO_FILES}
- DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR}/demos
- )
diff --git a/app/lib/demos/dmadjend.xtr b/app/lib/demos/dmadjend.xtr
index c74122a..8e3ea40 100644
--- a/app/lib/demos/dmadjend.xtr
+++ b/app/lib/demos/dmadjend.xtr
@@ -109,15 +109,26 @@ 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 4 7.500 3.167
+#MOUSE 4 7.500 3.167
+MOUSE 3 7.500 3.167
MESSAGE
_________________________________________
Here you are warned that the track will be too short.
END
-MOUSE 1 7.60 3.167
-BIGPAUSE
+STEP
+MOUSE 4 7.500 3.167
+MESSAGE
+_________________________________________
+
+Because the modified track is too short, the modification is abandoned the original track is restored.
+END
+STEP
MOUSE 2 7.60 3.167
+MOUSE 3 7.60 3.167
+BIGPAUSE
+#MOUSE 2 7.60 3.167
+MOUSE 3 7.60 3.167
STEP
MOUSE 3 8.417 3.167
PAUSE 60
@@ -172,8 +183,7 @@ END
STEP
CLEAR
MESSAGE
-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.
+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
diff --git a/app/lib/demos/dmcancel.xtr b/app/lib/demos/dmcancel.xtr
index e4afbf7..f6544dd 100644
--- a/app/lib/demos/dmcancel.xtr
+++ b/app/lib/demos/dmcancel.xtr
@@ -27,7 +27,7 @@ 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 140.000000 "This is some text"
+ Z 0 0.000000 0.000000 0.000000 0 140.000000 "Hello"
END
REDRAW
RESET
@@ -79,8 +79,8 @@ STEP
PARAMETER describe S2 Medium Left
PARAMETER describe S3 SL-E396F2
STEP
-MOUSE 2 11.500 6.625
-MOUSE 4 11.500 6.625
+MOUSE 2 6.000 6.625
+MOUSE 4 6.000 6.625
MESSAGE
_________________________________________
@@ -95,7 +95,7 @@ and its size.
END
STEP
#DESCRIBE Font Size 19
-PARAMETER describe LE1 -1 19
+PARAMETER describe LE1 -1 60
STEP
MESSAGE
_________________________________________
@@ -140,7 +140,7 @@ 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"
+ Z 0 0.000000 0.000000 0.000000 0 60.000000 "Goodbye"
END
REGRESSION END
CLEAR
diff --git a/app/lib/demos/dmconn1.xtr b/app/lib/demos/dmconn1.xtr
index 5d5ea12..d793aec 100644
--- a/app/lib/demos/dmconn1.xtr
+++ b/app/lib/demos/dmconn1.xtr
@@ -62,7 +62,7 @@ TURNOUT 6 0 0 0 0 HO 2 48.889351 1.684210 180.000000 "Kato Unitrack #4-R Turnou
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 2 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 2 40.576601 3.256112 15.500000 "Kato Unitrack R550-3.5° (i
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 2 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 2 34.789943 4.043642 0.000000 "Kato Unitrack R550-15.5° (i
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 2 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 2 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 2 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
@@ -504,7 +504,7 @@ TURNOUT 13 0 0 0 0 HO 2 27.865728 1.684210 0 0.000000 "Kato Unitrack Straight 6
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
+ E4 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
@@ -512,7 +512,7 @@ TURNOUT 14 0 0 0 0 HO 2 34.789943 4.043642 0 180.000000 "Kato Unitrack Straight
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
+ E4 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
diff --git a/app/lib/demos/dmconn2.xtr b/app/lib/demos/dmconn2.xtr
index 720c677..3cd9837 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 2 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 2 17.157895 20.894737 0.000000 "Kato Unitrack Curve 9.75R 2
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 2 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 2 10.253860 18.034992 315.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 3 0 0 0 0 N 2 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 2 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 2 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 2 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 2 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 2 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 2 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
@@ -131,7 +131,7 @@ TURNOUT 14 0 0 0 0 N 2 37.310072 3.423450 60.000000 "Kato Unitrack S60L {incl w
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 2 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 2 44.895807 1.245404 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 16 0 0 0 0 N 2 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 2 51.799842 4.105149 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 17 0 0 0 0 N 2 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 2 54.659587 11.009184 90.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 18 0 0 0 0 N 2 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 2 51.799842 17.913219 45.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 19 0 0 0 0 N 2 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 2 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 2 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
diff --git a/app/lib/demos/dmctlpnl.xtr b/app/lib/demos/dmctlpnl.xtr
index 99646d5..f06f1a3 100644
--- a/app/lib/demos/dmctlpnl.xtr
+++ b/app/lib/demos/dmctlpnl.xtr
@@ -117,7 +117,7 @@ RESET
MESSAGE
_________________________________________
-For our control panel we will use ¼" lines.
+For our control panel we will use ¼" lines.
Also, we will use a 1/8" grid to lay out our controls.
First, we will set up the Snap Grid for 1" grid lines and 8 divisions.
@@ -147,19 +147,16 @@ PARAMETER misc cmdDelete
MESSAGE
First step: draw the lines representing the tracks.
-We specify the line width in pixels when at 1:1 zoom.
+We specify the line width in inches.
-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 = 24 (approximately).
-For Linux, the DPI is usually 72, so choose: 72/4 = 18.
+To create a 1/4" line, enter 0.250 in the "Straight Line Width" box at the bottom of the window.
END
STEP
COMMAND DrawLine
PARAMETER draw linewidth 0
PARAMETER draw linecolor 0
PARAMETER GROUP draw
-PARAMETER draw linewidth 24
+PARAMETER draw linewidth 0.250
STEP
KEYSTATE 2
MOUSE 2 1.000 6.000
@@ -495,7 +492,7 @@ MOUSE 4 8.000 3.000
MESSAGE
_________________________________________
-Notice how the Snap Grid keeps the main line and siding track parallel and the connecting tracks and spur at a 45° angle.
+Notice how the Snap Grid keeps the main line and siding track parallel and the connecting tracks and spur at a 45° angle.
END
STEP
RESET
@@ -562,7 +559,7 @@ Now we'll add push buttons to control the turnouts.
END
STEP
ORIG 1 0.0000000 4.000000
-HOTBARSELECT Switch ¼" Push Button
+HOTBARSELECT Switch ¼" Push Button
MOUSE 2 2.750 6.000
MOUSE 4 2.750 6.000
BIGPAUSE
@@ -607,7 +604,7 @@ 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.
+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"
@@ -712,20 +709,20 @@ MESSAGE
Now for some touch-ups.
Notice when the line meet at an angle there is a gap.
-We will fill this gap with the ¼" dot.
+We will fill this gap with the ¼" dot.
Note: Win95/Win98/WinME does not support drawing lines with flat end-caps, but only with round end-caps.
Users on those platforms will not see the gap.
END
STEP
ORIG 1 2.000 4.000
-HOTBARSELECT Symbols ¼" DOT
+HOTBARSELECT Symbols ¼" DOT
MOUSE 2 3.000 5.000
MOUSE 4 3.000 5.000
BIGPAUSE
MOUSE 8200 3.000 5.000
ORIG 1 8.000 4.000
-HOTBARSELECT Symbols ¼" DOT
+HOTBARSELECT Symbols ¼" DOT
MOUSE 2 9.000 5.000
MOUSE 4 9.000 5.000
BIGPAUSE
@@ -736,7 +733,7 @@ _________________________________________
Add an arrow head to indicate the tracks that connect to the rest of the layout.
-The second arrow will be flipped 180°"
+The second arrow will be flipped 180°"
END
STEP
HOTBARSELECT Symbols Arrow
@@ -755,7 +752,7 @@ MOUSE 6920 0.500 6.000
#MESSAGE
#_________________________________________
#
-#Rotate the arrow head by 180° and move into position.
+#Rotate the arrow head by 180° and move into position.
#END
#MOUSE 2 0.500 6.000
#MOUSE 4 0.500 6.000
@@ -776,10 +773,12 @@ And add some labels.
END
STEP
COMMAND Text
-PARAMETER text Fontsize 0 18
+PARAMETER text fontsize 0 18
+PARAMETER text boxed 0
PARAMETER GROUP text
-PARAMETER text Fontsize -1 48
-PARAMETER text Color 0
+PARAMETER text fontsize -1 48
+PARAMETER text boxed 0
+PARAMETER text color 0
MOUSE 2 4.500 6.969
MOUSE 4 4.391 6.672
KEYSTATE 2
@@ -792,9 +791,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
@@ -806,7 +805,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
@@ -825,11 +824,11 @@ 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
-We want to print our control panel onto a 8½x11 page, but the control panel is a bit too wide.
+We want to print our control panel onto a 8½x11 page, but the control panel is a bit too wide.
Lets tighten it up a bit.
@@ -925,20 +924,26 @@ 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
+ L3 0 0.250 1.000000 6.000000 0 9.772000 6.000000 0
END
+DRAW 19 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.250000 8.750000 6.000000 0 7.750000 5.000000 0
+ END$SEGS
+#DRAW 19 0 0 0 0 -1.250000 0.000000 0 0.000000
+# L3 0 0.250 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
+ L3 0 0.250 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
+ L3 0 0.250 3.000000 5.000000 0 2.000000 6.000000 0
END
+DRAW 22 0 0 0 0 0.000000 0.000000 0 0.000000
+ L3 0 0.250000 5.187000 5.000000 0 7.187000 3.000000 0
+ END$SEGS
+#DRAW 22 0 0 0 0 -0.813000 0.000000 0 0.000000
+# L3 0 0.320 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
@@ -981,7 +986,7 @@ STRUCTURE 28 0 0 0 0 DEMO 2 5.437000 4.750000 0 0.000000 "LED T1 Red LED "
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 "
+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
@@ -989,7 +994,7 @@ STRUCTURE 29 0 0 0 0 DEMO 2 2.750000 6.000000 0 0.000000 "Switch ¼"" Push Button
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 "
+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
@@ -997,7 +1002,7 @@ STRUCTURE 30 0 0 0 0 DEMO 2 2.500000 5.500000 0 0.000000 "Switch ¼"" Push Button
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 "
+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
@@ -1005,7 +1010,7 @@ STRUCTURE 31 0 0 0 0 DEMO 2 8.000000 6.000000 0 0.000000 "Switch ¼"" Push Button
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 "
+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
@@ -1013,7 +1018,7 @@ STRUCTURE 32 0 0 0 0 DEMO 2 8.250000 5.500000 0 0.000000 "Switch ¼"" Push Button
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 "
+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
@@ -1021,7 +1026,7 @@ STRUCTURE 33 0 0 0 0 DEMO 2 5.937000 5.000000 0 0.000000 "Switch ¼"" Push Button
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 "
+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
@@ -1099,11 +1104,11 @@ STRUCTURE 40 0 0 0 0 DEMO 2 7.500000 4.625000 0 90.000000 "Signals Sgl Signal 1
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 "
+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 "
+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
@@ -1121,15 +1126,24 @@ STRUCTURE 44 0 0 0 0 DEMO 2 1.000000 6.250000 0 180.000000 "Symbols Arrow "
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
+DRAW 45 0 0 0 0 0.000000 0.000000 0 0.000000
+ Z 0 3.937000 6.625000 0.000000 0 48.000000 "Summit"
+ END$SEGS
+DRAW 46 0 0 0 0 0.000000 0.000000 0 0.000000
+ Z 0 0.641000 5.016000 0.000000 0 24.000000 "Seattle"
+ END$SEGS
+DRAW 47 0 0 0 0 0.000000 0.000000 0 0.000000
+ Z 0 8.641000 5.000000 0.000000 0 24.000000 "Chicago"
+ END$SEGS
+#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 5215c06..de76430 100644
--- a/app/lib/demos/dmdelund.xtr
+++ b/app/lib/demos/dmdelund.xtr
@@ -84,7 +84,7 @@ 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
+ E4 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/dmdimlin.xtr b/app/lib/demos/dmdimlin.xtr
index 904fffb..071e9f8 100644
--- a/app/lib/demos/dmdimlin.xtr
+++ b/app/lib/demos/dmdimlin.xtr
@@ -137,7 +137,8 @@ END
STEP
PARAMETER draw arrowsize 2 Small
MOUSE 2 15.000 9.688
-MOUSE 4 6.375 4.000
+#MOUSE 4 6.375 4.000
+MOUSE 4 6.275 3.900
#PARAMETER draw arrowsize 2 Medium
PARAMETER GROUP draw
MESSAGE
diff --git a/app/lib/demos/dmexcept.xtr b/app/lib/demos/dmexcept.xtr
index ae1c8aa..ff98734 100644
--- a/app/lib/demos/dmexcept.xtr
+++ b/app/lib/demos/dmexcept.xtr
@@ -31,7 +31,7 @@ RESET
MESSAGE
XTrackCAD can help find tracks that are curved too sharply or are too steep. These tracks are Exception tracks and are drawn in the Exception track color.
-In this example we have a curved track with radius of 9" and a straight track with a grade of 3.8%.
+In this example we have a curved track with radius of 9 inches and a straight track with a grade of 3.8 percent.
END
STEP
@@ -39,7 +39,7 @@ PARAMETER misc cmdLayout
MESSAGE
_________________________________________
-The Layout dialog shows the Minimum Track Radius is 9" and the Maximum Track Grade is 5%.
+The Layout dialog shows the Minimum Track Radius is 9 inches and the Maximum Track Grade is 5 percent.
END
STEP
PARAMETER layout mintrackradius 9.000000
diff --git a/app/lib/demos/dmextend.xtr b/app/lib/demos/dmextend.xtr
index 1b8deff..102b665 100644
--- a/app/lib/demos/dmextend.xtr
+++ b/app/lib/demos/dmextend.xtr
@@ -89,11 +89,11 @@ CURVE 3 0 0 0 0 DEMO 2 12.321667 17.666667 0 15.000000 0 0.000000 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
+ T4 5 20.405847 3.822767 241.733791 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
+CORNU 5 0 0 0 0 DEMO 2 7.000000 1.000000 270.000000 0.000000 0.000000 0.000000 20.405847 3.822767 61.733791 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
+ T4 4 20.405847 3.822767 61.733791 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
diff --git a/app/lib/demos/dmgroup.xtr b/app/lib/demos/dmgroup.xtr
index f5ed0dd..7c6c7cd 100644
--- a/app/lib/demos/dmgroup.xtr
+++ b/app/lib/demos/dmgroup.xtr
@@ -28,24 +28,29 @@ COMMAND DrawLine
PARAMETER draw linewidth 0
PARAMETER draw linecolor 0
PARAMETER GROUP draw
-PARAMETER draw linewidth 4
+PARAMETER draw linewidth 0.055555
MOUSE 1 2.500 3.000
COMMAND DrawLine
MOUSE 2 2.500 3.000
MOUSE 4 2.500 1.500
COMMAND DrawLine
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 3.200 3.000
-KEYSTATE 12
+KEYSTATE A
MOUSE 4 3.200 1.500
STEP
COMMAND DrawFilledBox
PARAMETER draw linecolor 0
PARAMETER GROUP draw
+KEYSTATE A
MOUSE 1 2.600 3.000
+KEYSTATE A
MOUSE 2 2.600 3.000
+KEYSTATE A
MOUSE 4 3.100 2.500
+KEYSTATE A
MOUSE 2 2.600 2.000
+KEYSTATE A
MOUSE 4 3.100 1.500
MESSAGE
_________________________________________
@@ -136,24 +141,24 @@ _________________________________________
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
+#KEYSTATE C
+MOUSE 1 2.500 2.812
+#KEYSTATE C
+MOUSE 2 2.500 2.812
+KEYSTATE C
+MOUSE 4 2.500 2.812
+KEYSTATE C
+MOUSE 2 2.850 2.500
+KEYSTATE C
+MOUSE 4 2.850 2.500
+KEYSTATE C
+MOUSE 2 3.200 2.000
+KEYSTATE C
+MOUSE 4 3.200 2.000
+KEYSTATE C
+MOUSE 2 2.850 1.500
+KEYSTATE C
+MOUSE 4 2.850 1.500
MOUSE 1 5.000 1.000
MESSAGE
_________________________________________
@@ -169,8 +174,8 @@ 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 1 5.000 2.116
+MOUSE 2 5.000 2.116
MOUSE 4 4.594 0.844
ORIG 1.0 0.0 0.0
MESSAGE
@@ -212,9 +217,9 @@ You can later Group this turnout with the straight segments to recreate the turn
END
STEP
-KEYSTATE 2
+KEYSTATE S
MOUSE 2 4.625 1.969
-KEYSTATE 2
+KEYSTATE S
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"
@@ -251,7 +256,7 @@ MOUSE 4 11.156 4.281
BIGPAUSE
COMMAND TurnoutHotBar
#PARAMETER turnout list 0
-PARAMETER GROUP turnout
+PARAMETER GROUP newFixedTrack
HOTBARSELECT Peco-55 Modified Medium Right SL-E395F
MOUSE 1 4.750 1.906
MOUSE 2 4.750 1.906
@@ -292,9 +297,9 @@ BIGPAUSE
MOUSE 1 5.219 3.000
MOUSE 2 5.219 3.000
MOUSE 4 5.219 3.000
-KEYSTATE 12
+KEYSTATE S
MOUSE 2 5.219 2.000
-KEYSTATE 12
+KEYSTATE S
MOUSE 4 5.219 2.000
PARAMETER misc cmdDelete
MESSAGE
@@ -304,7 +309,7 @@ Now draw the green circles...
END
STEP
ORIG 1.0 0.0 0.0
-COMMAND DrawFilledCircleTangent
+COMMAND DrawFilledCircleCenter
PARAMETER draw linecolor 0
PARAMETER GROUP draw
PARAMETER draw linecolor 65280
@@ -324,13 +329,13 @@ END
STEP
ORIG 1.0 0.0 0.0
COMMAND Select
-KEYSTATE 12
+KEYSTATE S
MOUSE 1 3.719 4.156
-KEYSTATE 12
+KEYSTATE S
MOUSE 2 3.719 4.156
-KEYSTATE 12
+KEYSTATE S
MOUSE 3 10.531 0.969
-KEYSTATE 12
+KEYSTATE S
MOUSE 4 10.531 0.969
BIGPAUSE
PARAMETER misc cmdGroup
@@ -343,9 +348,9 @@ _________________________________________
Notice that the turnout in the HotBar is angled the same as the turnout on the layout. Make sure your new definition is rotated the way you want it.
END
STEP
-KEYSTATE 2
+KEYSTATE S
MOUSE 2 5.000 2.188
-KEYSTATE 2
+KEYSTATE S
MOUSE 4 5.000 2.188
REGRESSION START 10 - group 2
STRAIGHT 19 0 0 0 0 DEMO 2
@@ -389,21 +394,21 @@ 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.
+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
+KEYSTATE S
MOUSE 2 2.000 2.000
-KEYSTATE 12
+KEYSTATE S
MOUSE 3 9.000 2.000
-KEYSTATE 12
+KEYSTATE S
MOUSE 4 9.000 2.000
-KEYSTATE 12
+KEYSTATE S
MOUSE 2 9.000 2.000
-KEYSTATE 12
+KEYSTATE S
MOUSE 3 8.875 3.062
-KEYSTATE 12
+KEYSTATE S
MOUSE 4 8.875 3.062
MESSAGE
_________________________________________
@@ -422,7 +427,7 @@ _________________________________________
We'll make the Length 7.5".
-If we change the Length, each End-Point will be moved to shorten the track. We want to just move the Right End-Point. To control this, change the Pivot to First which means the Left End-Point will be unchanged when we change the length (or angle) of the track.
+If we change the Length, each End-Point will be moved to shorten the track. We want to just move the Right End-Point. To control this, change the Lock to First which means the Left End-Point will be unchanged when we change the length (or angle) of the track.
END
STEP
#DESCRIBE Pivot 0
@@ -451,7 +456,7 @@ MOUSE 4 7.688 2.625
MESSAGE
_________________________________________
-Here the Left End-Point (which we don't want to move) is the Second End-Point, so we'll make that the Pivot.
+Here the Left End-Point (which we don't want to move) is the Second End-Point, so we'll make that the Lock.
END
STEP
#DESCRIBE Pivot 2
@@ -459,7 +464,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
@@ -483,11 +488,11 @@ COMMAND Select
MOUSE 1 7.500 2.750
MOUSE 2 7.500 2.750
MOUSE 4 7.500 2.750
-KEYSTATE 12
+KEYSTATE S
MOUSE 1 8.000 2.000
-KEYSTATE 12
+KEYSTATE S
MOUSE 2 8.000 2.000
-KEYSTATE 12
+KEYSTATE S
MOUSE 4 8.000 2.000
MESSAGE
and Group them.
diff --git a/app/lib/demos/dmhelix.xtr b/app/lib/demos/dmhelix.xtr
index f02c1d6..88707da 100644
--- a/app/lib/demos/dmhelix.xtr
+++ b/app/lib/demos/dmhelix.xtr
@@ -28,7 +28,7 @@ PARAMETER helix vertSep 0.0
MESSAGE
_________________________________________
-We will be creating a helix with a Elevation Difference of 12", Grade of 1.5% and limit the Vertical Separation to at least 2".
+We will be creating a helix with a Elevation Difference of 12 inches, Grade of 1.5 percent and limit the Vertical Separation to at least 2 inches.
END
STEP
MESSAGE
@@ -52,7 +52,7 @@ STEP
MESSAGE
_________________________________________
-Next set the Grade to 1.5%
+Next set the Grade to 1.5 percent
Notice how this causes the Radius to change.
END
STEP
@@ -85,7 +85,7 @@ BIGPAUSE
MESSAGE
_________________________________________
-Lastly change the Vertical Separation to 2.5". The number of Turns will change to 4 and the grade increase to almost 3%.
+Lastly change the Vertical Separation to 2.5 inches. The number of Turns will change to 4 and the grade increase to almost 3 percent.
Note: the Vertical Separation will be increased. This value is the Elevation Difference (12.0) divided by the total number of turns. The total number of turns is 4.25: 4 whole Turns plus a quarter turn for the Angular Separation.
END
@@ -176,7 +176,7 @@ REDRAW
MESSAGE
_________________________________________
-We have set the elevations to 1" and 13" to produce a grade of 3.0% with 2.8" between coils.
+We have set the elevations to 1 inch and 13 inches to produce a grade of 3.0 percent with 2.8 inches between coils.
You can use the <Describe> command to change the number of Turns or the Elevations at either end of the Helix. This will affect the Grade and Vertical Separation.
END
diff --git a/app/lib/demos/dmlines.xtr b/app/lib/demos/dmlines.xtr
index 9f2b66f..32555fb 100644
--- a/app/lib/demos/dmlines.xtr
+++ b/app/lib/demos/dmlines.xtr
@@ -48,45 +48,45 @@ _________________________________________
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.
+By default, the new line will snap to existing objects. Hold down the <Alt> keys to prevent this from happening.
END
STEP
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 0.533 4.693
-KEYSTATE 12
+KEYSTATE A
MOUSE 3 4.320 4.693
-KEYSTATE 12
+KEYSTATE A
MOUSE 4 4.320 4.693
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 4.373 4.693
-KEYSTATE 12
+KEYSTATE A
MOUSE 3 4.533 5.120
-KEYSTATE 12
+KEYSTATE A
MOUSE 4 4.533 5.120
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 0.533 4.693
-KEYSTATE 12
+KEYSTATE A
MOUSE 3 0.533 4.693
-KEYSTATE 12
+KEYSTATE A
MOUSE 4 0.267 5.120
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 0.267 3.253
-KEYSTATE 12
+KEYSTATE A
MOUSE 3 0.533 3.787
-KEYSTATE 12
+KEYSTATE A
MOUSE 4 0.533 3.787
STEP
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 0.533 3.787
-KEYSTATE 12
+KEYSTATE A
MOUSE 3 4.320 3.787
-KEYSTATE 12
+KEYSTATE A
MOUSE 4 4.320 3.787
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 4.320 3.787
-KEYSTATE 12
+KEYSTATE A
MOUSE 3 4.533 3.307
-KEYSTATE 12
+KEYSTATE A
MOUSE 4 4.533 3.307
MESSAGE
_________________________________________
@@ -94,9 +94,10 @@ _________________________________________
You also draw in various colors and line widths.
END
PARAMETER draw linecolor 255
-PARAMETER draw linewidth 6
+PARAMETER draw linewidth 0.055555
STEP
-MOUSE 2 0.747 4.800
+KEYSTATE A
+MOUSE 2 0.747 4.693
MOUSE 4 0.693 6.560
MOUSE 2 0.693 6.560
MOUSE 4 1.493 7.573
@@ -115,7 +116,7 @@ Here we will draw a Curve by dragging from one End-Point to the other to define
END
STEP
COMMAND DrawCurveChord
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 0.800 3.680
#MOUSE 3 0.800 3.573
#MOUSE 3 0.853 3.467
@@ -174,12 +175,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
+KEYSTATE A
MOUSE 4 4.107 3.787
BIGPAUSE
-KEYSTATE 12
+KEYSTATE A
MOUSE 2 2.9 3.78
-KEYSTATE 12
+KEYSTATE A
MOUSE 4 2.9 1.5
MESSAGE
_________________________________________
@@ -195,10 +196,10 @@ MESSAGE
_________________________________________
Circles can be drawn by clicking on the center or edge and dragging to set the radius.
-Here we will drag from the Center.
+Here we will drag from the edge to the Center.
END
STEP
-COMMAND DrawCircleCenter
+COMMAND DrawCircleTangent
MOUSE 2 7.360 6.453
MOUSE 4 8.533 5.920
MESSAGE
@@ -212,15 +213,15 @@ MOUSE 2 11.307 6.400
MOUSE 4 11.307 6.400
#BIGPAUSE
#PARAMETER misc cmdDelete
-KEYSTATE 4
+KEYSTATE C
MOUSE 2 4.160 5.493
-KEYSTATE 4
+KEYSTATE C
MOUSE 4 4.160 5.493
#BIGPAUSE
#PARAMETER misc cmdDelete
-KEYSTATE 4
+KEYSTATE C
MOUSE 2 3.467 6.933
-KEYSTATE 4
+KEYSTATE C
MOUSE 4 3.467 6.933
BIGPAUSE
PARAMETER misc cmdDelete
diff --git a/app/lib/demos/dmlines2.xtr b/app/lib/demos/dmlines2.xtr
index 13f43b3..f90ba88 100644
--- a/app/lib/demos/dmlines2.xtr
+++ b/app/lib/demos/dmlines2.xtr
@@ -91,7 +91,7 @@ RESET
MESSAGE
We also draw Polylines and filled shapes.
END
-PARAMETER draw linewidth 2
+PARAMETER draw linewidth 0.027777
PARAMETER draw linecolor 11591910
COMMAND DrawPolyline
STEP
@@ -102,7 +102,7 @@ A Polyline is drawn by dragging to place each of the point in the Polyline.
END
STEP
PARAMETER draw linecolor 0
-PARAMETER draw linewidth 3
+PARAMETER draw linewidth 0.041667
PARAMETER draw linecolor 32768
MOUSE 2 0.64 6.07
MOUSE 4 0.64 6.07
@@ -184,7 +184,7 @@ _________________________________________
Filled Boxes and Circles work the same as line Boxes and Circles.
END
-COMMAND DrawFilledCircleTangent
+COMMAND DrawFilledCircleCenter
PARAMETER draw linecolor 16776960
BIGPAUSE
MOUSE 2 7.360 6.45333
diff --git a/app/lib/demos/dmnotes.xtr b/app/lib/demos/dmnotes.xtr
index 6125354..aa1b4cd 100644
--- a/app/lib/demos/dmnotes.xtr
+++ b/app/lib/demos/dmnotes.xtr
@@ -4,7 +4,7 @@ ORIG 8.000 0.000 0.000
REDRAW
RESET
MESSAGE
-The <Note> command lets you attach notes to various spots on the layout.
+The <Text Note> command lets you attach notes to various spots on the layout.
END
STEP
COMMAND TextNote
@@ -14,22 +14,63 @@ MOUSE 4 9.917 7.167
MESSAGE
_________________________________________
-When you place a note, the Note editor window is displayed which lets you enter the note.
+When you place a note, the Text Note editor window is displayed which lets you enter the note.
END
STEP
-RESET
-MOUSE 6920 9.917 7.167
+#RESET
+#MOUSE 6920 9.917 7.167
+#MOUSE 3336 9.917 7.167
+PARAMETER textNote ok
MESSAGE
_________________________________________
-If you click on a note in <Describe> mode the Note editor displays the note.
+If you click on a note in <Describe> mode the Text Note editor displays the note allowing you to modify the note..
END
STEP
COMMAND Describe
MOUSE 2 9.917 7.167
MOUSE 4 9.917 7.167
STEP
-MOUSE 6920 9.917 7.167
+#MOUSE 6920 9.917 7.167
+PARAMETER textNote ok
+
+MESSAGE
+_________________________________________
+
+You can also create a reference to a file or web link.
+
+Choose the type of link by clicking on the down arrow beside the Note commmand.
+END
+STEP
+
+COMMAND FileNote
+MOUSE 2 9.917 7.167
+MOUSE 3 7.917 7.167
+MOUSE 4 7.917 7.167
+MESSAGE
+_________________________________________
+
+This is a File Note. You can specify the Title of the File and its location
+END
+STEP
+PARAMETER fileNote cancel
+MOUSE 6920 7.917 7.167
+RESET
+
+COMMAND LinkNote
+MOUSE 2 7.917 7.167
+MOUSE 3 5.917 7.167
+MOUSE 4 5.917 7.167
+MESSAGE
+_________________________________________
+
+This is a Web Link Note. You can specify the Title of the Link and its URL
+END
+STEP
+PARAMETER linkNote cancel
+MOUSE 6920 5.917 7.167
+RESET
+
REGRESSION START 10 - notes
NOTE 1 0 0 0 9.917000 7.167000 0 32
Replace this text with your note
diff --git a/app/lib/demos/dmrescal.xtr b/app/lib/demos/dmrescal.xtr
index 32662b1..c4ac3a6 100644
--- a/app/lib/demos/dmrescal.xtr
+++ b/app/lib/demos/dmrescal.xtr
@@ -119,6 +119,8 @@ PARAMETER misc cmdRescale
MESSAGE
The <Rescale> command will change the size of the selected objects.
+Note: due to technical reasons, the To Scale drop down list is blank. For this demo it should show 'DEMO'.
+
First we will try rescaling by ratio.
END
STEP
@@ -126,7 +128,7 @@ PARAMETER rescale toggle 1
MESSAGE
_________________________________________
-We are going to make everything 150% bigger.
+We are going to make everything 150 percent bigger.
END
STEP
@@ -139,7 +141,6 @@ END
STEP
PARAMETER misc cmdUndo
RESET
-PARAMETER misc cmdRescale
MESSAGE
_________________________________________
@@ -148,9 +149,10 @@ Let's try that again.
Now we are going to convert from one scale to another.
END
STEP
-PARAMETER rescale toggle 0
-PARAMETER rescale toS 4 HO
PARAMETER misc cmdSelectAll
+PARAMETER misc cmdRescale
+PARAMETER rescale toggle 0
+PARAMETER rescale toS 5 HO
MESSAGE
_________________________________________
diff --git a/app/lib/demos/dmrotate.xtr b/app/lib/demos/dmrotate.xtr
index ed04a77..895c5b6 100644
--- a/app/lib/demos/dmrotate.xtr
+++ b/app/lib/demos/dmrotate.xtr
@@ -135,7 +135,7 @@ MOUSE 4 1.000 10.000
MESSAGE
_________________________________________
-The <Rotate> command will restrict the rotation to increments of 15° if you hold down the <Shift> and <Ctrl> keys.
+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
@@ -327,7 +327,7 @@ END
#MESSAGE
#_________________________________________
#
-#Shift-Right-Click will display a popup-menu that you can use to rotate by fixed amount (15°, 30°, 45°, 90° or 180°).
+#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
@@ -362,7 +362,7 @@ END
#MESSAGE
#_________________________________________
#
-#If we drag the mouse across the track, we can flip the structure by 180°. This is similar to how we place turnouts.
+#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
diff --git a/app/lib/demos/dmselect.xtr b/app/lib/demos/dmselect.xtr
index 06bed0c..cff9af7 100644
--- a/app/lib/demos/dmselect.xtr
+++ b/app/lib/demos/dmselect.xtr
@@ -177,12 +177,36 @@ 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.
+When you move the cursor near a track that could be selected, the track is drawn with thick blue lines.
END
STEP
COMMAND Select
MESSAGE
_________________________________________
+The Select operates in two modes which are controled by the Options|Command menu.
+END
+PARAMETER misc cmdCmdopt
+BIGPAUSE
+PARAMETER cmdopt selectmode 1
+MESSAGE
+
+In 'classic' mode, clicking on an object adds it to set of selected objects.
+END
+STEP
+PARAMETER cmdopt selectmode 0
+MESSAGE
+
+In the 'new' mode, clicking on an object deselectes all other objects, leaving just the newly selected object.
+Holding down the Ctrl key reverses this behavior.
+
+This demo will use the 'new' mode.
+
+There is also an option to the control the behavior of clicking on empty space: do nothing or deselecting all objects.
+END
+STEP
+PARAMETER cmdopt ok
+MESSAGE
+_________________________________________
A Left-Click selects a track
END
@@ -263,8 +287,12 @@ _________________________________________
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
+MOUSE 2 12.000 5.560
+MOUSE 4 12.000 5.560
+#KEYSTATE C
+#MOUSE 2 19.840 2.560
+#KEYSTATE C
+#MOUSE 4 19.840 2.560
BIGPAUSE
KEYSTATE 2
MOUSE 2 19.840 2.560
diff --git a/app/lib/demos/dmtbledg.xtr b/app/lib/demos/dmtbledg.xtr
index 4e00dcd..b2731d1 100644
--- a/app/lib/demos/dmtbledg.xtr
+++ b/app/lib/demos/dmtbledg.xtr
@@ -47,7 +47,7 @@ MOUSE 1 58.000 26.167
MESSAGE
_________________________________________
-A Table Edge is attracted to the ends of other Table Edges.
+A Table Edge is attracted to other objects, unless you hold down the Alt key.
END
STEP
MOUSE 2 58.000 26.167
@@ -116,19 +116,32 @@ MOUSE 3 57.833 1.833
MOUSE 3 58.000 1.833
MOUSE 3 58.333 1.833
BIGPAUSE
+#KEYSTATE C
MOUSE 3 58.333 1.667
+#KEYSTATE C
MOUSE 3 58.500 1.667
+#KEYSTATE C
MOUSE 3 58.667 1.667
+#KEYSTATE C
MOUSE 3 58.667 1.500
+#KEYSTATE C
MOUSE 3 58.833 1.500
+#KEYSTATE C
MOUSE 3 58.667 1.500
+#KEYSTATE C
MOUSE 3 58.500 1.500
+#KEYSTATE C
MOUSE 3 58.167 1.667
+#KEYSTATE C
MOUSE 3 58.167 1.833
+#KEYSTATE C
MOUSE 3 58.000 1.833
+#KEYSTATE C
MOUSE 3 57.833 1.833
-MOUSE 3 57.667 2.000
-MOUSE 4 57.667 2.000
+#KEYSTATE C
+MOUSE 3 58.200 2.000
+#KEYSTATE C
+MOUSE 4 58.200 2.000
MESSAGE
_________________________________________
@@ -180,40 +193,40 @@ 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.
+Unless you hold down the Alt 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
+#KEYSTATE A
MOUSE 2 28.167 9.333
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.167 9.000
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.167 8.667
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.500 7.667
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.500 7.500
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.500 7.167
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.500 6.833
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.500 6.667
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.500 6.500
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.500 6.333
-KEYSTATE 4
+#KEYSTATE A
MOUSE 3 28.500 6.167
-KEYSTATE 4
-MOUSE 3 28.333 6.167
-KEYSTATE 4
-MOUSE 3 28.333 6.000
-KEYSTATE 4
-MOUSE 4 28.167 5.667
-MOUSE 8200 28.167 5.667
+#KEYSTATE A
+MOUSE 3 28.600 6.167
+#KEYSTATE A
+MOUSE 3 28.600 6.000
+#KEYSTATE A
+MOUSE 4 28.600 5.667
+MOUSE 8200 28.600 5.667
STEP
MESSAGE
=========================================
diff --git a/app/lib/demos/dmtosel.xtr b/app/lib/demos/dmtosel.xtr
index df3d067..14c404c 100644
--- a/app/lib/demos/dmtosel.xtr
+++ b/app/lib/demos/dmtosel.xtr
@@ -1,7 +1,7 @@
VERSION 2
DEMOINIT
ORIG 4.000 0.000 0.000
-PARAMETER turnout hide 1
+PARAMETER newFixedTrack hide 1
STRAIGHT 1 DEMO 1
E 2.050000 1.050000 270.000000
T 3 14.883333 1.050017 90.000000
@@ -28,19 +28,22 @@ STRAIGHT 4 DEMO 1
REDRAW
RESET
MESSAGE
-Pressing the turnout button displays the Turnout Selection window to let you choose a turnout to place.
-
-Note that once you start to place the turnout on the Main window the Turnout Selection window disappears. This feature is enabled by the Hide toggle button on the dialog.
+We chose the turnout we want to place by clicking on the HotBar.
END
STEP
-COMMAND Turnout
-MOUSE 2 5.750 6.583
+##COMMAND Turnout
+COMMAND TurnoutHotBar
+##PARAMETER turnout list 0
+##PARAMETER turnout hide 0
+PARAMETER GROUP newFixedTrack
+HOTBARSELECT Peco-55 Medium Right SL-E395F
MESSAGE
_________________________________________
You can place the turnout on a arbitrary position on the layout. Left-drag the turnout into place...
END
STEP
+MOUSE 2 5.750 6.583
MOUSE 3 5.833 6.583
PAUSE 110
MOUSE 3 6.333 6.583
@@ -57,6 +60,41 @@ MOUSE 3 8.333 6.750
PAUSE 110
MOUSE 3 8.750 6.917
PAUSE 110
+MESSAGE
+_________________________________________
+
+We are moving the Turnout by dragging on the 'Active End Point'
+We can change the 'Active End Point' by a Shift-Left-Click
+END$MESSAGE
+STEP
+KEYSTATE 2
+MOUSE 2 8.750 6.917
+KEYSTATE 2
+MOUSE 4 8.750 6.917
+MOUSE 525 8.750 6.917
+MESSAGE
+
+Notice the Turnout has rotated to the next End Point.
+END$MESSAGE
+STEP
+MESSAGE
+
+If we continue to Shift-Left-Click 2 more times, we will return to the original position.
+END$MESSAGE
+STEP
+KEYSTATE 2
+MOUSE 2 8.750 6.917
+KEYSTATE 2
+MOUSE 4 8.750 6.917
+MOUSE 525 8.750 6.917
+BIGPAUSE
+KEYSTATE 2
+MOUSE 2 8.750 6.917
+KEYSTATE 2
+MOUSE 4 8.750 6.917
+MOUSE 525 8.750 6.917
+BIGPAUSE
+MOUSE 2 8.750 6.917
MOUSE 3 9.250 6.917
PAUSE 110
MOUSE 3 9.750 6.917
@@ -137,8 +175,6 @@ MESSAGE
_________________________________________
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 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
@@ -220,7 +256,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
@@ -363,12 +399,12 @@ TURNOUT 7 0 0 0 0 DEMO 2 30.934023 6.328592 0 304.064054 "Peco-55 Medium Right
END
REGRESSION END
CLEAR
-MESSAGE
-
-Pressing Close ends the <Turnout> command.
-END
-STEP
-PARAMETER turnout ok
+##MESSAGE
+##
+##Pressing Close ends the <Turnout> command.
+##END
+##STEP
+##PARAMETER turnout ok
MESSAGE
=========================================
END
diff --git a/app/lib/demos/dmtoyard.xtr b/app/lib/demos/dmtoyard.xtr
index bff62af..df4afe6 100644
--- a/app/lib/demos/dmtoyard.xtr
+++ b/app/lib/demos/dmtoyard.xtr
@@ -2,7 +2,7 @@ VERSION 2
DEMOINIT
ORIG 4.000 0.000 0.000
PARAMETER display description-fontsize 24
-PARAMETER turnout hide 1
+##PARAMETER turnout hide 1
STRAIGHT 1 DEMO 1
E 3.666667 1.833333 270.000000
E 41.833333 1.833333 90.000000
@@ -10,19 +10,21 @@ STRAIGHT 1 DEMO 1
REDRAW
RESET
MESSAGE
-This example show how to layout a yard using the <Turnout> and <Parallel> commands.
+This example show how to layout a yard using Turnouts from the HotBar and the <Parallel> command.
END
STEP
-COMMAND Turnout
+##COMMAND Turnout
+COMMAND TurnoutHotBar
+HOTBARSELECT Peco-55 Medium Right SL-E395F
MESSAGE
_________________________________________
-You can resize and move the Turnout Selection dialog if it obscures the other windows.
+We'll choose a Turnout from the HotBar
-First we place a turnout on the main line.
+Then we place the Turnout on the main line.
END
STEP
-PARAMETER turnout list 0 Peco-55 SL-E395F Medium Right
+##PARAMETER turnout list 0 Peco-55 SL-E395F Medium Right
MOUSE 2 35.417 1.917
#BIGPAUSE
MOUSE 3 36.5 1.917
@@ -30,12 +32,13 @@ MOUSE 3 36.5 1.917
MOUSE 3 36.5 1.917
BIGPAUSE
MOUSE 4 36.5 1.917
-PARAMETER turnout ok
+##PARAMETER turnout ok
+MOUSE 3336 36.5 1.917
RESET
MESSAGE
_________________________________________
-Next extend the turnout with the <Modify> command.
+Next extend the Turnout with the <Modify> command.
END
STEP
COMMAND Modify
@@ -62,7 +65,7 @@ RESET
MESSAGE
_________________________________________
-And place a turnout to connect the new track.
+And place a Turnout to connect the new track.
We'll zoom in here to see what's going on.
END
@@ -71,14 +74,16 @@ STEP
#PAN 7 23.333 1.000
ORIG 2.000 21.333 1.000
BIGPAUSE
-COMMAND Turnout
-PARAMETER turnout list 0 Peco-55 SL-E396F Medium Left
+##COMMAND Turnout
+##PARAMETER turnout list 0 Peco-55 SL-E396F Medium Left
+COMMAND TurnoutHotBar
+HOTBARSELECT Peco-55 Medium Left SL-E396F
MOUSE 1 29.500 2.542
MOUSE 2 29.500 2.542
MESSAGE
_________________________________________
-Notice how we control which way the turnout is facing by moving the mouse across the center line of the track.
+Notice how we control which way the Turnout is facing by moving the mouse across the center line of the track.
END
STEP
@@ -94,19 +99,20 @@ MOUSE 3 29.625 2.667
MESSAGE
_________________________________________
-The Status bar displays the number of auto-connections that will be made and the maximum offset.
+The Status bar displays the number of auto-connections that will be made (3) and the maximum offset (0.000).
-XTrackCAD adjusts the turnout position for the best fit to minimize any connection offset
+XTrackCAD adjusts the Turnout position for the best fit to minimize any connection offset
END
STEP
MOUSE 4 29.625 2.667
#MOUSE 4 27.625 2.9
-PARAMETER turnout ok
-#RESET
+##PARAMETER turnout ok
+MOUSE 3336 29.625 2.667
+RESET
MESSAGE
_________________________________________
-Note that placing the turnout splits the parallel track.
+Note that placing the Turnout splits the parallel track.
We have to delete the leftover piece by Selecting and Deleting it.
END
@@ -132,14 +138,17 @@ MOUSE 4 16.417 3.583
RESET
BIGPAUSE
ORIG 2.000 16.000 2.000
-COMMAND Turnout
-PARAMETER turnout list 0 Peco-55 SL-E396F Medium Left
+##COMMAND Turnout
+##PARAMETER turnout list 0 Peco-55 SL-E396F Medium Left
+COMMAND TurnoutHotBar
+HOTBARSELECT Peco-55 Medium Left SL-E396F
MOUSE 2 22.167 3.938
MOUSE 3 21.750 4.000
BIGPAUSE
MOUSE 4 21.750 4.000
-PARAMETER turnout ok
-#RESET
+##PARAMETER turnout ok
+MOUSE 3336 21.750 4.000
+RESET
#COMMAND Select
MOUSE 2 22.688 4.438
MOUSE 4 22.688 4.438
@@ -149,7 +158,7 @@ ORIG 4.000 0.000 0.000
MESSAGE
_________________________________________
-For the last track we will join with a curve instead of a turnout.
+For the last track we will join with a curve instead of a Turnout.
END
STEP
BIGPAUSE
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 09:34:11 +0000