Die CP-Direction für Kurve 30 und 60 korrigiert.

This commit is contained in:
2026-04-23 14:04:52 +02:00
parent b959208ddc
commit 9fa569e449
5 changed files with 43 additions and 47 deletions
@@ -25,7 +25,7 @@
"zMin": "", "zMin": "",
"zMax": "", "zMax": "",
"zStep": "", "zStep": "",
"direction": 300.0, "direction": 330.0,
"linkClass": "Gefaellestrecke", "linkClass": "Gefaellestrecke",
"label": "H0", "label": "H0",
"isDimension": true "isDimension": true
@@ -25,7 +25,7 @@
"zMin": "", "zMin": "",
"zMax": "", "zMax": "",
"zStep": "", "zStep": "",
"direction": 60.0, "direction": 30.0,
"linkClass": "Gefaellestrecke", "linkClass": "Gefaellestrecke",
"label": "H0", "label": "H0",
"isDimension": true "isDimension": true
@@ -25,7 +25,7 @@
"zMin": "", "zMin": "",
"zMax": "", "zMax": "",
"zStep": "", "zStep": "",
"direction": 330.0, "direction": 300.0,
"linkClass": "Gefaellestrecke", "linkClass": "Gefaellestrecke",
"label": "H0", "label": "H0",
"isDimension": true "isDimension": true
@@ -25,7 +25,7 @@
"zMin": "", "zMin": "",
"zMax": "", "zMax": "",
"zStep": "", "zStep": "",
"direction": 30, "direction": 60.0,
"linkClass": "Gefaellestrecke", "linkClass": "Gefaellestrecke",
"label": "H0", "label": "H0",
"isDimension": true "isDimension": true
@@ -44,7 +44,7 @@
"zMin": "", "zMin": "",
"zMax": "", "zMax": "",
"zStep": "", "zStep": "",
"direction": 180, "direction": 180.0,
"linkClass": "Gefaellestrecke", "linkClass": "Gefaellestrecke",
"label": "H1", "label": "H1",
"isDimension": true "isDimension": true
+38 -42
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True"> <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="y.wang [ANGEBOT-NB02]" ModDate="2026-04-10T11:25:22" LanguageVersion="2014.1.3.714" /> <PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2026-04-23T13:50:36" LanguageVersion="2014.1.3.714" />
<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True"> <GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0"> <GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0"> <GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -1185,7 +1185,7 @@
<FIELD Id="RDK:22028926" Name="GruppenteileGefälle" Type="GefälleStreckeMerkmaleType" /> <FIELD Id="RDK:22028926" Name="GruppenteileGefälle" Type="GefälleStreckeMerkmaleType" />
<FIELD Id="RDK:22028928" Name="GruppenteileAngetrieben" Type="AngetriebeneStreckeMerkmaleType" /> <FIELD Id="RDK:22028928" Name="GruppenteileAngetrieben" Type="AngetriebeneStreckeMerkmaleType" />
</TYPE> </TYPE>
<TYPE Id="RDK:22537047" Name="AutomationMerkmaleType" SubType="structure"> <TYPE Id="RDK:22537047" Name="AutomationMerkmaleType" Expanded="True" SubType="structure">
<TYPE_VALUES /> <TYPE_VALUES />
<FIELD Id="RDK:22537043" Name="Anzahl Kreisel" Type="integer" /> <FIELD Id="RDK:22537043" Name="Anzahl Kreisel" Type="integer" />
<FIELD Id="RDK:22537044" Name="Anzahl Kreisel mit Pinband" Type="integer" /> <FIELD Id="RDK:22537044" Name="Anzahl Kreisel mit Pinband" Type="integer" />
@@ -1477,7 +1477,6 @@
<VAR Id="RDK:1007447" Name="Point2DList" Type="Point2D[]" /> <VAR Id="RDK:1007447" Name="Point2DList" Type="Point2D[]" />
<VAR Id="RDK:1007444" Name="Point2D" Type="Point2D" /> <VAR Id="RDK:1007444" Name="Point2D" Type="Point2D" />
<VAR Id="RDK:1519830" Name="SessionZip" Type="string" /> <VAR Id="RDK:1519830" Name="SessionZip" Type="string" />
<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" DesignTimeRemark="Enthält ; separtiert alle Strings, damit die Gruppen beschrieben werden können. a;b;c wäre z.B. eine Gruppe aus den Objekten a, b und c" />
<VAR Id="RDK:22342749" Name="CountKeys" Type="SSGDictInt[]" DesignTimeRemark="Array von Key-Value paaren, um sich die Anzahl von Key in Value zu merken. Dient zum Zählen" /> <VAR Id="RDK:22342749" Name="CountKeys" Type="SSGDictInt[]" DesignTimeRemark="Array von Key-Value paaren, um sich die Anzahl von Key in Value zu merken. Dient zum Zählen" />
<VAR Id="RDK:22938910" Name="KeyValues" Type="SSGDictArr[]" DesignTimeRemark="Array von Key-Value paaren, um sich eine liste von Begriffen zu einem Key zu merken" /> <VAR Id="RDK:22938910" Name="KeyValues" Type="SSGDictArr[]" DesignTimeRemark="Array von Key-Value paaren, um sich eine liste von Begriffen zu einem Key zu merken" />
<VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" DesignTimeRemark="Dropdown Liste aller Bögen im Interface" /> <VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" DesignTimeRemark="Dropdown Liste aller Bögen im Interface" />
@@ -1491,6 +1490,7 @@
<VAR Id="RDK:27189644" Name="RueckgabeListe" Type="string" DesignTimeRemark="Generated by RD" /> <VAR Id="RDK:27189644" Name="RueckgabeListe" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:27260420" Name="ids" Type="string" DesignTimeRemark="Generated by RD" /> <VAR Id="RDK:27260420" Name="ids" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:27352533" Name="links" Type="string" DesignTimeRemark="Generated by RD" /> <VAR Id="RDK:27352533" Name="links" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" DesignTimeRemark="Enthält ; separtiert alle Strings, damit die Gruppen beschrieben werden können. a;b;c wäre z.B. eine Gruppe aus den Objekten a, b und c" />
<VAR Id="RDK:27416207" Name="AnzahlStreckengruppenr" Type="integer" Suppressed="True" DesignTimeRemark="Generated by RD" /> <VAR Id="RDK:27416207" Name="AnzahlStreckengruppenr" Type="integer" Suppressed="True" DesignTimeRemark="Generated by RD" />
</GROUP> </GROUP>
<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet"> <GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
@@ -19197,6 +19197,10 @@ SSGConnectionPoint.x_M
<EXP><![CDATA[$C$angetrieben+gefälle]]></EXP> <EXP><![CDATA[$C$angetrieben+gefälle]]></EXP>
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
</SET> </SET>
<SET Id="RDK:27760427" VarRef="streckenArt">
<EXP><![CDATA[$C$angetrieben+gefälle]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP> </GROUP>
</IFTHENELSE> </IFTHENELSE>
</CASEGROUP> </CASEGROUP>
@@ -19268,6 +19272,12 @@ SSGConnectionPoint.x_M
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
</SET> </SET>
</GROUP> </GROUP>
<GROUP Id="RDK:27727193" SubType="Else">
<SET Id="RDK:27727195" VarRef="streckenArtvorher" DesignTimeRemark="ab jetzt ist es ein Gefälle">
<EXP><![CDATA[$C$gefälle]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE> </IFTHENELSE>
<SET Id="RDK:22029414" VarRef="collectedIds"> <SET Id="RDK:22029414" VarRef="collectedIds">
<EXP><![CDATA[$C$NOTHING]]></EXP> <EXP><![CDATA[$C$NOTHING]]></EXP>
@@ -19281,29 +19291,6 @@ SSGConnectionPoint.x_M
</PAR> </PAR>
<PAR Name="POS_TO_ADD" /> <PAR Name="POS_TO_ADD" />
</LIST_ADD> </LIST_ADD>
<SELECTCASE Id="RDK:27579714" Suppressed="True">
<EXP><![CDATA[$=$shapeItem.family]]></EXP>
<CASEGROUP Id="RDK:27579713" CaseType="0">
<EXP><![CDATA[$C$VarioFoerderer]]></EXP>
<IFTHENELSE Id="RDK:27579712">
<VALUECONDITION Value="false">
<EXP><![CDATA[$=$shapeItem.VarioFoerdererDefinition.BerechnungL_GF]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:27579709" SubType="Then">
<SET Id="RDK:27579708" VarRef="streckenArtvorher">
<EXP><![CDATA[$C$angetrieben]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:27579711" SubType="Else">
<SET Id="RDK:27579710" VarRef="streckenArtvorher">
<EXP><![CDATA[$C$angetrieben+gefälle]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</CASEGROUP>
</SELECTCASE>
</FOREACHLOOP> </FOREACHLOOP>
<GROUP Id="RDK:22029877" Name="Group" SubType="Generic" DesignTimeRemark="Letzte Teilstück der Gruppe bearbeiten mit den gesammelten Ids"> <GROUP Id="RDK:22029877" Name="Group" SubType="Generic" DesignTimeRemark="Letzte Teilstück der Gruppe bearbeiten mit den gesammelten Ids">
<IFTHENELSE Id="RDK:22029788" DesignTimeRemark="wenn eine Gefällestrecke"> <IFTHENELSE Id="RDK:22029788" DesignTimeRemark="wenn eine Gefällestrecke">
@@ -42575,6 +42562,7 @@ me.x
<PAR Name="Dbl" /> <PAR Name="Dbl" />
<PAR Name="Int" /> <PAR Name="Int" />
<PAR Name="Boo" /> <PAR Name="Boo" />
<PAR Name="StrArr2D" />
</SET_STRUCT> </SET_STRUCT>
<SET_STRUCT Id="RDK:19653278" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe"> <SET_STRUCT Id="RDK:19653278" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
<PAR Name="Key"> <PAR Name="Key">
@@ -48977,9 +48965,20 @@ me.x
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
</SET> </SET>
<SET Id="RDK:22537315" VarRef="LängenVarioFörderer"> <SET Id="RDK:22537315" VarRef="LängenVarioFörderer">
<EXP><![CDATA[$=$LängenVarioFörderer+ShapeItem.VarioFoerdererDefinition.L1 / cos(DegToRad(ShapeItem.VarioFoerdererDefinition.winkel)) ]]></EXP> <EXP><![CDATA[$=$LängenVarioFörderer+ShapeItem.VarioFoerdererDefinition.L_VF/ cos(DegToRad(ShapeItem.VarioFoerdererDefinition.winkel)) ]]></EXP>
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
</SET> </SET>
<IFTHENELSE Id="RDK:27726126">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.BerechnungL_GF]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:27726129" SubType="Then">
<SET Id="RDK:27726131" VarRef="LängenGfs">
<EXP><![CDATA[$=$LängenGfs+ShapeItem.VarioFoerdererDefinition.L_GF/ cos(DegToRad(ShapeItem.VarioFoerdererDefinition.winkel)) ]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
<SET Id="RDK:22537323" VarRef="AnzahlSeparatoren"> <SET Id="RDK:22537323" VarRef="AnzahlSeparatoren">
<EXP><![CDATA[$=$AnzahlSeparatoren+ShapeItem.VarioFoerdererDefinition.n_Sep]]></EXP> <EXP><![CDATA[$=$AnzahlSeparatoren+ShapeItem.VarioFoerdererDefinition.n_Sep]]></EXP>
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
@@ -56527,10 +56526,10 @@ me.x
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="TEFUmlenk"]]></EXP> <EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="TEFUmlenk"]]></EXP>
</VALUECONDITION> </VALUECONDITION>
<VALUECONDITION Value="true" Oper="OR"> <VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP> <EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve" And (ShapeList["id="+Param.Input[1].shapeID].KurveDefinition.H_Anfang=0 Or ShapeList["id="+Param.Input[1].shapeID].KurveDefinition.H_Ende=0)]]></EXP>
</VALUECONDITION> </VALUECONDITION>
<VALUECONDITION Value="true"> <VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP> <EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer" And( ShapeList["id="+Param.Input[1].shapeID].KurveFoerdererDefinition.H_Anfang=0 Or ShapeList["id="+Param.Input[1].shapeID].KurveFoerdererDefinition.H_Ende=0)]]></EXP>
</VALUECONDITION> </VALUECONDITION>
<GROUP Id="RDK:26971807" SubType="Then"> <GROUP Id="RDK:26971807" SubType="Then">
<SET_STRUCT Id="RDK:26971825" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe"> <SET_STRUCT Id="RDK:26971825" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
@@ -56613,10 +56612,13 @@ me.x
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFWeiche"]]></EXP> <EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFWeiche"]]></EXP>
</VALUECONDITION> </VALUECONDITION>
<VALUECONDITION Value="true" Oper="OR"> <VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP> <EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve" And (ShapeList["id="+Param.Input[1].shapeID].KurveDefinition.H_Anfang=0 Or ShapeList["id="+Param.Input[1].shapeID].KurveDefinition.H_Ende=0)]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="TEFUmlenk"]]></EXP>
</VALUECONDITION> </VALUECONDITION>
<VALUECONDITION Value="true"> <VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP> <EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer" And (ShapeList["id="+Param.Input[1].shapeID].KurveFoerdererDefinition.H_Anfang=0 Or ShapeList["id="+Param.Input[1].shapeID].KurveFoerdererDefinition.H_Ende=0)]]></EXP>
</VALUECONDITION> </VALUECONDITION>
<GROUP Id="RDK:27016656" SubType="Then"> <GROUP Id="RDK:27016656" SubType="Then">
<SET_STRUCT Id="RDK:27016665" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeSetHeight"> <SET_STRUCT Id="RDK:27016665" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeSetHeight">
@@ -56793,11 +56795,11 @@ me.x
<EXP><![CDATA[$=$h1]]></EXP> <EXP><![CDATA[$=$h1]]></EXP>
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
</SET> </SET>
<SET Id="RDK:27704334" VarRef="item.GefaelleDefinition.FesteH1"> <SET Id="RDK:27704334" VarRef="item.GefaelleDefinition.FesteH1" Suppressed="True">
<EXP><![CDATA[$=$True]]></EXP> <EXP><![CDATA[$=$True]]></EXP>
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
</SET> </SET>
<ACTION_CALL Id="RDK:27726119" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only "> <ACTION_CALL Id="RDK:27726119" Name="RDEngineering_ModernUIControl" Suppressed="True" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only ">
<PAR Name="RDLibraryName"> <PAR Name="RDLibraryName">
<EXP><![CDATA[$C$RDEngineering_UI]]></EXP> <EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
</PAR> </PAR>
@@ -56865,11 +56867,11 @@ me.x
<EXP><![CDATA[$=$h2]]></EXP> <EXP><![CDATA[$=$h2]]></EXP>
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
</SET> </SET>
<SET Id="RDK:27704336" VarRef="item.GefaelleDefinition.FesteH0"> <SET Id="RDK:27704336" VarRef="item.GefaelleDefinition.FesteH0" Suppressed="True">
<EXP><![CDATA[$=$True]]></EXP> <EXP><![CDATA[$=$True]]></EXP>
<PAR Name="AdvancedOptions" /> <PAR Name="AdvancedOptions" />
</SET> </SET>
<ACTION_CALL Id="RDK:27726121" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only &#xD;&#xA;"> <ACTION_CALL Id="RDK:27726121" Name="RDEngineering_ModernUIControl" Suppressed="True" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only &#xD;&#xA;">
<PAR Name="RDLibraryName"> <PAR Name="RDLibraryName">
<EXP><![CDATA[$C$RDEngineering_UI]]></EXP> <EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
</PAR> </PAR>
@@ -69496,13 +69498,7 @@ me.x
<EXP><![CDATA[$C$1]]></EXP> <EXP><![CDATA[$C$1]]></EXP>
</PAR> </PAR>
<PAR Name="n_Scan"> <PAR Name="n_Scan">
<EXP><![CDATA[$C$1]]></EXP> <EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="hat_Motor">
<EXP><![CDATA[$C$True]]></EXP>
</PAR>
<PAR Name="hat_Umlenk">
<EXP><![CDATA[$C$True]]></EXP>
</PAR> </PAR>
<PAR Name="anKreisel_Anfang"> <PAR Name="anKreisel_Anfang">
<EXP><![CDATA[$C$False]]></EXP> <EXP><![CDATA[$C$False]]></EXP>