From b00710ca56b6a63053bcad3a8ab0ac3120de2e34 Mon Sep 17 00:00:00 2001 From: mistangl Date: Thu, 17 Oct 2024 12:45:22 +0200 Subject: [PATCH 1/3] =?UTF-8?q?HEA=5Ffit=20als=20Flag=20der=20Kurve=20eing?= =?UTF-8?q?ebaut,=20falls=20die=20H=C3=B6hen=20der=20Nachbarn=20nicht=20zu?= =?UTF-8?q?=20den=20eigenen=20H=C3=B6hen=20passen.=20StrArr=20im=20SSG=20P?= =?UTF-8?q?arameter=20verwendet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MAIN_SSG.rdx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 28d22f2..6ad5864 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -60,7 +60,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -85,6 +85,7 @@ + @@ -18247,6 +18248,7 @@ me.x + @@ -18269,6 +18271,7 @@ me.x + @@ -18280,6 +18283,7 @@ me.x + @@ -22570,13 +22574,13 @@ ShapeList["id="+Param.Input[1].shapeID].name + - @@ -22798,6 +22802,7 @@ ShapeList["id="+Param.Input[1].shapeID].name + @@ -22812,6 +22817,10 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + From ebfa673f6088905ff644ed847243ba51890a9167 Mon Sep 17 00:00:00 2001 From: mistangl Date: Fri, 18 Oct 2024 12:12:14 +0200 Subject: [PATCH 2/3] Kurven in Gruppen-Folder eingetragen --- Editor2DLibrary/SSG/shapes/categories.txt | 2 +- Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml | 6 ------ Editor2DLibrary/SSG/shapes/settings.txt | 2 +- cleanLocalShapes.bat | 9 +++++++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt index b38f460..d93aa8c 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":true}] \ 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":"c_Kurven","name":"Kurven","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}] \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml index 1dd038a..fa74eb4 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml @@ -1,8 +1,2 @@ 
Gefällestrecke
-
90 Kurve links
-
90 Kurve rechts
-
60 Kurve links
-
60 Kurve rechts
-
30 Kurve links
-
30 Kurve rechts
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt index fa6e1e1..ade3f15 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":true},"c_Foerderer":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false}},"shapes":{}} \ No newline at end of file +{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true}},"shapes":{}} \ No newline at end of file diff --git a/cleanLocalShapes.bat b/cleanLocalShapes.bat index 23de065..2f7c61c 100644 --- a/cleanLocalShapes.bat +++ b/cleanLocalShapes.bat @@ -1,5 +1,10 @@ del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\shape_*.txt" +del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\Copy_*.txt" del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\shape_*.xml" -del "C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt" -del "C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml" +del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\Copy_*.xml" + +del "C:\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt" +del "C:\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\Copy_*.txt" +del "C:\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml" +del "C:\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\Copy_*.xml" pause \ No newline at end of file From eb32d6964391e3d178d96a3caa1d762ad949bab0 Mon Sep 17 00:00:00 2001 From: mistangl Date: Fri, 18 Oct 2024 12:37:56 +0200 Subject: [PATCH 3/3] c_Kurven.txt in die palettest der SSG Library dazu --- Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml new file mode 100644 index 0000000..8cb814d --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml @@ -0,0 +1,7 @@ +
90 Kurve links
+
90 Kurve rechts
+
60 Kurve links
+
60 Kurve rechts
+
30 Kurve links
+
30 Kurve rechts
+ \ No newline at end of file