Merge branch 'main' of http://gitea.schoenenberger.de/mistangl/SSG-Ruledesigner-Konfigurator

Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml

@@ -2,7 +2,7 @@
 <div class="paletteItem"><div><img id="s_Kurve_90_L_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_L_G_32px.png" /></div><div>90 Kurve links Gefällestrecke</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_90_R_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_R_G_32px.png" /></div><div>90 Kurve rechts Gefällestrecke</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_60_L_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_L_G_32px.png" /></div><div>60 Kurve links Gefällestrecke</div></div>
-<div class="paletteItem"><div><img id="s_Kurve_60_R_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_R_32px.png" /></div><div>60 Kurve rechts Gefällestrecke</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_60_R_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_R_G_32px.png" /></div><div>60 Kurve rechts Gefällestrecke</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_30_L_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_L_G_32px.png" /></div><div>30 Kurve links Gefällestrecke</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_30_R_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_R_G_32px.png" /></div><div>30 Kurve rechts Gefällestrecke</div></div>
 </palette>

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,

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,

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,

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,

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",
+  "icon": "SSG/shapes/img/Kurve_60_R_G_32px.png",
-  "iconBig": "SSG/shapes/img/Kurve_60_R_64px.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,

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,

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,

Editor2DLibrary/SSG/shapes/svg/s_Kurve_30.xml.bak

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="rotate(0)">
+    <svg viewBox="0 0 71.760929 264.58335" preserveAspectRatio="none" position="absolute" overflow="visible">
+      <defs />
+      <g inkscape:label="Ebene 1" inkscape:groupmode="layer" transform="translate(5.0067902e-6,-1.0851037e-5)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
+        <path style="opacity:0.94;fill:none;stroke:#00ff00;stroke-miterlimit:50;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" sodipodi:type="arc" sodipodi:cx="529.16675" sodipodi:cy="264.58334" sodipodi:rx="528.66675" sodipodi:ry="528.66669" sodipodi:start="3.1415927" sodipodi:end="3.6651914" sodipodi:arc-type="arc" d="M 0.5,264.58334 A 528.66675,528.66669 0 0 1 71.327906,0.25001336" sodipodi:open="true" stroke-width="1px" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" />
+      </g>
+    </svg>
+  </g>
+</svg>

Editor2DLibrary/SSG/shapes/svg/s_Kurve_60.xml.bak

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="rotate(0)">
+    <svg viewBox="0 0 153.25734 264.58335" preserveAspectRatio="none" position="absolute" overflow="visible">
+      <defs />
+      <g inkscape:label="Ebene 1" inkscape:groupmode="layer" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
+        <path style="opacity:0.94;fill:none;stroke:#00ff00;stroke-miterlimit:50;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" sodipodi:type="arc" sodipodi:cx="305.51468" sodipodi:cy="264.58334" sodipodi:rx="305.01468" sodipodi:ry="305.01453" sodipodi:start="3.1415927" sodipodi:end="4.1887902" sodipodi:arc-type="arc" d="M 0.5,264.58334 A 305.01468,305.01453 0 0 1 153.00734,0.43301588" sodipodi:open="true" inkscape:export-filename="Kurve_30.svg" inkscape:export-xdpi="96" inkscape:export-ydpi="96" stroke-width="1px" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" />
+      </g>
+    </svg>
+  </g>
+</svg>

Editor2DLibrary/SSG/shapes/svg/s_Kurve_90.xml.bak

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="rotate(0)">
+    <svg viewBox="0 0 264.58333 264.58333" preserveAspectRatio="none" position="absolute" overflow="visible">
+      <defs />
+      <g inkscape:label="Ebene 1" inkscape:groupmode="layer" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
+        <path style="opacity:0.94;fill:none;stroke-linecap:butt;stroke-miterlimit:50;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" sodipodi:type="arc" sodipodi:cx="264.41379" sodipodi:cy="264.41379" sodipodi:rx="264.08334" sodipodi:ry="264.08334" sodipodi:start="3.1415927" sodipodi:end="4.712389" sodipodi:arc-type="arc" d="M 0.33044434,264.41379 A 264.08334,264.08334 0 0 1 264.41379,0.33044434" sodipodi:open="true" stroke-width="1px" stroke="#ffa700" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" />
+      </g>
+    </svg>
+  </g>
+</svg>

MAIN_SSG.rdx

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-10-23T13:57:19" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-10-23T15:47:52" LanguageVersion="2014.1.3.698" />
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -85,7 +85,7 @@
 					<FIELD Id="RDK:18732250" Name="Delta_h" Type="double" DesignTimeRemark="Höhendifferenz" />
 					<FIELD Id="RDK:21700894" Name="isOk" Type="boolean" DesignTimeRemark="True beide Punkte angebunden sind und die Höhen der Nachbarn passen" />
 				</TYPE>
-				<TYPE Id="RDK:21686352" Name="KurveFoerdererType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:21686352" Name="KurveFoerdererType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:21686345" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:21686346" Name="L1" Type="double" />
@@ -795,11 +795,11 @@
 					<FIELD Id="RDK:903600" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:1674242" Name="Anzahl der Scanner" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18732296" Name="KurveMerkmaleType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18732296" Name="KurveMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18732294" Name="Länge in Meter" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:21693243" Name="KurveFoerdererMerkmaleType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:21693243" Name="KurveFoerdererMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:21693241" Name="Länge in Meter" Type="string" />
 				</TYPE>
@@ -23491,7 +23491,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:21704411" VarRef="item_0.KurveDefinition.H_Ende">
+								<SET Id="RDK:21665692" VarRef="item_0.KurveDefinition.H_Ende">
 									<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -23501,7 +23501,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:21704419" VarRef="item_0.KurveDefinition.H_Anfang">
+								<SET Id="RDK:21665714" VarRef="item_0.KurveDefinition.H_Anfang">
 									<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -23523,6 +23523,31 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$hoehe]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<IFTHENELSE Id="RDK:21692494">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:21692486" SubType="Then">
+								<SET Id="RDK:21692480" VarRef="item_0.KurveFoerdererDefinition.H_Anfang">
+									<EXP><![CDATA[$=$hoehe]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:21692481" VarRef="item_0.KurveFoerdererDefinition.H_Ende">
+									<EXP><![CDATA[$=$hoehe]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:21692493" SubType="Else">
+								<SET Id="RDK:21692487" VarRef="item_0.KurveFoerdererDefinition.H_Ende">
+									<EXP><![CDATA[$=$hoehe]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:21692490" VarRef="item_0.KurveFoerdererDefinition.H_Anfang">
+									<EXP><![CDATA[$=$hoehe]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
 						<SET Id="RDK:21692495" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID]">
 							<EXP><![CDATA[$=$item_0]]></EXP>
 							<PAR Name="AdvancedOptions" />