Merge branch 'feature/upstrem' into develop

1 files changed, 43 insertions, 26 deletions

diff --git a/app/lib/demos/dmctlpnl.xtr b/app/lib/demos/dmctlpnl.xtr
index 99646d5..c045345 100644
--- a/app/lib/demos/dmctlpnl.xtr
+++ b/app/lib/demos/dmctlpnl.xtr
@@ -776,10 +776,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 +794,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 +808,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,7 +827,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
@@ -925,20 +927,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
@@ -1121,15 +1129,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