From 04a8fe59acbd74ae14035407b33058bcaf49e662 Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Mon, 29 Apr 2024 13:37:33 +0200
Subject: [PATCH] =?UTF-8?q?Bugfix=20zum=20setzen=20der=20H=C3=B6he=20beim?=
 =?UTF-8?q?=20Verbinden=20eines=20F=C3=B6rderers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 42 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 26a4dc5..bded9b7 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,10 +1,10 @@
 <?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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-04-26T12:17:02" LanguageVersion="2014.1.3.635" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-04-29T11:59:48" LanguageVersion="2014.1.3.635" />
 	<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">
-				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:609117" Name="id" Type="string" />
 					<FIELD Id="RDK:313462" Name="x_M" Type="double" />
@@ -50,7 +50,7 @@
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -819,7 +819,7 @@
 					<FIELD Id="RDK:18753213" Name="Abstand (Kreiselachse A - Kreiselachse) in mm" Type="double" />
 					<FIELD Id="RDK:18753217" Name="Höhe in mm" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:18753223" Name="GefaellestreckeSEExportType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18753223" Name="GefaellestreckeSEExportType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18753221" Name="Länge in mm" Type="double" />
 					<FIELD Id="RDK:18753228" Name="Alpha_Strecke" Type="double" />
@@ -871,7 +871,7 @@
 				<FIELD Id="RDK:1007739" Name="Withdraw_Start" Type="double" />
 				<FIELD Id="RDK:1007740" Name="Withdraw_End" Type="double" />
 			</TYPE>
-			<TYPE Id="RDK:1345483" Name="InheritHeightType" Expanded="True" SubType="structure" DesignTimeNotes="20231005 -1-">
+			<TYPE Id="RDK:1345483" Name="InheritHeightType" SubType="structure" DesignTimeNotes="20231005 -1-">
 				<TYPE_VALUES />
 				<FIELD Id="RDK:1345484" Name="ParentIndex" Type="integer" />
 				<FIELD Id="RDK:1345485" Name="NewHoehe" Type="double" />
@@ -1043,6 +1043,8 @@
 			<VAR Id="RDK:18295767" Name="L_s" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:18777657" Name="HoeheOben" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:18777660" Name="HoeheUnten" Type="string" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:18825603" Name="cpId" Type="string" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:18826988" Name="shapeID" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -6446,14 +6448,14 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<GROUP Id="RDK:18635399" SubType="Then">
 									<COMMENTS Id="RDK:18769999" DesignTimeRemark="Süd -&gt; Nord" />
 									<SET Id="RDK:18635398" VarRef="Shape_Prototype.text">
-										<EXP><![CDATA[$C$⇞]]></EXP>
+										<EXP><![CDATA[$C$⇟]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
 								<GROUP Id="RDK:18635403" SubType="Else">
 									<COMMENTS Id="RDK:18769995" DesignTimeRemark="Nord -&gt; Süd" />
 									<SET Id="RDK:18635402" VarRef="Shape_Prototype.text">
-										<EXP><![CDATA[$C$⇟]]></EXP>
+										<EXP><![CDATA[$C$⇞]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
@@ -11788,7 +11790,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<EXEC_ON_VALUES Id="RDK:607193" VarRef="SSGConnectionPointList" ExecMode="1" FilterExp="Not IsTagInString(me.id, &quot;defcp&quot;)" AppendTo="Shape_Prototype.KreiselDefinition.M_Strecke" DesignTimeNotes="me.linkClass=&quot;Gefaellestrecke&quot;">
-											<PAR Name="id" />
 											<PAR Name="x_M">
 												<EXP><![CDATA[$=$Call("BOXpx2mm", NewListDbl(
 ' Param 1 Gesamtlänge in mm
@@ -11798,14 +11799,6 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
-											<PAR Name="x_S" />
-											<PAR Name="x" />
-											<PAR Name="y" />
-											<PAR Name="z" />
-											<PAR Name="direction" />
-											<PAR Name="linkClass" />
-											<PAR Name="label" />
-											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 									<GROUP Id="RDK:607197" Name="Spannstation" SubType="Generic">
@@ -11823,15 +11816,6 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
-											<PAR Name="id" />
-											<PAR Name="x_M" />
-											<PAR Name="x" />
-											<PAR Name="y" />
-											<PAR Name="z" />
-											<PAR Name="direction" />
-											<PAR Name="linkClass" />
-											<PAR Name="label" />
-											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 								</GROUP>
@@ -14977,15 +14961,15 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:18741926" CaseType="0">
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
 						<SET Id="RDK:18741963" VarRef="hoehe_oben">
-							<EXP><![CDATA[$=$item.FoerdererDefinition.HoeheOben]]></EXP>
+							<EXP><![CDATA[$=$item.FoerdererDefinition.H_1]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18741965" VarRef="hoehe_unten">
-							<EXP><![CDATA[$=$item.FoerdererDefinition.HoeheUnten]]></EXP>
+							<EXP><![CDATA[$=$item.FoerdererDefinition.H_0]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18753165" VarRef="hoehe">
-							<EXP><![CDATA[$=$IIF(hoehe_oben<0.001, float(hoehe_unten), float(hoehe_oben))]]></EXP>
+							<EXP><![CDATA[$=$IIF(hoehe_oben<0.001, StrToDbl(hoehe_unten), StrToDbl(hoehe_oben))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</CASEGROUP>
@@ -20517,4 +20501,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
+</PROCESS>
\ No newline at end of file