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

1 files changed, 266 insertions, 0 deletions

diff --git a/app/lib/params/HO-TrixExpress Tracks.xtp b/app/lib/params/HO-TrixExpress Tracks.xtp
new file mode 100644
index 0000000..86c3a8d
--- /dev/null
+++ b/app/lib/params/HO-TrixExpress Tracks.xtp
@@ -0,0 +1,266 @@
+CONTENTS Trix Express H0 Scale
+SUBCONTENTS Trix Express Track - Straight Tracks
+TURNOUT HO "Trix	Straight Track 183.5mm	04"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 7.224409 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 7.224409 0.000000
+	END$SEGS
+TURNOUT HO "Trix	Straight Track 134.3mm	05"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 5.287402 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 5.287402 0.000000
+	END$SEGS
+TURNOUT HO "Trix	Straight Track 95.5mm	06"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 3.759843 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 3.759843 0.000000
+	END$SEGS
+TURNOUT HO "Trix	Straight Track 88.0mm	07"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 3.464567 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 3.464567 0.000000
+	END$SEGS
+TURNOUT HO "Trix	Straight Track 49.2mm	08"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 1.937008 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 1.937008 0.000000
+	END$SEGS
+TURNOUT HO "Trix	Straight Track 30.1mm	03"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 1.185039 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 1.185039 0.000000
+	END$SEGS
+
+SUBCONTENTS Trix Express Track - Curve Tracks
+TURNOUT HO "Trix	Curve Track 30° R1=342.5mm	12"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 6.742126 -1.806547 120.000000
+	C 0 0.000000 13.484252 0.000000 -13.484252 0.000000 30.000000
+	END$SEGS
+TURNOUT HO "Trix	Curve Track 24° 4/5 R1=342.5mm	14"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 5.484539 -1.165775 114.000000
+	C 0 0.000000 13.484252 0.000000 -13.484252 0.000000 24.000000
+	END$SEGS
+TURNOUT HO "Trix	Curve Track 6° 1/5 R1=342.5mm	16"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 1.409488 -0.073868 96.000000
+	C 0 0.000000 13.484252 0.000000 -13.484252 0.000000 6.000000
+	END$SEGS
+TURNOUT HO "Trix	Curve Track 30° R2=401.7mm	22"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 7.907480 -2.118803 120.000000
+	C 0 0.000000 15.814961 0.000000 -15.814961 0.000000 30.000000
+	END$SEGS
+TURNOUT HO "Trix	Curve Track 24° 4/5 R2=401.7mm	24"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 6.432524 -1.367275 114.000000
+	C 0 0.000000 15.814961 0.000000 -15.814961 0.000000 24.000000
+	END$SEGS
+TURNOUT HO "Trix	Curve Track 6° 1/5 R2=401.7mm	26"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 1.653114 -0.086636 96.000000
+	C 0 0.000000 15.814961 0.000000 -15.814961 0.000000 6.000000
+	END$SEGS
+
+SUBCONTENTS Trix Express Track - Isolation Tracks
+TURNOUT HO "Trix	Straight Isolation Track 88.0mm	82"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 3.464567 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 3.464567 0.000000
+	END$SEGS
+TURNOUT HO "Trix	Curve Isolation Track 24° 4/5 R1=342.5mm	84"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 5.484539 1.165775 114.000000
+	C 0 0.000000 13.484252 0.000000 -13.484252 0.000000 24.000000
+	END$SEGS
+TURNOUT HO "Trix	Curve Isolation Track 24° 4/5 R2=401.7mm	86"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 6.432524 -1.367275 114.000000
+	C 0 0.000000 15.814961 0.000000 -15.814961 0.000000 24.000000
+	END$SEGS
+
+SUBCONTENTS Trix Express Track - Specialized Tracks
+TURNOUT HO "Trix	Uncoupler Track 88.0mm	69"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 3.464567 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 3.464567 0.000000
+	F4 3100495 0.000000 4 0
+		0.750000 0.400000 0
+		0.750000 1.400000 0
+		2.714567 1.400000 0
+		2.714567 0.400000 0
+	L3 8424071 0.400000 0.750000 0.000000 0 2.714567 0.000000 0
+	END$SEGS
+TURNOUT HO "Trix	Bumper/Buffer Track 88.0mm	91"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 3.464567 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 3.464567 0.000000
+	L3 10824234 0.100000 0.000000 0.250000 0 1.7322835 0.250000 0
+	L3 10824234 0.100000 0.000000 -0.250000 0 1.7322835 -0.250000 0
+	L3 10824234 0.100000 1.7322835 0.625000 0 1.7322835 -0.625000 0
+	END$SEGS
+TURNOUT HO "Trix	Straight Powerfeed Track 183.5mm	90"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 7.224409 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 7.224409 0.000000
+	L3 16711680 0.030000 3.112205 0.000000 0 3.112205 0.625000 0
+	L3 16711680 0.030000 3.112205 0.625000 0 2.987205 0.875000 0
+	L3 16711680 0.030000 3.112205 0.625000 0 3.237205 0.875000 0
+	L3 32768 0.030000 4.112205 0.000000 0 4.112205 0.625000 0
+	L3 32768 0.030000 4.112205 0.625000 0 3.987205 0.875000 0
+	L3 32768 0.030000 4.112205 0.625000 0 4.237205 0.875000 0
+	END$SEGS
+TURNOUT HO "Trix	Curve Powerfeed Track 30° R1=342.5mm	72"
+	P "P0" 1
+	E 0.000000 0.000000 270.000000
+	E 6.742126 -1.806547 120.000000
+	C 0 0.000000 13.484252 0.000000 -13.484252 0.000000 30.000000
+	A3 3100495 0.800000 14.271654 0.000000 -13.484252 0 20.00000 5.000000
+	END$SEGS
+
+SUBCONTENTS Trix Express Track - Turnouts
+TURNOUT HO "Trix	Manual Turnout left 183.5mm R1=342mm 24°	52L"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 7.224409 0.000000 90.000000
+	E 5.484646 1.165787 66.000000
+	S 0 0.000000 0.000000 0.000000 0.649647 0.000000
+	S 0 0.000000 0.649647 0.000000 7.224409 0.000000
+	C 0 0.000000 -10.428270 0.649647 10.428270 156.000000 24.000000
+	S 0 0.000000 4.891207 0.901571 5.484646 1.165787
+	F4 3100495 0.000000 6 0
+		0.700000 -0.400000 0
+		0.700000 -0.793701 0
+		1.841732 -1.738583 0
+		4.479528 -1.738583 0
+		5.621260 -0.793701 0
+		5.621260 -0.400000 0
+	END$SEGS
+TURNOUT HO "Trix	Manual Turnout right 183.5mm R1=342mm 24°	52R"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 7.224409 0.000000 90.000000
+	E 5.484646 -1.165787 114.000000
+	S 0 0.000000 0.000000 0.000000 0.649647 0.000000
+	S 0 0.000000 0.649647 0.000000 7.224409 0.000000
+	C 0 0.000000 10.428270 0.649647 -10.428270 0.000000 24.000000
+	S 0 0.000000 4.891207 -0.901571 5.484646 -1.165787
+	F4 3100495 0.000000 6 0
+		0.700000 0.400000 0
+		0.700000 0.793701 0
+		1.841732 1.738583 0
+		4.479528 1.738583 0
+		5.621260 0.793701 0
+		5.621260 0.400000 0
+	END$SEGS
+TURNOUT HO "Trix	Remote Turnout left 183.5mm R1=342mm 24°	62L"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 7.224409 0.000000 90.000000
+	E 5.484646 1.165787 66.000000
+	S 0 0.000000 0.000000 0.000000 0.649647 0.000000
+	S 0 0.000000 0.649647 0.000000 7.224409 0.000000
+	C 0 0.000000 -10.428270 0.649647 10.428270 156.000000 24.000000
+	S 0 0.000000 4.891207 0.901571 5.484646 1.165787
+	F4 3100495 0.000000 6 0
+		0.700000 -0.400000 0
+		0.700000 -0.793701 0
+		1.841732 -1.738583 0
+		4.479528 -1.738583 0
+		5.621260 -0.793701 0
+		5.621260 -0.400000 0
+	END$SEGS
+TURNOUT HO "Trix	Remote Turnout right 183.5mm R1=342mm 24°	62R"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 7.224409 0.000000 90.000000
+	E 5.484646 -1.165787 114.000000
+	S 0 0.000000 0.000000 0.000000 0.649647 0.000000
+	S 0 0.000000 0.649647 0.000000 7.224409 0.000000
+	C 0 0.000000 10.428270 0.649647 -10.428270 0.000000 24.000000
+	S 0 0.000000 4.891207 -0.901571 5.484646 -1.165787
+	F4 3100495 0.000000 6 0
+		0.700000 0.400000 0
+		0.700000 0.793701 0
+		1.841732 1.738583 0
+		4.479528 1.738583 0
+		5.621260 0.793701 0
+		5.621260 0.400000 0
+	END$SEGS
+TURNOUT HO "Trix	Curved Turnout left R1 42°	43L"
+	P "Normal" 2 3
+	P "Reverse" 1
+	E 0.000000 0.000000 270.000000
+	E 11.353434 3.463500 48.000000
+	E 9.022726 3.463500 48.000000
+	C 0 0.000000 -13.484252 0.000000 13.484252 138.000000 42.000000
+	S 0 0.000000 0.000000 0.000000 2.330709 0.000000
+	C 0 0.000000 -13.484252 2.330709 13.484252 138.000000 42.000000
+	A3 3100495 0.800000 11.000000 0.649698 11.792002 0 155.00000 20.000000
+	END$SEGS
+TURNOUT HO "Trix	Curved Turnout right R1 42°	43R"
+	P "Normal" 2 3
+	P "Reverse" 1
+	E 0.000000 0.000000 270.000000
+	E 11.353434 -3.463500 132.000000
+	E 9.022726 -3.463500 132.000000
+	C 0 0.000000 13.484252 0.000000 -13.484252 0.000000 42.000000
+	S 0 0.000000 0.000000 0.000000 2.330709 0.000000
+	C 0 0.000000 13.484252 2.330709 -13.484252 0.000000 42.000000
+	A3 3100495 0.800000 11.000000 0.649698 -11.792002 0 5.00000 20.000000
+	END$SEGS
+
+
+SUBCONTENTS Trix Express Track - Slips
+TURNOUT HO "Trix	Double Slipswitch Turnout 30° 183.5mm	68" 512
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
+	E 0.000000 0.000000 270.000000
+	E 7.224409 0.000000 90.000000
+	E 0.483940 1.806097 300.000000
+	E 6.740469 -1.806097 120.000000
+	S 0 0.000000 0.000000 0.000000 1.299247 0.000000
+	S 0 0.000000 1.299247 0.000000 5.925162 0.000000
+	S 0 0.000000 5.925162 0.000000 7.224409 0.000000
+	S 0 0.000000 0.483940 1.806097 1.609060 1.156501
+	S 0 0.000000 1.609060 1.156501 5.615349 -1.156501
+	S 0 0.000000 5.615349 -1.156501 6.740469 -1.806097
+	C 0 0.000000 8.632171 1.299213 -8.632171 0.000000 30.000000
+	C 0 0.000000 -8.632171 5.925172 8.632166 180.000000 30.000000
+	END$SEGS
+
+SUBCONTENTS Trix Express Track - Crossings
+TURNOUT HO "Trix	30° Crossing Track 183.5mm	04"
+	P "Normal" 1 0 2
+	E 0.000000 0.000000 270.000000
+	E 7.224409 0.000000 90.000000
+	E 0.483940 1.806097 300.000000
+	E 6.740469 -1.806097 120.000000
+	S 0 0.000000 0.000000 0.000000 7.224409 0.000000
+	S 0 0.000000 0.483940 1.806097 6.740469 -1.806097
+	END$SEGS