Eckrad.asm geändert. FIX in Check_is_defined. Letzte Bedingung war nicht mit verodert. Funktion SetHeight setzt jetzt auch die Z-Koordinate des ShapeItems von Gefällestrecke, Förderer und Eckrad

This commit is contained in:
2024-06-27 17:13:39 +02:00
parent 1333b08a35
commit 3232356a1e
3 changed files with 65 additions and 5 deletions
Binary file not shown.
Binary file not shown.
+65 -5
View File
@@ -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-06-26T12:44:11" LanguageVersion="2014.1.3.674" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-06-27T17:05:03" LanguageVersion="2014.1.3.674" />
<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">
@@ -114,7 +114,7 @@
<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
<FIELD Id="RDK:16577441" Name="Beschreibung" Type="string" />
</TYPE>
<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -128,7 +128,7 @@
<FIELD Id="RDK:1652536" Name="BTMTBeladungDefinition" Type="BTMTBeladungType" />
<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
</TYPE>
<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
@@ -3782,7 +3782,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="x" />
<PAR Name="y" />
<PAR Name="z">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten + (Shape_Prototype.GefaelleDefinition.HoeheOben - Shape_Prototype.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
<EXP><![CDATA[$=$(Shape_Prototype.GefaelleDefinition.HoeheOben + Shape_Prototype.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
</PAR>
<PAR Name="width">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
@@ -6495,6 +6495,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
</SET>
<IFTHENELSE Id="RDK:18729636">
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$alpha_s = 0]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$-Delta_h/foerdererData.L1=Tan(alpha_s)]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:18729637" SubType="Then">
@@ -15838,7 +15841,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheUnten)]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true">
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheUnten = 0]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true">
@@ -16099,6 +16102,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
<VAR Id="RDK:19937383" Name="isDefined" Type="boolean" />
</GROUP>
<SELECTCASE Id="RDK:19595360">
<EXP><![CDATA[$=$shape_item.family]]></EXP>
@@ -16108,6 +16112,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:19929932" VarRef="ShapeList[&quot;id=&quot;+shapeId].z = hoehe">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19595362" CaseType="0">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
@@ -16140,6 +16148,30 @@ ShapeList["id="+Param.Input[1].shapeID].name
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<COMMENTS Id="RDK:19937420" DesignTimeRemark="Höhe des Shapes der Gefällestrecke erst setzen, wenn beide Anschlusspunkte definiert wurden" />
<CALLFUNCTION Id="RDK:19937393">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Check_is_defined]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$isDefined]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<IFTHENELSE Id="RDK:19937405">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:19937402" SubType="Then">
<SET Id="RDK:19937409" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
<EXP><![CDATA[$=$ShapeList["id="+shapeId].GefaelleDefinition.HoeheOben/2 + ShapeList["id="+shapeId].GefaelleDefinition.HoeheUnten/2]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</CASEGROUP>
<CASEGROUP Id="RDK:19595364" CaseType="0">
<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -16174,6 +16206,30 @@ ShapeList["id="+Param.Input[1].shapeID].name
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<COMMENTS Id="RDK:19943506" DesignTimeRemark="Höhe des Shapes des Förderers erst setzen, wenn beide Anschlusspunkte definiert wurden" />
<CALLFUNCTION Id="RDK:19943508">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Check_is_defined]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$isDefined]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
<IFTHENELSE Id="RDK:19943516">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:19943515" SubType="Then">
<SET Id="RDK:19943514" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
<EXP><![CDATA[$=$ShapeList["id="+shapeId].FoerdererDefinition.H_1/2 + ShapeList["id="+shapeId].FoerdererDefinition.H_0/2]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</CASEGROUP>
<CASEGROUP Id="RDK:19595347" CaseType="0">
<EXP><![CDATA[$C$Weiche]]></EXP>
@@ -16186,6 +16242,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
</CASEGROUP>
<CASEGROUP Id="RDK:19595375" CaseType="0">
<EXP><![CDATA[$C$Eckrad]]></EXP>
<SET Id="RDK:19943522" VarRef="ShapeList[&quot;id=&quot;+shapeId].KreiselDefinition.Hoehe">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19595359" CaseType="1">
<EXP />