lokaler Merge der Datumszeile

This commit is contained in:
2025-01-23 16:02:44 +01:00
+115 -42
View File
@@ -25386,26 +25386,70 @@ ShapeList["id="+Param.Input[1].shapeID].name
</SET>
</GROUP>
<GROUP Id="RDK:20658809" SubType="Else">
<SET Id="RDK:20572216" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
<EXP><![CDATA[$=$winkel_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20590479" VarRef="H_th">
<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:19879521" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20636495" VarRef="L_th">
<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20646626" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
<EXP><![CDATA[$=$L_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:22586313">
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben > 0 and Shape_Prototype.GefaelleDefinition.HoeheUnten = 0 ]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten > 0 and Shape_Prototype.GefaelleDefinition.HoeheOben = 0 ]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:22586346" SubType="Then">
<SET Id="RDK:20572216" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22586361" VarRef="H_th">
<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22589618" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:22622938">
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben > 0 and Shape_Prototype.GefaelleDefinition.HoeheUnten = 0 ]]></EXP>
</VALUECONDITION>
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten > 0 and Shape_Prototype.GefaelleDefinition.HoeheOben = 0 ]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:22622945" SubType="Then">
<SET Id="RDK:22622948" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben-H_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:22622946" SubType="Else">
<SET Id="RDK:22622950" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-H_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</GROUP>
<GROUP Id="RDK:22586350" SubType="Else">
<SET Id="RDK:22586341" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
<EXP><![CDATA[$=$winkel_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20590479" VarRef="H_th">
<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:19879521" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20636495" VarRef="L_th">
<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20646626" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
<EXP><![CDATA[$=$L_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</GROUP>
</IFTHENELSE>
</GROUP>
@@ -25519,26 +25563,55 @@ ShapeList["id="+Param.Input[1].shapeID].name
</SET>
</GROUP>
<GROUP Id="RDK:22069251" SubType="Else">
<SET Id="RDK:22069246" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel_th">
<EXP><![CDATA[$=$winkel_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069247" VarRef="H_th">
<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.VarioFoerdererDefinition.L1*Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069248" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel">
<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069249" VarRef="L_th">
<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.VarioFoerdererDefinition.H_Anfang-Shape_Prototype.VarioFoerdererDefinition.H_Ende)/Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069250" VarRef="Shape_Prototype.VarioFoerdererDefinition.L_th">
<EXP><![CDATA[$=$L_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:22646514">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.H_Anfang >0 and Shape_Prototype.VarioFoerdererDefinition.H_Ende>0]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:22646535" SubType="Then">
<SET Id="RDK:22646533" VarRef="H_th">
<EXP><![CDATA[$=$Abs(Shape_Prototype.VarioFoerdererDefinition.H_Anfang - Shape_Prototype.VarioFoerdererDefinition.H_Ende)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22646540" VarRef="winkel_th">
<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(Shape_Prototype.VarioFoerdererDefinition.H_Anfang-Shape_Prototype.VarioFoerdererDefinition.H_Ende)/Shape_Prototype.VarioFoerdererDefinition.L1)),1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22646542" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel_th">
<EXP><![CDATA[$=$winkel_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22646544" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel">
<EXP><![CDATA[$=$Ceiling(Shape_Prototype.VarioFoerdererDefinition.winkel_th)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22646546" VarRef="Shape_Prototype.VarioFoerdererDefinition.L_th">
<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.L1]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:22646536" SubType="Else">
<SET Id="RDK:22069246" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel_th">
<EXP><![CDATA[$=$winkel_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069247" VarRef="H_th">
<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.VarioFoerdererDefinition.L1*Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069248" VarRef="Shape_Prototype.VarioFoerdererDefinition.winkel">
<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069249" VarRef="L_th">
<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.VarioFoerdererDefinition.H_Anfang-Shape_Prototype.VarioFoerdererDefinition.H_Ende)/Tan(DegToRad(Shape_Prototype.VarioFoerdererDefinition.winkel_th)),0))]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069250" VarRef="Shape_Prototype.VarioFoerdererDefinition.L_th">
<EXP><![CDATA[$=$L_th]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
</GROUP>
</IFTHENELSE>
</GROUP>
@@ -25558,7 +25631,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:22069259" VarRef="Shape_Prototype.VarioFoerdererDefinition.LH_fits">
<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.VarioFoerdererDefinition.L1-L_th)<Shape_Prototype.VarioFoerdererDefinition.LH_toleranz,True,False)]]></EXP>
<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.VarioFoerdererDefinition.L1-Shape_Prototype.VarioFoerdererDefinition.L_th)<Shape_Prototype.VarioFoerdererDefinition.LH_toleranz,True,False)]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:22246719">
@@ -36491,4 +36564,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
</PROFILES_DATA>
<BOM_DATA />
</EXTERNAL_DATA>
</PROCESS>
</PROCESS>