Schoenenberger_Systeme_GmbH/SSG-Ruledesigner-Konfigurator
3
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Merge Konflikt bereinigt

Browse Source
This commit is contained in:
Denis Reif
2024-06-26 14:33:14 +02:00
parent e5e805a7c4 1333b08a35
commit e17a8c184e
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAIN_SSG.rdx
+9 -5
View File
@@ -3769,6 +3769,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="GefaelleDefinition">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition]]></EXP>
</PAR>
<PAR Name="StreckeDefinition" />
<PAR Name="FoerdererDefinition" />
<PAR Name="WeicheDefinition" />
<PAR Name="BTMTBeladungDefinition" />
@@ -3788,7 +3789,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="description" />
<PAR Name="x" />
<PAR Name="y" />
<PAR Name="z" />
<PAR Name="z">
<EXP><![CDATA[$=$Shape_Prototype.EckradDefinition.Hoehe]]></EXP>
</PAR>
<PAR Name="width">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
</PAR>
@@ -3834,7 +3837,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="pinned" />
<PAR Name="selected" />
<PAR Name="includeInBOM" />
<PAR Name="StreckeDefinition" />
</SET_STRUCT>
</GROUP>
</CASEGROUP>
@@ -4021,7 +4023,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="description" />
<PAR Name="x" />
<PAR Name="y" />
<PAR Name="z" />
<PAR Name="z">
<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten + (Shape_Prototype.GefaelleDefinition.HoeheOben - Shape_Prototype.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
</PAR>
<PAR Name="width">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
</PAR>
@@ -6732,7 +6736,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:18729636">
<VALUECONDITION Value="true">
<VALUECONDITION Value="true" Oper="OR">
<EXP><![CDATA[$=$-Delta_h/foerdererData.L1=Tan(alpha_s)]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:18729637" SubType="Then">
@@ -23761,4 +23765,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
</PROFILES_DATA>
<BOM_DATA />
</EXTERNAL_DATA>
</PROCESS>
</PROCESS>