Merge branch 'feature/upstream' into develop

1 files changed, 30 insertions, 30 deletions

diff --git a/app/lib/params/Any-CTC_panel.xtp b/app/lib/params/Any-CTC_panel.xtp
index ab7dfd7..7c69b77 100644
--- a/app/lib/params/Any-CTC_panel.xtp
+++ b/app/lib/params/Any-CTC_panel.xtp
@@ -251,14 +251,14 @@ TURNOUT *  " 0.5"" Straight (adjustable to 6"""	S"
 	E 0.000000 0.000000 270.000000
 	E 0.500000 0.000000 90.000000
 	X adjustable 0.500000 6.000000
-	S 0 0 0.000000 0.000000 0.500000 0.000000
+	S 16777215 0 0.000000 0.000000 0.500000 0.000000
 	L 0 0.080000 0.000000 0.000000 0.500000 0.000000
 	END
 TURNOUT *  "Block Gap"	BG"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 0.500000 0.000000 90.000000
-	S 0 0 0.000000 0.000000 0.500000 0.000000
+	S 16777215 0 0.000000 0.000000 0.500000 0.000000
 	L 0 0.080000 0.000000 0.000000 0.200000 0.000000
 	L 0 0.080000 0.300000 0.000000 0.500000 0.000000
 	END
@@ -269,9 +269,9 @@ TURNOUT *  "Turnout LH(GAP)"	LHG"
 	E 0.000000 0.000000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.300000 0.000000 0.800000 0.500000
-	S 0 0 0.800000 0.500000 1.000000 0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.300000 0.000000 0.800000 0.500000
+	S 16777215 0 0.800000 0.500000 1.000000 0.500000
 	L 0 0.080000 0.050000 0.000000 0.950000 0.000000
 	L 0 0.080000 0.300000 0.000000 0.825000 0.525000
 	L 0 0.080000 0.800000 0.500000 0.950000 0.500000
@@ -281,9 +281,9 @@ TURNOUT *  "Turnout RH(GAP)"	RHG"
 	E 0.000000 0.000000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 -0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.300000 0.000000 0.800000 -0.500000
-	S 0 0 0.800000 -0.500000 1.000000 -0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.300000 0.000000 0.800000 -0.500000
+	S 16777215 0 0.800000 -0.500000 1.000000 -0.500000
 	L 0 0.080000 0.050000 0.000000 0.950000 0.000000
 	L 0 0.080000 0.300000 0.000000 0.825000 -0.525000
 	L 0 0.080000 0.800000 -0.500000 0.950000 -0.500000
@@ -293,9 +293,9 @@ TURNOUT *  "Turnout LH"	LH"
 	E 0.000000 0.000000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.300000 0.000000 0.800000 0.500000
-	S 0 0 0.800000 0.500000 1.000000 0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.300000 0.000000 0.800000 0.500000
+	S 16777215 0 0.800000 0.500000 1.000000 0.500000
 	L 0 0.080000 0.000000 0.000000 1.000000 0.000000
 	L 0 0.080000 0.300000 0.000000 0.825000 0.525000
 	L 0 0.080000 0.800000 0.500000 1.000000 0.500000
@@ -305,9 +305,9 @@ TURNOUT *  "Turnout RH"	RH"
 	E 0.000000 0.000000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 -0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.300000 0.000000 0.800000 -0.500000
-	S 0 0 0.800000 -0.500000 1.000000 -0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.300000 0.000000 0.800000 -0.500000
+	S 16777215 0 0.800000 -0.500000 1.000000 -0.500000
 	L 0 0.080000 0.000000 0.000000 1.000000 0.000000
 	L 0 0.080000 0.300000 0.000000 0.825000 -0.525000
 	L 0 0.080000 0.800000 -0.500000 1.000000 -0.500000
@@ -320,8 +320,8 @@ TURNOUT *  "Crossover LH(GAP)"	COLHG"
 	E 0.000000 0.500000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.000000 0.500000 1.000000 0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 0.500000 1.000000 0.500000
 	L 0 0.080000 0.050000 0.000000 0.950000 0.000000
 	L 0 0.080000 0.250000 0.000000 0.750000 0.500000
 	L 0 0.080000 0.050000 0.500000 0.950000 0.500000
@@ -332,8 +332,8 @@ TURNOUT *  "Crossover RH(GAP)"	CORHG"
 	E 0.000000 -0.500000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 -0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.000000 -0.500000 1.000000 -0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 -0.500000 1.000000 -0.500000
 	L 0 0.080000 0.050000 0.000000 0.950000 0.000000
 	L 0 0.080000 0.250000 0.000000 0.750000 -0.500000
 	L 0 0.080000 0.050000 -0.500000 0.950000 -0.500000
@@ -344,8 +344,8 @@ TURNOUT *  "Crossover LH"	COLH"
 	E 0.000000 0.500000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.000000 0.500000 1.000000 0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 0.500000 1.000000 0.500000
 	L 0 0.080000 0.000000 0.000000 1.000000 0.000000
 	L 0 0.080000 0.250000 0.000000 0.750000 0.500000
 	L 0 0.080000 0.000000 0.500000 1.000000 0.500000
@@ -356,8 +356,8 @@ TURNOUT *  "Crossover RH"	CORH"
 	E 0.000000 -0.500000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 -0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.000000 -0.500000 1.000000 -0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 -0.500000 1.000000 -0.500000
 	L 0 0.080000 0.000000 0.000000 1.000000 0.000000
 	L 0 0.080000 0.250000 0.000000 0.750000 -0.500000
 	L 0 0.080000 0.000000 -0.500000 1.000000 -0.500000
@@ -368,8 +368,8 @@ TURNOUT *  "Dbl.Crossover(GAP)"	DBLCOG"
 	E 0.000000 0.500000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.000000 0.500000 1.000000 0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 0.500000 1.000000 0.500000
 	L 0 0.080000 0.050000 0.000000 0.950000 0.000000
 	L 0 0.080000 0.250000 0.000000 0.750000 0.500000
 	L 0 0.080000 0.250000 0.500000 0.750000 0.000000
@@ -381,8 +381,8 @@ TURNOUT *  "Dbl.Crossover"	DBLCO"
 	E 0.000000 0.500000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 0.500000 90.000000
-	S 0 0 0.000000 0.000000 1.000000 0.000000
-	S 0 0 0.000000 0.500000 1.000000 0.500000
+	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 0.500000 1.000000 0.500000
 	L 0 0.080000 0.000000 0.000000 1.000000 0.000000
 	L 0 0.080000 0.250000 0.000000 0.750000 0.500000
 	L 0 0.080000 0.250000 0.500000 0.750000 0.000000
@@ -396,8 +396,8 @@ TURNOUT *  "90 Crossing"	90C"
 	E 0.500000 0.000000 90.000000
 	E 0.250000 0.250000 0.000000
 	E 0.250000 -0.250000 180.000000
-	S 0 0 0.000000 0.000000 0.500000 0.000000
-	S 0 0 0.250000 0.250000 0.250000 -0.250000
+	S 16777215 0 0.000000 0.000000 0.500000 0.000000
+	S 16777215 0 0.250000 0.250000 0.250000 -0.250000
 	L 0 0.080000 0.000000 0.000000 0.500000 0.000000
 	L 0 0.080000 0.250000 0.250000 0.250000 -0.250000
 	END
@@ -407,8 +407,8 @@ TURNOUT *  "45 Crossing"	45C"
 	E 0.500000 0.000000 90.000000
 	E 0.500000 0.250000 45.000000
 	E 0.000000 -0.2500000 225.000000
-	S 0 0 0.000000 0.000000 0.500000 0.000000
-	S 0 0 0.000000 -0.25000 0.500000 0.250000
+	S 16777215 0 0.000000 0.000000 0.500000 0.000000
+	S 16777215 0 0.000000 -0.25000 0.500000 0.250000
 	L 0 0.080000 0.000000 0.000000 0.500000 0.000000
 	L 0 0.080000 0.000000 -0.250000 0.500000 0.250000
 	END