diff --git a/Editor2DLibrary/SSG/Init/ILS_KurveFoerderer.json b/Editor2DLibrary/SSG/Init/ILS_KurveFoerderer.json new file mode 100644 index 0000000..9ca95fe --- /dev/null +++ b/Editor2DLibrary/SSG/Init/ILS_KurveFoerderer.json @@ -0,0 +1,109 @@ +[ + { + "ID": "s_Kurve_30_L_Aussen_F", + "KurvenWinkel": 30, + "Breite": 161.197, + "Laenge": 311.186, + "KurvenRichtung" : "links", + "AntriebNebenStrecke": "Aussen" + }, + { + "ID": "s_Kurve_60_L_Aussen_F", + "KurvenWinkel": 60, + "Breite": 335.902, + "Laenge": 527.586, + "KurvenRichtung" : "links", + "AntriebNebenStrecke": "Aussen" + }, + { + + "ID": "s_Kurve_90_L_Aussen_F", + "KurvenWinkel": 90, + "Breite": 604.384, + "Laenge": 604.384, + "KurvenRichtung" : "links", + "AntriebNebenStrecke": "Aussen" + + }, + { + + "ID": "s_Kurve_30_R_Aussen_F", + "KurvenWinkel": 30, + "Breite": 161.197, + "Laenge": 311.186, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Aussen" + }, + { + + "ID": "s_Kurve_60_R_Aussen_F", + "KurvenWinkel": 60, + "Breite": 335.902, + "Laenge": 527.586, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Aussen" + }, + { + + "ID": "s_Kurve_90_R_Aussen_F", + "KurvenWinkel": 90, + "Breite": 604.384, + "Laenge": 604.384, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Aussen" + }, + { + + "ID": "s_Kurve_30_L_Innen_F", + "KurvenWinkel": 30, + "Breite": 215.295, + "Laenge": 283.195, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Innen" + }, + { + + "ID": "s_Kurve_60_L_Innen_F", + "KurvenWinkel": 60, + "Breite": 372.474, + "Laenge": 456.644, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Innen" + }, + { + + "ID": "s_Kurve_90_L_Innen_F", + "KurvenWinkel": 90, + "Breite": 577.221, + "Laenge": 577.221, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Innen" + }, + { + + "ID": "s_Kurve_30_R_Innen_F", + "KurvenWinkel": 30, + "Breite": 215.295, + "Laenge": 283.195, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Innen" + }, + { + + "ID": "s_Kurve_60_R_Innen_F", + "KurvenWinkel": 60, + "Breite": 372.474, + "Laenge": 456.644, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Innen" + }, + { + + "ID": "s_Kurve_90_R_Innen_F", + "KurvenWinkel": 90, + "Breite": 577.221, + "Laenge": 577.221, + "KurvenRichtung" : "rechts", + "AntriebNebenStrecke": "Innen" + } +] \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Aussen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Aussen_F_32px.png index cc94e2f..11645f5 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Aussen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Aussen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Aussen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Aussen_F_64px.png index 77fec15..6880dff 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Aussen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Aussen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Innen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Innen_F_32px.png index 440d78d..ff2059f 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Innen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Innen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Innen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Innen_F_64px.png index 9aaf00c..564baf0 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Innen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_L_Innen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Aussen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Aussen_F_32px.png index 5cbc641..72ced3a 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Aussen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Aussen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Aussen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Aussen_F_64px.png index ec60bbd..0212158 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Aussen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Aussen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Innen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Innen_F_32px.png index b34a271..06c1add 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Innen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Innen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Innen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Innen_F_64px.png index 0fcc511..db20708 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Innen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_30_R_Innen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Aussen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Aussen_F_32px.png index dbb89d6..764f538 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Aussen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Aussen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Aussen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Aussen_F_64px.png index e6b0fb6..56ba5c4 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Aussen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Aussen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Innen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Innen_F_32px.png index c3e459c..eedbd0b 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Innen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Innen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Innen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Innen_F_64px.png index 493f0d4..24ee3c6 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Innen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_L_Innen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Aussen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Aussen_F_32px.png index 89ca31f..73860e2 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Aussen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Aussen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Aussen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Aussen_F_64px.png index 4ef65a5..bec24ea 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Aussen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Aussen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Innen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Innen_F_32px.png index 20101c4..50a3780 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Innen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Innen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Innen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Innen_F_64px.png index ed25645..2fbd266 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Innen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_60_R_Innen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Aussen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Aussen_F_32px.png index aeb12e6..aae7438 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Aussen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Aussen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Aussen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Aussen_F_64px.png index 2b61a11..de53d89 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Aussen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Aussen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Innen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Innen_F_32px.png index cd4a618..e598029 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Innen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Innen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Innen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Innen_F_64px.png index e8fe82c..f4c12a0 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Innen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_L_Innen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Aussen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Aussen_F_32px.png index c3ea8ef..e35af5d 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Aussen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Aussen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Aussen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Aussen_F_64px.png index 93b3df3..ab7fa4b 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Aussen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Aussen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Innen_F_32px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Innen_F_32px.png index 345e956..dc8d02f 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Innen_F_32px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Innen_F_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Innen_F_64px.png b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Innen_F_64px.png index 11288c0..c9bc484 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Innen_F_64px.png and b/Editor2DLibrary/SSG/shapes/img/s_Kurve_90_R_Innen_F_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml index 59b607c..1609504 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml @@ -2,5 +2,4 @@
Umlenkspannst. links für TEF rechts
Antriebst. links für TEF links
Antriebst. rechts für TEF rechts
-
TEF Gerade
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index f3dfe6e..f49e9bd 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -117,16 +117,18 @@ - + - + - - + + + + @@ -226,7 +228,7 @@ - + @@ -240,7 +242,7 @@ - + @@ -268,7 +270,7 @@ - + @@ -292,7 +294,7 @@ - + @@ -995,7 +997,7 @@ - + @@ -1014,7 +1016,7 @@ - + @@ -1124,7 +1126,7 @@ - + @@ -1141,7 +1143,7 @@ - + @@ -1460,6 +1462,7 @@ + @@ -6160,11 +6163,18 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + + - + + + + @@ -6233,11 +6243,11 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + - + = 0]]> @@ -6248,11 +6258,11 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + - + = 0]]> @@ -6263,7 +6273,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + = 0]]> @@ -6275,6 +6285,18 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + + + + + + + + + + @@ -17766,6 +17788,7 @@ SSGConnectionPoint.x_M + @@ -21625,41 +21648,6 @@ SSGConnectionPoint.x_M - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22238,31 +22226,6 @@ SSGConnectionPoint.x_M - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24170,275 +24133,538 @@ SSGConnectionPoint.x_M - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29274,6 +29500,18 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + + + + + + + + + @@ -30019,10 +30257,11 @@ ShapeList["id="+Param.Input[1].shapeID].name + - + @@ -30078,6 +30317,7 @@ ShapeList["id="+Param.Input[1].shapeID].name + @@ -30132,7 +30372,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -30449,6 +30689,7 @@ ShapeList["id="+Param.Input[1].shapeID].name + @@ -47350,7 +47591,7 @@ me.x - + @@ -53889,6 +54130,58 @@ me.x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59961,10 +60254,10 @@ me.x - + - + @@ -59974,10 +60267,10 @@ me.x - + - + @@ -59989,27 +60282,23 @@ me.x - + - - - - + + - + - - - - + + @@ -60095,6 +60384,7 @@ me.x + @@ -60150,6 +60440,65 @@ me.x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -60180,7 +60529,7 @@ me.x - + @@ -60207,6 +60556,7 @@ me.x + @@ -60237,30 +60587,28 @@ me.x - + - + - + + + - - - - - + @@ -61215,7 +61563,7 @@ me.x - @@ -65171,6 +65519,18 @@ me.x + + + + + + + + + + + + @@ -65305,12 +65665,12 @@ me.x + - - + @@ -66772,4 +67132,4 @@ me.x - + \ No newline at end of file