From b2636b2a03ac163b1f9bdae3956d677c16ce5397 Mon Sep 17 00:00:00 2001 From: Yuelin Wang Date: Fri, 14 Feb 2025 11:13:49 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Bogen=2045=C2=B0=20R=20400=20wurde=20eingep?= =?UTF-8?q?flegt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor2DLibrary/SSG/shapes/categories.txt | 2 +- .../img/APB_110_R400_45_400_821104021_32px.png | Bin 0 -> 627 bytes .../img/APB_110_R400_45_400_821104021_64px.png | Bin 0 -> 1203 bytes Editor2DLibrary/SSG/shapes/settings.txt | 2 +- SVGs/Omniflo/APB_110_R400_45_400_821104021.svg | 16 +++------------- cleanLocalShapes.bat | 17 ++++++++--------- 6 files changed, 13 insertions(+), 24 deletions(-) create mode 100644 Editor2DLibrary/SSG/shapes/img/APB_110_R400_45_400_821104021_32px.png create mode 100644 Editor2DLibrary/SSG/shapes/img/APB_110_R400_45_400_821104021_64px.png 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 0000000000000000000000000000000000000000..06f0676152f4ba6478f29506af21a675caa01e7e GIT binary patch literal 627 zcmV-(0*w8MP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10su)w zK~z|U?Uui56j2m~zdJuvh$#e@f!l~f?8Ob?96O3DFULw;JAA&WMyVG5Qd%IW>0y}yZ3#(VeWgPs&rCD zM|bZ6bO8X1*y$&+&wx7FNS9EV2c5-`dFsY{{7SXe0HPK56~ew1uKxt`46QxEufA*z zK;V7@*5;`Fi0UQ$>O;ssObpPgK%NFW5xGz3zGkL0lovo$6=q9=B&^RQreP!6M~yzj z*oNu>gx!Grr_U0|S-jv@K7f@fcKS)o;~-RsXuC)x8hDGs2a8K;bCJpy($B@@`cjxjK|SS$cQ?DUXW4}jsOWC~;$FIXrR;7=Qq z(7OqGDq}03G4&v&C|IttMWa}2c;RV~D_JgvsLK?gzhk+|7M(y!p+5$Co$T+rfN&T$ zd{aCCK;)f3xeZt;cM;?$UND(nTFhpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11VBkd zK~#90?V4L?9Ay;8e`hbTsg|NPZ8tL;wpjJCXcc_0#RRpsL@bCBTF`>@LGX%~iijWz zR;=;z;*~yljbIU4LA3f%U)oYzAGDH^+BBWnq)DJc5@VX(?C~L;Iy>3enBB>@w;$}w zIp6o4|NJ@g&G5~Ns#42DObakg-2l@9Oj9?&v;fo84KOXhG<5?^3ouRH0Mi0Y69b?x zl|Uw&FF9Hnr-5-Y@ezib##sAvCTxLWBkEeuqrA-gy5Stq1N5MrK=m+bvo%tc!n_5Y1 z@^O%><}f@4x@7vtVvtpU4agj7O@Mwvlui=q?&4&Z4k`LT#7#B=s}a2cmGz+Ofb0Ha zMh>(KksVmBTU_ztDc*oWoKB>O#X3McfHkv>8V7w1BClgRf0tgw+z7`2KWTdn%2PlG z5HB#Io2YIjkv;}mJ3V1b zFl)fHgb0qc3*pH?Vt`!q4qEz-hg#jd0T*zSkAl7lM19d=BD#U*^e?sQKGyJ0B9Nbov5|}XOU9;svQFW+~ju9_xN}38?Dk!a29OmLy!lVK6cL`?5wR0@HlnN zQX;uVQoUzu(*Pf}bqf@rZh&b4rl}iXT7YTl2ACFLnz{j|1(>F8fN24y`3IIGW^u1) Ro45b~002ovPDHLkV1fh&EDrzx literal 0 HcmV?d00001 diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt index eb41920..7610b30 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":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":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 From 80ea0035e86609c16e52cba63d631ef586a0742b Mon Sep 17 00:00:00 2001 From: Yuelin Wang Date: Fri, 14 Feb 2025 11:23:39 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Familyname=20f=C3=BCr=20B=C3=B6gen=20wurde?= =?UTF-8?q?=20umbenannt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor2DLibrary/SSG/shapes/palettes/c_Boegen_22_5.xml | 2 +- Editor2DLibrary/SSG/shapes/palettes/c_Boegen_90.xml | 2 +- Editor2DLibrary/SSG/shapes/palettes/c_Gerade.xml | 2 +- Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt | 2 +- Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt | 2 +- Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt | 2 +- Editor2DLibrary/SSG/shapes/settings.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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 7610b30..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":true},"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":true},"c_Boegen_22_5":{"expanded":true},"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