From 62914aaf389905330e9ee244480a2a03834bb13e Mon Sep 17 00:00:00 2001 From: Yuelin Wang Date: Wed, 23 Oct 2024 15:52:29 +0200 Subject: [PATCH] Die Direktion der CPs bei den Kurven wurden richtig angepasst. --- .../SSG/shapes/palettes/c_Kurven.xml | 2 +- .../SSG/shapes/props/s_Kurve_30_L_F.txt | 1 + .../SSG/shapes/props/s_Kurve_30_R_F.txt | 5 +- .../SSG/shapes/props/s_Kurve_30_R_G.txt | 4 +- .../SSG/shapes/props/s_Kurve_60_L_G.txt | 1 + .../SSG/shapes/props/s_Kurve_60_R_F.txt | 5 +- .../SSG/shapes/props/s_Kurve_60_R_G.txt | 8 +- .../SSG/shapes/props/s_Kurve_90_L_G.txt | 1 + .../SSG/shapes/props/s_Kurve_90_R_F.txt | 4 +- .../SSG/shapes/props/s_Kurve_90_R_G.txt | 5 +- .../SSG/shapes/svg/s_Kurve_30.xml.bak | 11 +++ .../SSG/shapes/svg/s_Kurve_30_L_F.xml | 6 +- .../SSG/shapes/svg/s_Kurve_30_L_G.xml | 6 +- .../SSG/shapes/svg/s_Kurve_30_R_F.xml | 6 +- .../SSG/shapes/svg/s_Kurve_30_R_G.xml | 4 +- .../SSG/shapes/svg/s_Kurve_60.xml.bak | 11 +++ .../SSG/shapes/svg/s_Kurve_60_L_G.xml | 6 +- .../SSG/shapes/svg/s_Kurve_60_R_F.xml | 6 +- .../SSG/shapes/svg/s_Kurve_60_R_G.xml | 4 +- .../SSG/shapes/svg/s_Kurve_90.xml.bak | 11 +++ .../SSG/shapes/svg/s_Kurve_90_L_G.xml | 6 +- .../SSG/shapes/svg/s_Kurve_90_R_F.xml | 6 +- .../SSG/shapes/svg/s_Kurve_90_R_G.xml | 6 +- MAIN_SSG.rdx | 96 +++++-------------- 24 files changed, 104 insertions(+), 117 deletions(-) create mode 100644 Editor2DLibrary/SSG/shapes/svg/s_Kurve_30.xml.bak create mode 100644 Editor2DLibrary/SSG/shapes/svg/s_Kurve_60.xml.bak create mode 100644 Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml.bak diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml index f9ea608..50fd387 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml @@ -2,7 +2,7 @@
90 Kurve links Gefällestrecke
90 Kurve rechts Gefällestrecke
60 Kurve links Gefällestrecke
-
60 Kurve rechts Gefällestrecke
+
60 Kurve rechts Gefällestrecke
30 Kurve links Gefällestrecke
30 Kurve rechts Gefällestrecke
\ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_L_F.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_L_F.txt index 0383385..e2af97c 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_L_F.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_L_F.txt @@ -3,6 +3,7 @@ "name": "30 Kurve links angetrieben", "family": "KurveFoerderer", "icon": "SSG/shapes/img/Kurve_30_L_F_32px.png", + "iconBig": "SSG/shapes/img/Kurve_30_L_F_64px.png", "srcSVG": "SSG/shapes/svg/s_Kurve_30_L_F.xml", "width": 202.5449, "height": 755.9055, diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_F.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_F.txt index 66f5aa9..ac5b866 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_F.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_F.txt @@ -3,6 +3,7 @@ "name": "30 Kurve rechts angetrieben", "family": "KurveFoerderer", "icon": "SSG/shapes/img/Kurve_30_R_F_32px.png", + "iconBig": "SSG/shapes/img/Kurve_30_R_F_64px.png", "srcSVG": "SSG/shapes/svg/s_Kurve_30_R_F.xml", "width": 202.5449, "height": 755.9055, @@ -22,7 +23,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 150.0, + "direction": 330.0, "linkClass": "Gefaellestrecke", "label": "H0", "isDimension": true @@ -41,7 +42,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 180.0, "linkClass": "Gefaellestrecke", "label": "H1", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_G.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_G.txt index 42e4d9d..b2d6861 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_G.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30_R_G.txt @@ -23,7 +23,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 150.0, + "direction": 330.0, "linkClass": "Gefaellestrecke", "label": "H0", "isDimension": true @@ -42,7 +42,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 180.0, "linkClass": "Gefaellestrecke", "label": "H1", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_L_G.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_L_G.txt index 5307330..144ee18 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_L_G.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_L_G.txt @@ -3,6 +3,7 @@ "name": "60 Kurve links Gefällestrecke", "family": "Kurve", "icon": "SSG/shapes/img/Kurve_60_L_G_32px.png", + "iconBig": "SSG/shapes/img/Kurve_60_L_G_64px.png", "srcSVG": "SSG/shapes/svg/s_Kurve_60_L_G.xml", "width": 755.9055, "height": 1309.2661, diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_F.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_F.txt index 8bfb38f..66b09c3 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_F.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_F.txt @@ -3,6 +3,7 @@ "name": "60 Kurve rechts angetrieben", "family": "KurveFoerderer", "icon": "SSG/shapes/img/Kurve_60_R_F_32px.png", + "iconBig": "SSG/shapes/img/Kurve_60_R_F_64px.png", "srcSVG": "SSG/shapes/svg/s_Kurve_60_R_F.xml", "width": 755.9055, "height": 1309.2661, @@ -22,7 +23,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 120.0, + "direction": 300.0, "linkClass": "Gefaellestrecke", "label": "H0", "isDimension": true @@ -41,7 +42,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 180.0, "linkClass": "Gefaellestrecke", "label": "H1", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_G.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_G.txt index 57bcb87..61a63b9 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_G.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60_R_G.txt @@ -2,8 +2,8 @@ "shapeMode": 0, "name": "60 Kurve rechts Gefällestrecke", "family": "Kurve", - "icon": "SSG/shapes/img/Kurve_60_R_32px.png", - "iconBig": "SSG/shapes/img/Kurve_60_R_64px.png", + "icon": "SSG/shapes/img/Kurve_60_R_G_32px.png", + "iconBig": "SSG/shapes/img/Kurve_60_R_G_64px.png", "srcSVG": "SSG/shapes/svg/s_Kurve_60_R_G.xml", "width": 755.9055, "height": 1309.2661, @@ -23,7 +23,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 120.0, + "direction": 300.0, "linkClass": "Gefaellestrecke", "label": "H0", "isDimension": true @@ -42,7 +42,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 180.0, "linkClass": "Gefaellestrecke", "label": "H1", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_L_G.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_L_G.txt index 5c9252f..c6ff3c9 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_L_G.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_L_G.txt @@ -3,6 +3,7 @@ "name": "90 Kurve links Gefällestrecke", "family": "Kurve", "icon": "SSG/shapes/img/Kurve_90_L_G_32px.png", + "iconBig": "SSG/shapes/img/Kurve_90_L_G_64px.png", "srcSVG": "SSG/shapes/svg/s_Kurve_90_L_G.xml", "width": 1511.811, "height": 1511.811, diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_F.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_F.txt index 6c3b08c..e92135d 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_F.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_F.txt @@ -23,7 +23,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 90.0, + "direction": 270.0, "linkClass": "Gefaellestrecke", "label": "H0", "isDimension": true @@ -42,7 +42,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 180.0, "linkClass": "Gefaellestrecke", "label": "H1", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_G.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_G.txt index 1691692..e0fb17f 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_G.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90_R_G.txt @@ -3,6 +3,7 @@ "name": "90 Kurve rechts Gefällestrecke", "family": "Kurve", "icon": "SSG/shapes/img/Kurve_90_R_G_32px.png", + "iconBig": "SSG/shapes/img/Kurve_90_R_G_64px.png", "srcSVG": "SSG/shapes/svg/s_Kurve_90_R_G.xml", "width": 1511.811, "height": 1511.811, @@ -22,7 +23,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 90.0, + "direction": 270.0, "linkClass": "Gefaellestrecke", "label": "H0", "isDimension": true @@ -41,7 +42,7 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 0.0, + "direction": 180.0, "linkClass": "Gefaellestrecke", "label": "H1", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30.xml.bak b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30.xml.bak new file mode 100644 index 0000000..3087455 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30.xml.bak @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_L_F.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_L_F.xml index 7de9532..dbad4df 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_L_F.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_L_F.xml @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_L_G.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_L_G.xml index 537e93b..29c0640 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_L_G.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_L_G.xml @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_R_F.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_R_F.xml index f224041..b482fc3 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_R_F.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_R_F.xml @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_R_G.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_R_G.xml index 8b45141..1ba69c3 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_R_G.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_30_R_G.xml @@ -4,9 +4,9 @@ - + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60.xml.bak b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60.xml.bak new file mode 100644 index 0000000..7672a1d --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60.xml.bak @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_L_G.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_L_G.xml index 14464a1..19952d0 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_L_G.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_L_G.xml @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_R_F.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_R_F.xml index 33a656f..82fa0c8 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_R_F.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_R_F.xml @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_R_G.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_R_G.xml index 77b365f..ba69281 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_R_G.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_60_R_G.xml @@ -4,9 +4,9 @@ - + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml.bak b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml.bak new file mode 100644 index 0000000..f9f0e14 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml.bak @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_L_G.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_L_G.xml index fcec8f4..0ed175c 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_L_G.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_L_G.xml @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_R_F.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_R_F.xml index 10b9fc0..28c9eb8 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_R_F.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_R_F.xml @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_R_G.xml b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_R_G.xml index 1ff8b20..0e108da 100644 --- a/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_R_G.xml +++ b/Editor2DLibrary/SSG/shapes/svg/s_Kurve_90_R_G.xml @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 7e8e1f2..52767e6 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -60,7 +60,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -796,11 +796,11 @@ - + - + @@ -23725,46 +23725,20 @@ ShapeList["id="+Param.Input[1].shapeID].name - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + @@ -23788,46 +23762,20 @@ ShapeList["id="+Param.Input[1].shapeID].name - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + +