diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt index 4427030..b38f460 100644 --- a/Editor2DLibrary/SSG/shapes/categories.txt +++ b/Editor2DLibrary/SSG/shapes/categories.txt @@ -1 +1 @@ -[{"id":"c_ILS","name":"ILS","hasShapes":true,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","description":"Assemblies created while Session","hasShapes":false}] \ No newline at end of file +[{"id":"c_ILS","name":"ILS","hasShapes":true,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","description":"Assemblies created while Session","hasShapes":true}] \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_32.png b/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_32.png index 02ea543..67145e5 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_32.png and b/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_32.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_64.png b/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_64.png index 09c7e47..6ed2908 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_64.png and b/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_64.png differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Kreiselmodule.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Kreiselmodule.xml index 29c8fa3..c138288 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Kreiselmodule.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Kreiselmodule.xml @@ -1,4 +1,3 @@ 
Kreisel
-
Verbindungskreisel
Eckrad
\ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Zusatzmodul.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Zusatzmodul.xml index b84a9b2..5a522bb 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Zusatzmodul.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Zusatzmodul.xml @@ -1,6 +1,2 @@ -
BT-Beladung
-
BT-Entladung
-
MT-Beladung
-
MT-Entladung
-
BTMT-Beladung
+
BTMT-Beladung
\ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Links.txt b/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Links.txt index bc3630d..b91a01a 100644 --- a/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Links.txt +++ b/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Links.txt @@ -27,5 +27,6 @@ "label": "", "isDimension": true } - ] + ], + "eventClass": "OnDoubleclick,OnInserted,OnPasted,OnLinked" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Rechts.txt b/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Rechts.txt index 165deec..235dbd6 100644 --- a/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Rechts.txt +++ b/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Rechts.txt @@ -27,5 +27,6 @@ "label": "", "isDimension": true } - ] + ], + "eventClass": "OnDoubleclick,OnInserted,OnPasted,OnLinked" } \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_BT-Beladung.txt b/Editor2DLibrary/SSG/shapes/props/s_BT-Beladung.txt deleted file mode 100644 index e05997a..0000000 --- a/Editor2DLibrary/SSG/shapes/props/s_BT-Beladung.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "shapeMode": 0, - "name": "BT-Beladung", - "icon": "SSG/shapes/img/" -} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_BT-Entladung.txt b/Editor2DLibrary/SSG/shapes/props/s_BT-Entladung.txt deleted file mode 100644 index ef3557f..0000000 --- a/Editor2DLibrary/SSG/shapes/props/s_BT-Entladung.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "shapeMode": 0, - "name": "BT-Entladung", - "icon": "SSG/shapes/img/" -} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_MT-Beladung.txt b/Editor2DLibrary/SSG/shapes/props/s_MT-Beladung.txt deleted file mode 100644 index 17b35cd..0000000 --- a/Editor2DLibrary/SSG/shapes/props/s_MT-Beladung.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "shapeMode": 0, - "name": "MT-Beladung", - "icon": "SSG/shapes/img/" -} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_MT-Entladung.txt b/Editor2DLibrary/SSG/shapes/props/s_MT-Entladung.txt deleted file mode 100644 index 176d2f8..0000000 --- a/Editor2DLibrary/SSG/shapes/props/s_MT-Entladung.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "shapeMode": 0, - "name": "MT-Entladung", - "icon": "SSG/shapes/img/" -} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Verbindungskreisel.txt b/Editor2DLibrary/SSG/shapes/props/s_Verbindungskreisel.txt deleted file mode 100644 index 1d3c2fc..0000000 --- a/Editor2DLibrary/SSG/shapes/props/s_Verbindungskreisel.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "shapeMode": 0, - "name": "Verbindungskreisel", - "icon": "SSG/shapes/img/" -} \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 0017b4e..fe16b4b 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -73,7 +73,7 @@ - + @@ -84,6 +84,14 @@ + + + + + + + + @@ -679,15 +687,24 @@ - + + + + + + + + + + @@ -751,6 +768,7 @@ + @@ -760,13 +778,16 @@ - + + - + + + @@ -846,6 +867,15 @@ + + + + + + + + + @@ -1457,6 +1487,9 @@ + + + @@ -1601,6 +1634,7 @@ + @@ -1850,6 +1884,10 @@ + + + + @@ -3013,6 +3051,59 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3112,12 +3203,15 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + @@ -4268,59 +4362,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6049,6 +6090,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest + @@ -7245,10 +7287,15 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest + + + + + @@ -7304,8 +7351,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest - - @@ -8521,7 +8566,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest - + @@ -8575,13 +8620,14 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest - - - + + + + @@ -8623,13 +8669,14 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest + + + - - @@ -9266,6 +9313,35 @@ me.x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9518,6 +9594,18 @@ me.x + + + + + + + + + + + + @@ -9648,6 +9736,18 @@ me.x + + + + + + + + + + + + @@ -9663,6 +9763,18 @@ me.x + + + + + + + + + + + + @@ -9670,16 +9782,17 @@ me.x + - - + + - + @@ -9687,7 +9800,7 @@ me.x - + @@ -9720,79 +9833,6 @@ me.x - - - Shape_Prototype.BTMTBeladungDefinition.Drehung]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9815,8 +9855,10 @@ me.x - + + + @@ -9945,16 +9987,19 @@ me.x - + + + + - + @@ -10009,6 +10054,95 @@ me.x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10112,171 +10246,181 @@ me.x - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10284,6 +10428,200 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +