diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt index 0dfec83..8db6dff 100644 --- a/Editor2DLibrary/SSG/shapes/categories.txt +++ b/Editor2DLibrary/SSG/shapes/categories.txt @@ -1 +1 @@ -[{"id":"c_ILS","name":"ILS","hasShapes":false,"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":"Gefällestrecke","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","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":false},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true}]}] \ No newline at end of file +[{"id":"c_ILS","name":"ILS","hasShapes":false,"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":"Gefällestrecke","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","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":true},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true}]}] \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/img/APB_110_R400_45_400_821104021_32px.png b/Editor2DLibrary/SSG/shapes/img/APB_110_R400_45_400_821104021_32px.png new file mode 100644 index 0000000..06f0676 Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/APB_110_R400_45_400_821104021_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/APB_110_R400_45_400_821104021_64px.png b/Editor2DLibrary/SSG/shapes/img/APB_110_R400_45_400_821104021_64px.png new file mode 100644 index 0000000..c528caa Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/APB_110_R400_45_400_821104021_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_22_5.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_22_5.xml index 466a37e..1ff5efd 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_22_5.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_22_5.xml @@ -1,2 +1,2 @@ -
APB 110 R 550/22.5 84
+
APB 110 R 550/22.5 84
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_90.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_90.xml index 48426e6..b92df3a 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_90.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_90.xml @@ -1,2 +1,2 @@ -
APB 110 R 630/90 800/800
+
APB 110 R 630/90 800/800
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml index e2f5945..04ace5b 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml @@ -1,2 +1,2 @@ -
AP 110
+
AP 110
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt b/Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt index 8ba1caf..9320397 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt @@ -1,7 +1,7 @@ { "shapeMode": 0, "name": "APB 110 R 550/22.5 84", - "family": "Omniflo", + "family": "OFBogen", "icon": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_64px.png", "srcSVG": "SSG/shapes/svg/s_Bogen_22.5.xml", diff --git a/Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt b/Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt index 37c545f..4571d4f 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt @@ -1,7 +1,7 @@ { "shapeMode": 0, "name": "APB 110 R 630/90 800/800", - "family": "Omniflo", + "family": "OFBogen", "icon": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_64px.png", "srcSVG": "SSG/shapes/svg/s_Bogen_90.xml", diff --git a/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt b/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt index c241062..9a126b0 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt @@ -1,7 +1,7 @@ { "shapeMode": 0, "name": "AP 110", - "family": "Omniflo", + "family": "OFGerade", "icon": "SSG/shapes/img/AP_32px.png", "iconBig": "SSG/shapes/img/AP_64px.png", "srcSVG": "SSG/shapes/svg/s_Gerade_AP110.xml", diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt index eb41920..219bcc5 100644 --- a/Editor2DLibrary/SSG/shapes/settings.txt +++ b/Editor2DLibrary/SSG/shapes/settings.txt @@ -1 +1 @@ -{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":false},"c_Zusatzmodul":{"expanded":false},"c_Foerderer":{"expanded":false},"c_Kurven":{"expanded":false},"c10":{"expanded":false},"c_Background":{"expanded":false},"c_Parts":{"expanded":false},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen_90":{"expanded":true},"c_Boegen_45":{"expanded":false},"c_Boegen_22_5":{"expanded":false},"c_Gerade":{"expanded":true}},"shapes":{}} \ No newline at end of file +{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":false},"c_Zusatzmodul":{"expanded":false},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":false},"c_Background":{"expanded":false},"c_Parts":{"expanded":false},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen_90":{"expanded":true},"c_Boegen_45":{"expanded":true},"c_Boegen_22_5":{"expanded":true},"c_Gerade":{"expanded":true}},"shapes":{}} \ No newline at end of file diff --git a/SVGs/Omniflo/APB_110_R400_45_400_821104021.svg b/SVGs/Omniflo/APB_110_R400_45_400_821104021.svg index 58ef679..40cf0b2 100644 --- a/SVGs/Omniflo/APB_110_R400_45_400_821104021.svg +++ b/SVGs/Omniflo/APB_110_R400_45_400_821104021.svg @@ -1,14 +1,4 @@ - - - - - - - - - - - - - + + + diff --git a/cleanLocalShapes.bat b/cleanLocalShapes.bat index 217843d..e8a95ab 100644 --- a/cleanLocalShapes.bat +++ b/cleanLocalShapes.bat @@ -1,11 +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:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\Copy_*.xml" - -del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt" -del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\Copy_*.txt" -del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml" -del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\Copy_*.xml" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\shape_*.txt" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\Copy_*.txt" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\shape_*.xml" +del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\Copy_*.xml" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\Copy_*.txt" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml" +del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\Copy_*.xml" pause \ No newline at end of file