Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

1 files changed, 133 insertions, 17 deletions

diff --git a/app/lib/xtrkcad.xtq b/app/lib/xtrkcad.xtq
index 2fdb34c..96cb13e 100644
--- a/app/lib/xtrkcad.xtq
+++ b/app/lib/xtrkcad.xtq
@@ -22,6 +22,10 @@ SCALE 2mm(FS), 152.0, 0.3708
 	1560,40,1120
 	2200,50,1500
 	2640,60,1880
+SCALE T, 450.0, 0.126
+	1560,37.5,1080
+	2160,45,1440
+	2640,52.5,1800
 SCALE HO, 87.1, 0.6496
 	1567.8,32.66,1045.2
 	2090.4,38.1,1393
@@ -30,7 +34,7 @@ SCALE HOn3.5, 87.1, 0.472
 	1567.8,32.66,1045.2
 	2090.4,38.1,1393
 	2613,43.55,1567
-SCALE HOn3, 87.1, 0.4133
+SCALE HOn3, 87.1, 0.413
 	1567.8,32.66,1045.2
 	2090.4,38.1,1393
 	2613,43.55,1567
@@ -70,11 +74,12 @@ SCALE OO9, 76.2, 0.3543
 	1567.8,32.66,1045.2
 	2090.4,38.1,1393
 	2613,43.55,1567
+#US 1:45 scale
 SCALE O, 48.0, 1.25
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
-SCALE On3.5, 48.0, 0.875
+SCALE On3.5, 48.0, 0.874
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
@@ -98,7 +103,8 @@ SCALE P48, 48.0, 1.177
     1536,24,960
     2016,30,1200
     2592,36,1440
-SCALE O(Fine), 43.5, 1.2598
+#UK 1:43.5 scale
+SCALE O(Fine), 43.5, 1.25
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
@@ -110,11 +116,29 @@ SCALE ScaleSeven, 43.5, 1.2992
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
-SCALE O, 45.0, 1.25
+SCALE On14mm, 43.5, 0.551
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
-SCALE On14mm, 43.5, 0.551
+SCALE On16.5, 43.5, 0.6496
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+#European 1:45
+SCALE O(EU), 45.0, 1.25
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE On3(EU), 45.0, 0.75
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE Oe(EU), 45.0, 0.6496
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+# Brio
+SCALE O55, 55.0, 1.023
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
@@ -134,7 +158,7 @@ SCALE Sn30, 64.0, 0.469
 	1536,28,1024
 	2048,32,1280
 	2688,40,1600
-SCALE Sn2, 64.0, 0.3543
+SCALE Sn2, 64.0, 0.413
 	1536,28,1024
 	2048,32,1280
 	2688,40,1600
@@ -162,6 +186,18 @@ SCALE 1/32, 32.0, 1.77
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
+SCALE A, 29, 1.77
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 1/2(H), 24.0, 1.77
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 2(II), 22.5, 2.00
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
 SCALE G, 22.5, 1.77
 	1536,24,960
 	2016,30,1200
@@ -178,26 +214,106 @@ SCALE F, 20.32, 2.78
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
-SCALE LEGO, 24, 1.48
+SCALE Fn3, 20.32, 1.77
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
-SCALE 8, 8, 7.5
+SCALE Fn2, 20.32, 1.26
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 16mm, 19.0, 2.97
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 16mmSM45, 19.0, 1.77
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 16mmSM32, 19.0, 1.26
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE SE(7/8)32, 13.7, 1.26
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE SE(7/8)45, 13.7, 1.77
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE LEGO, 38, 1.476
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 2-1/2", 22.5, 2.5
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 2-1/2"n30, 12.0, 2.5
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 3-1/2", 16, 3.5
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 3-1/2"n3, 10.286, 3.5
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 5", 11.3, 5.0
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 5"n2, 4.8, 5.0
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 7-1/4", 8, 7.25
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 7-1/4"n3, 4.8, 7.25
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 7-1/4"n2, 3.2, 7.25
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 7-1/2", 8, 7.5
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 7-1/2"n3, 4.8, 7.5
+	1536,24,960
+	2016,30,1200
+	2592,36,1440
+SCALE 7-1/2"n2, 3.2, 7.5
 	1536,24,960
 	2016,30,1200
 	2592,36,1440
-SCALE T, 450.0, 0.126
-	1560,37.5,1080
-	2160,45,1440
-	2640,52.5,1800
 SCALE RMC, 10.0, 5.5
-  1560,40,1120
-  2200,50,1500
-  2640,60,1880	
+    1560,40,1120
+    2200,50,1500
+    2640,60,1880
 SCALE DEMO, 160.0, 0.3531
 	1560,40,1120
 	2200,50,1500
 	2640,60,1880
+SCALEFIT TURNOUT EXACT OO HO
+SCALEFIT TURNOUT EXACT N(UK),N(JP) N
+SCALEFIT TURNOUT EXACT O(Fine),O(EU) O
+SCALEFIT TURNOUT EXACT HOf Nn3
+SCALEFIT TURNOUT EXACT Sn2 HOn3
+SCALEFIT TURNOUT EXACT Oe(EU) On30
+SCALEFIT TURNOUT EXACT On3(EU) On3
+SCALEFIT TURNOUT EXACT SE(7/8)32,Fn2 16mmSM32
+SCALEFIT TURNOUT EXACT 1/2(H),A,Fn3 G
+SCALEFIT TURNOUT EXACT SE(7/8)45,Fn3 16mmSM45
+SCALEFIT TURNOUT EXACT 7-1/4"n3 7-1/4"
+SCALEFIT TURNOUT EXACT 7-1/2"n3 7-1/2"
 TURNOUT DEMO  "Peco-55	Medium Right	SL-E395F"
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -275,7 +391,7 @@ STRUCTURE DEMO "LED 	T1 Green 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 DEMO "Switch	¼"" Push Button	 "
+STRUCTURE DEMO "Switch	¼"" Push Button	 "
 	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
@@ -305,7 +421,7 @@ STRUCTURE DEMO "Signals 	Dbl Signal	2"
 	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 DEMO "Symbols	¼"" DOT	 "
+STRUCTURE DEMO "Symbols	¼"" DOT	 "
 	G3 0 0.000000 0.125000 0.000000 0.000000 0
 	END
 STRUCTURE DEMO "Symbols	Arrow	 "