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 b92c08e..165762f 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml @@ -1,3 +1,4 @@ +<<<<<<< HEAD 
Gefällestrecke Gerade
90 Kurve links Gefällestrecke
90 Kurve rechts Gefällestrecke
@@ -11,4 +12,7 @@
60 Kurve rechts angetriebene
30 Kurve links angetriebene
30 Kurve rechts angetriebene
+======= +
Gefällestrecke
+>>>>>>> eb32d6964391e3d178d96a3caa1d762ad949bab0 \ No newline at end of file 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 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/MAIN_SSG.rdx b/MAIN_SSG.rdx index 8da14e8..523ac10 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -60,7 +60,7 @@ - + @@ -83,8 +83,14 @@ +<<<<<<< HEAD +======= + + + +>>>>>>> eb32d6964391e3d178d96a3caa1d762ad949bab0 @@ -18247,6 +18253,7 @@ me.x + @@ -18269,6 +18276,7 @@ me.x + @@ -18280,6 +18288,7 @@ me.x + @@ -22564,13 +22573,13 @@ ShapeList["id="+Param.Input[1].shapeID].name + - @@ -22792,6 +22801,7 @@ ShapeList["id="+Param.Input[1].shapeID].name + @@ -22806,6 +22816,10 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + 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