Merge branch 'feature/upstream' into develop

1 files changed, 43 insertions, 9 deletions

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