Berechnung des Förderers nun auch korrekt wenn HöheOben<HöheUnten
This commit is contained in:
+6
-14
@@ -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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-03-04T12:45:33" LanguageVersion="2014.1.3.627" />
|
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-03-05T10:22:13" LanguageVersion="2014.1.3.627" />
|
||||||
<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">
|
||||||
@@ -5771,11 +5771,11 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
|||||||
<PAR Name="AdvancedOptions" />
|
<PAR Name="AdvancedOptions" />
|
||||||
</SET>
|
</SET>
|
||||||
<SET Id="RDK:18150250" VarRef="HoeheOben">
|
<SET Id="RDK:18150250" VarRef="HoeheOben">
|
||||||
<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.HoeheOben]]></EXP>
|
<EXP><![CDATA[$=$IIF(Shape_Prototype.FoerdererDefinition.HoeheOben>Shape_Prototype.FoerdererDefinition.HoeheUnten,Shape_Prototype.FoerdererDefinition.HoeheOben,Shape_Prototype.FoerdererDefinition.HoeheUnten)]]></EXP>
|
||||||
<PAR Name="AdvancedOptions" />
|
<PAR Name="AdvancedOptions" />
|
||||||
</SET>
|
</SET>
|
||||||
<SET Id="RDK:18150252" VarRef="HoeheUnten">
|
<SET Id="RDK:18150252" VarRef="HoeheUnten">
|
||||||
<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.HoeheUnten]]></EXP>
|
<EXP><![CDATA[$=$IIF(Shape_Prototype.FoerdererDefinition.HoeheOben>Shape_Prototype.FoerdererDefinition.HoeheUnten,Shape_Prototype.FoerdererDefinition.HoeheUnten,Shape_Prototype.FoerdererDefinition.HoeheOben)]]></EXP>
|
||||||
<PAR Name="AdvancedOptions" />
|
<PAR Name="AdvancedOptions" />
|
||||||
</SET>
|
</SET>
|
||||||
<IFTHENELSE Id="RDK:18152129">
|
<IFTHENELSE Id="RDK:18152129">
|
||||||
@@ -6417,11 +6417,11 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
|||||||
<PAR Name="AdvancedOptions" />
|
<PAR Name="AdvancedOptions" />
|
||||||
</SET>
|
</SET>
|
||||||
<SET Id="RDK:18462334" VarRef="HoeheOben">
|
<SET Id="RDK:18462334" VarRef="HoeheOben">
|
||||||
<EXP><![CDATA[$=$shape_item.FoerdererDefinition.HoeheOben]]></EXP>
|
<EXP><![CDATA[$=$IIF(shape_item.FoerdererDefinition.HoeheOben>shape_item.FoerdererDefinition.HoeheUnten,shape_item.FoerdererDefinition.HoeheOben,shape_item.FoerdererDefinition.HoeheUnten)]]></EXP>
|
||||||
<PAR Name="AdvancedOptions" />
|
<PAR Name="AdvancedOptions" />
|
||||||
</SET>
|
</SET>
|
||||||
<SET Id="RDK:18462335" VarRef="HoeheUnten">
|
<SET Id="RDK:18462335" VarRef="HoeheUnten">
|
||||||
<EXP><![CDATA[$=$shape_item.FoerdererDefinition.HoeheUnten]]></EXP>
|
<EXP><![CDATA[$=$IIF(shape_item.FoerdererDefinition.HoeheOben>shape_item.FoerdererDefinition.HoeheUnten,shape_item.FoerdererDefinition.HoeheUnten,shape_item.FoerdererDefinition.HoeheOben)]]></EXP>
|
||||||
<PAR Name="AdvancedOptions" />
|
<PAR Name="AdvancedOptions" />
|
||||||
</SET>
|
</SET>
|
||||||
<IFTHENELSE Id="RDK:18462338">
|
<IFTHENELSE Id="RDK:18462338">
|
||||||
@@ -7599,6 +7599,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
|
|||||||
<PAR Name="AdvancedOptions" />
|
<PAR Name="AdvancedOptions" />
|
||||||
</SET>
|
</SET>
|
||||||
</VAR>
|
</VAR>
|
||||||
|
<VAR Id="RDK:18584629" Name="LinkedGefaelleShapeIDs" Type="string" />
|
||||||
</GROUP>
|
</GROUP>
|
||||||
<CALLFUNCTION Id="RDK:618287">
|
<CALLFUNCTION Id="RDK:618287">
|
||||||
<PAR Name="FuncName">
|
<PAR Name="FuncName">
|
||||||
@@ -7770,15 +7771,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
|
|||||||
<PAR Name="aktiv">
|
<PAR Name="aktiv">
|
||||||
<EXP><![CDATA[$=$IIF(me.x_M<=(Shape_Prototype.KreiselDefinition.AbstandMS-Shape_Prototype.KreiselDefinition.d_min),TRUE,FALSE)]]></EXP>
|
<EXP><![CDATA[$=$IIF(me.x_M<=(Shape_Prototype.KreiselDefinition.AbstandMS-Shape_Prototype.KreiselDefinition.d_min),TRUE,FALSE)]]></EXP>
|
||||||
</PAR>
|
</PAR>
|
||||||
<PAR Name="id" />
|
|
||||||
<PAR Name="x_M" />
|
|
||||||
<PAR Name="x_S" />
|
|
||||||
<PAR Name="x" />
|
|
||||||
<PAR Name="y" />
|
|
||||||
<PAR Name="z" />
|
|
||||||
<PAR Name="direction" />
|
|
||||||
<PAR Name="linkClass" />
|
|
||||||
<PAR Name="label" />
|
|
||||||
</EXEC_ON_VALUES>
|
</EXEC_ON_VALUES>
|
||||||
<EXEC_ON_VALUES Id="RDK:812298" VarRef="Shape_Prototype.KreiselDefinition.S_Strecke">
|
<EXEC_ON_VALUES Id="RDK:812298" VarRef="Shape_Prototype.KreiselDefinition.S_Strecke">
|
||||||
<PAR Name="aktiv">
|
<PAR Name="aktiv">
|
||||||
|
|||||||
Reference in New Issue
Block a user