Iterative Höhenberechnung impl. Diverse Fixes in der Zuordnung der Höhe zu den Connection points
This commit is contained in:
+76
-150
@@ -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="y.wang [ANGEBOT-NB02]" ModDate="2024-10-23T15:47:52" LanguageVersion="2014.1.3.698" />
|
||||
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-10-28T11:46:15" LanguageVersion="2014.1.3.699" />
|
||||
<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">
|
||||
@@ -16481,6 +16481,50 @@ me.x
|
||||
</SET>
|
||||
</VAR>
|
||||
</GROUP>
|
||||
<IFTHENELSE Id="RDK:20819453">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Kurve"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Foerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Gefaellestrecke"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "KurveFoerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:20819491" SubType="Then">
|
||||
<IFTHENELSE Id="RDK:20819415">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Kurve"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Foerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Gefaellestrecke"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "KurveFoerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:20819412" SubType="Then">
|
||||
<CALLFUNCTION Id="RDK:21070867">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$MergeIdsToGroup]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<SET Id="RDK:1578954" VarRef="Shape_Prototype">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
@@ -17338,50 +17382,6 @@ me.x
|
||||
<EXP />
|
||||
</CASEGROUP>
|
||||
</SELECTCASE>
|
||||
<IFTHENELSE Id="RDK:20819453">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Kurve"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Foerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Gefaellestrecke"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "KurveFoerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:20819491" SubType="Then">
|
||||
<IFTHENELSE Id="RDK:20819415">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Kurve"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Foerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Gefaellestrecke"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "KurveFoerderer"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:20819412" SubType="Then">
|
||||
<CALLFUNCTION Id="RDK:21070867">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$MergeIdsToGroup]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="InputExp">
|
||||
<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="ResultRef">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<COMMENTS Id="RDK:21073064" DesignTimeRemark="Berechne die zweite Höhe der Gefällestrecke/Kurve/Förderer, wenn eine Höhe vorgegeben ist" />
|
||||
<IFTHENELSE Id="RDK:21073054" Suppressed="True">
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
@@ -21519,7 +21519,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</VAR>
|
||||
<VAR Id="RDK:19595237" Name="label" Type="string">
|
||||
<SET Id="RDK:19595243" VarRef="Me">
|
||||
<EXP><![CDATA[$=$E$ Param.Input["key=Label"].Str]]></EXP>
|
||||
<EXP><![CDATA[$=$Param.Input["key=Label"].Str]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</VAR>
|
||||
@@ -21622,55 +21622,29 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:19595347" CaseType="0">
|
||||
<EXP><![CDATA[$C$Kurve]]></EXP>
|
||||
<IFTHENELSE Id="RDK:21615573">
|
||||
<IFTHENELSE Id="RDK:21615573" DesignTimeRemark="Hier kommen wir vom Ende der Kurve, bzw. setzen die Höhe des Endes">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$label="cp1"]]></EXP>
|
||||
<EXP><![CDATA[$=$label="cp2"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:21615570" SubType="Then">
|
||||
<SET Id="RDK:21615569" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:21615589">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveDefinition.Richtung="Ab"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:21615586" SubType="Then">
|
||||
<SET Id="RDK:21615585" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:21615588" SubType="Else">
|
||||
<SET Id="RDK:21615587" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<SET Id="RDK:21733729" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:21615572" SubType="Else">
|
||||
<SET Id="RDK:21615571" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Anfang">
|
||||
<SET Id="RDK:21733737" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:21615609">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveDefinition.Richtung="Ab"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:21615606" SubType="Then">
|
||||
<SET Id="RDK:21615605" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:21615608" SubType="Else">
|
||||
<SET Id="RDK:21615607" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<SET Id="RDK:21615571" VarRef="ShapeList["id="+shapeId].KurveDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</CASEGROUP>
|
||||
@@ -21685,46 +21659,20 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
<EXP><![CDATA[$=$hoehe]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:21692390">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveFoerdererDefinition.Richtung="Ab"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:21692387" SubType="Then">
|
||||
<SET Id="RDK:21692386" VarRef="ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe + KurveFoerdererData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:21692389" SubType="Else">
|
||||
<SET Id="RDK:21692388" VarRef="ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe - KurveFoerdererData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<SET Id="RDK:21733741" VarRef="ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:21692398" SubType="Else">
|
||||
<SET Id="RDK:21692392" VarRef="ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:21692397">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveFoerdererDefinition.Richtung="Ab"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:21692394" SubType="Then">
|
||||
<SET Id="RDK:21692393" VarRef="ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe - KurveFoerdererData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:21692396" SubType="Else">
|
||||
<SET Id="RDK:21692395" VarRef="ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe + KurveFoerdererData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<SET Id="RDK:21733743" VarRef="ShapeList["id="+shapeId].KurveFoerdererDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</CASEGROUP>
|
||||
@@ -22139,11 +22087,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
<PAR Name="Options" />
|
||||
</CALLFUNCTION>
|
||||
<COMMENTS Id="RDK:21577169" DesignTimeRemark="gehe durch die Objekte der Strecke bis man auf eine Gefällestrecke oder Förderer trifft." />
|
||||
<SELECTCASE Id="RDK:21554477" Suppressed="True">
|
||||
<SELECTCASE Id="RDK:21554477">
|
||||
<EXP><![CDATA[$=$ShapeList["id="+currentItem].family]]></EXP>
|
||||
<CASEGROUP Id="RDK:21554474" CaseType="0">
|
||||
<EXP><![CDATA[$C$Kurve]]></EXP>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:21789450" CaseType="0">
|
||||
<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
|
||||
</CASEGROUP>
|
||||
<CASEGROUP Id="RDK:21577166" CaseType="1">
|
||||
<EXP />
|
||||
<EXIT_PROCESS Id="RDK:21554475" BreakType="3" ExitStatus="0" />
|
||||
@@ -23484,25 +23435,25 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
<COMMENTS Id="RDK:18827100" DesignTimeRemark="//Kurve hat Index == 0" />
|
||||
<IFTHENELSE Id="RDK:18827233">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
|
||||
<EXP><![CDATA[$=$cpId="cp2"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:18827230" SubType="Then">
|
||||
<SET Id="RDK:19223114" VarRef="item_0.KurveDefinition.H_Anfang">
|
||||
<SET Id="RDK:21704411" VarRef="item_0.KurveDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:21665692" VarRef="item_0.KurveDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
|
||||
<SET Id="RDK:19223114" VarRef="item_0.KurveDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:18827232" SubType="Else">
|
||||
<SET Id="RDK:18827241" VarRef="item_0.KurveDefinition.H_Ende">
|
||||
<SET Id="RDK:21704419" VarRef="item_0.KurveDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:21665714" VarRef="item_0.KurveDefinition.H_Anfang">
|
||||
<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
|
||||
<SET Id="RDK:18827241" VarRef="item_0.KurveDefinition.H_Ende">
|
||||
<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
@@ -23523,31 +23474,6 @@ 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["id="+Param.Input[0].shapeID]">
|
||||
<EXP><![CDATA[$=$item_0]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
|
||||
Reference in New Issue
Block a user