From c876f8090be9ecfbda45d2bdd66ee4f592aa5b75 Mon Sep 17 00:00:00 2001 From: Simon Schmutzler Date: Wed, 5 Jun 2024 16:45:55 +0200 Subject: [PATCH] =?UTF-8?q?Set=20Status=20Funktionen=20hinzugef=C3=BCgt=20?= =?UTF-8?q?um=20jeweils=20die=20Farbe=20der=20Shapes=20nach=20Zustand=20zu?= =?UTF-8?q?=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Doku/bilder/Schoenenberger_Farben.png | Bin 0 -> 10056 bytes .../shapes/props/Gefaellestrecke_Default.txt | 54 +++ .../shapes/svg/Gefaellestrecke_Default.xml | 11 + .../SSG/shapes/svg/Gefaellestrecke_Falsch.xml | 2 +- .../shapes/svg/Gefaellestrecke_Richtig.xml | 2 +- MAIN_SSG.rdx | 425 ++++++++++++++++-- 6 files changed, 449 insertions(+), 45 deletions(-) create mode 100644 Doku/bilder/Schoenenberger_Farben.png create mode 100644 Editor2DLibrary/SSG/shapes/props/Gefaellestrecke_Default.txt create mode 100644 Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Default.xml diff --git a/Doku/bilder/Schoenenberger_Farben.png b/Doku/bilder/Schoenenberger_Farben.png new file mode 100644 index 0000000000000000000000000000000000000000..e407b178cf551a5471e01374d9156eba17d59c54 GIT binary patch literal 10056 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 literal 0 HcmV?d00001 diff --git a/Editor2DLibrary/SSG/shapes/props/Gefaellestrecke_Default.txt b/Editor2DLibrary/SSG/shapes/props/Gefaellestrecke_Default.txt new file mode 100644 index 0000000..7763121 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/props/Gefaellestrecke_Default.txt @@ -0,0 +1,54 @@ +{ + "shapeMode": 0, + "name": "Gefällestrecke_Falsch", + "family": "Gefaellestrecke", + "icon": "SSG/shapes/img/Gefaellestrecke.png", + "iconBig": "SSG/shapes/img/Gefaellestrecke.png", + "srcSVG": "SSG/shapes/svg/Gefaellestrecke_Default.xml", + "text": "^", + "width": 377.9528, + "height": 6047.2441, + "depth": 755.9055, + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", + "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": "Gefaellestrecke", + "label": "Oben", + "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": "Gefaellestrecke", + "label": "Unten", + "isDimension": true + } + ], + "eventClass": "OnInserted,OnDoubleclick,OnPasted,OnLinked" +} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Default.xml b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Default.xml new file mode 100644 index 0000000..9e206af --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Default.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Falsch.xml b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Falsch.xml index 4eff799..cdce177 100644 --- a/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Falsch.xml +++ b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Falsch.xml @@ -4,7 +4,7 @@ - + diff --git a/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Richtig.xml b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Richtig.xml index ded8b26..0b1ba73 100644 --- a/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Richtig.xml +++ b/Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Richtig.xml @@ -4,7 +4,7 @@ - + diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 732ff80..0b1aba1 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -40,9 +40,7 @@ - - @@ -139,7 +137,7 @@ - + @@ -1014,10 +1012,10 @@ - - - - + + + + @@ -1118,7 +1116,7 @@ - + @@ -2409,7 +2407,9 @@ +'Neue Länge aus der Eingabe + +]]> @@ -2523,7 +2523,7 @@ - + @@ -2553,7 +2553,7 @@ - + @@ -2588,7 +2588,7 @@ - + @@ -2618,7 +2618,7 @@ - + @@ -3302,6 +3302,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -3311,6 +3312,18 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + + + + + + + + + + + @@ -3404,7 +3417,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - @@ -3424,9 +3436,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - - - + @@ -3472,6 +3482,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -3730,7 +3741,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -11753,10 +11764,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest - - - - @@ -12534,7 +12541,7 @@ me.x - + @@ -13307,10 +13314,6 @@ me.x - - - - @@ -13759,22 +13762,22 @@ me.x - + - + - + - + @@ -15222,12 +15225,101 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15283,6 +15375,18 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + + + + + + + + + @@ -15592,6 +15696,248 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16081,7 +16427,6 @@ ShapeList["id="+Param.Input[1].shapeID].name - @@ -20628,22 +20973,16 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + - - - - + - - - - +