diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Parts.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Parts.xml index 3098925..b532c2b 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Parts.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Parts.xml @@ -19,4 +19,6 @@
Gefällestrecke2D
AP110_2D
AP110
+
TEFGERADE
+
TEFGerade_2D
\ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml index 1609504..5784282 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml @@ -2,4 +2,5 @@
Umlenkspannst. links für TEF rechts
Antriebst. links für TEF links
Antriebst. rechts für TEF rechts
- +
TEF Gerade
+ \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/0_B10010.txt b/Editor2DLibrary/SSG/shapes/props/0_B10010.txt index fd754dd..a083c4f 100644 --- a/Editor2DLibrary/SSG/shapes/props/0_B10010.txt +++ b/Editor2DLibrary/SSG/shapes/props/0_B10010.txt @@ -25,7 +25,7 @@ "zStep": "", "direction": 270.0, "linkClass": "OmnifloTEF", - "label": "", + "label": "TEF", "isDimension": true }, { @@ -44,7 +44,7 @@ "zStep": "", "direction": 270.0, "linkClass": "Omniflo", - "label": "", + "label": "Fahrstrecke", "isDimension": true } ], diff --git a/Editor2DLibrary/SSG/shapes/props/0_B10020.txt b/Editor2DLibrary/SSG/shapes/props/0_B10020.txt index d176dcb..5a9ae93 100644 --- a/Editor2DLibrary/SSG/shapes/props/0_B10020.txt +++ b/Editor2DLibrary/SSG/shapes/props/0_B10020.txt @@ -25,7 +25,7 @@ "zStep": "", "direction": 90.0, "linkClass": "OmnifloTEF", - "label": "", + "label": "TEF", "isDimension": true }, { @@ -44,7 +44,7 @@ "zStep": "", "direction": 90.0, "linkClass": "Omniflo", - "label": "", + "label": "Fahrstrecke", "isDimension": true } ], diff --git a/Editor2DLibrary/SSG/shapes/props/Umlenk_links_TEF_rechts.txt b/Editor2DLibrary/SSG/shapes/props/Umlenk_links_TEF_rechts.txt index 428a213..3c00011 100644 --- a/Editor2DLibrary/SSG/shapes/props/Umlenk_links_TEF_rechts.txt +++ b/Editor2DLibrary/SSG/shapes/props/Umlenk_links_TEF_rechts.txt @@ -25,7 +25,7 @@ "zStep": "", "direction": 270.0, "linkClass": "OmnifloTEF", - "label": "", + "label": "TEF", "isDimension": true }, { @@ -44,7 +44,7 @@ "zStep": "", "direction": 270.0, "linkClass": "Omniflo", - "label": "", + "label": "Fahrstrecke", "isDimension": true } ], diff --git a/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt b/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt index 5e0092d..e856f9f 100644 --- a/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt +++ b/Editor2DLibrary/SSG/shapes/props/Umlenk_rechts_TEF_links.txt @@ -25,7 +25,7 @@ "zStep": "", "direction": 90.0, "linkClass": "OmnifloTEF", - "label": "", + "label": "TEF", "isDimension": true }, { @@ -44,7 +44,7 @@ "zStep": "", "direction": 90.0, "linkClass": "Omniflo", - "label": "", + "label": "Fahrstrecke", "isDimension": true } ], diff --git a/Editor2DLibrary/SSG/shapes/props/s_TEFGerade.txt b/Editor2DLibrary/SSG/shapes/props/s_TEFGerade.txt index 97d56fb..08edebe 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_TEFGerade.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_TEFGerade.txt @@ -1,69 +1,12 @@ { "shapeMode": 0, - "name": "TEF Gerade", - "family": "TEFGerade", - "icon": "SSG/shapes/img/TEFGerade_32px.png", - "iconBig": "SSG/shapes/img/TEFGerade_64px.png", + "name": "TEFGERADE", + "icon": "SSG/shapes/img/", "srcSVG": "SSG/shapes/svg/s_TEFGerade.xml", - "width": 158.7402, + "src3D": "SSG/shapes/obj/s_TEFGerade.stl", + "width": 236.5984, "height": 3779.5276, - "depth": 415.748, - "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", - "group3d": [ - { - "source": "s_ap110", - "id": "g0", - "width": 158.7402, - "height": 3779.5276, - "depth": 415.748, - "x": 0.0, - "y": 0.0, - "z": 207.874, - "rotation": "0;0;0", - "data": "", - "color": "#FFFF00", - "colorOpacity": 1.0 - } - ], - "connectionPoints": [ - { - "id": "cp1", - "x": 500.0, - "y": 0.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 0.0, - "linkClass": "OmnifloTEF", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 500.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 180.0, - "linkClass": "OmnifloTEF", - "label": "", - "isDimension": true - } - ], - "eventClass": "OnInserted,OnDoubleclick,OnPasted,OnLinked,OnRemoved" + "depth": 264.5669, + "behaviour": "(ORIGIN=CENTER)", + "color3D": "#FF0000" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt index 12b5e57..b6a6f2e 100644 --- a/Editor2DLibrary/SSG/shapes/settings.txt +++ b/Editor2DLibrary/SSG/shapes/settings.txt @@ -1 +1 @@ -{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":false},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_Weichen_45":{"expanded":true},"c_Weichen_Parallel":{"expanded":true},"c_Weichenkoerper":{"expanded":true},"c_Weichenkombinationen":{"expanded":true},"c_TEFElemente":{"expanded":true},"c_OmnifloBogen":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_OmnifloWeiche":{"expanded":true}},"shapes":{}} \ No newline at end of file +{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":false},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_Weichen_45":{"expanded":true},"c_Weichen_Parallel":{"expanded":true},"c_Weichenkoerper":{"expanded":true},"c_Weichenkombinationen":{"expanded":true},"c_TEFElemente":{"expanded":true},"c_OmnifloBogen":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_OmnifloWeiche":{"expanded":false}},"shapes":{}} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml b/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml index c39bbd9..c46baff 100644 --- a/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml +++ b/Editor2DLibrary/SSG/shapes/svg/Umlenk_rechts_TEF_links.xml @@ -2,102 +2,107 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 7d5c9c2..fd573a6 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -4100,72 +4100,18 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - - + + - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4202,20 +4148,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - - - - - - - - - - - - - - @@ -4244,7 +4176,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -4269,10 +4201,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - - - - @@ -4299,22 +4227,23 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + - + - + - + @@ -4325,145 +4254,29 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Z1,Abs(Z0-Z1),0), "mm", 96)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - Z0,Abs(Z0-Z1),0), "mm", 96)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + + + @@ -4734,10 +4608,10 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + - + @@ -4762,6 +4636,172 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7137,6 +7177,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -7848,7 +7889,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -7872,7 +7913,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -7933,6 +7974,93 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8358,7 +8486,7 @@ SSGConnectionPoint.x_S+(KreiselData.Durchmesser/2) - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15633,6 +15800,7 @@ SSGConnectionPoint.x_M + @@ -63448,10 +63616,10 @@ me.x - + - + @@ -63461,7 +63629,7 @@ me.x - +