seltsamer Merge passiert.
This commit is contained in:
+14
-58
@@ -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="2025-01-22T15:05:00" LanguageVersion="2014.1.3.699" />
|
||||
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-01-22T15:06:49" 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">
|
||||
@@ -15811,11 +15811,8 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true" Oper="OR">
|
||||
<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$FieldAffected="Typ"]]></EXP>
|
||||
<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<COMMENTS Id="RDK:22128742" DesignTimeRemark="Änderung von Winkel und Länge" />
|
||||
<CALLFUNCTION Id="RDK:22128743">
|
||||
@@ -22159,7 +22156,7 @@ me.x
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22571512" VarRef="LängenKreisel">
|
||||
<EXP><![CDATA[$=$LängenGfs+ShapeITem.GefaelleDefinition.L1]]></EXP>
|
||||
<EXP><![CDATA[$=$LängenKreisel+ShapeItem.KreiselDefinition.AbstandMS]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SELECTCASE Id="RDK:22537217">
|
||||
@@ -25521,7 +25518,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</SET>
|
||||
<IFTHENELSE Id="RDK:22246719">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Abs(Shape_Prototype.VarioFoerdererDefinition.H_Anfang - Shape_Prototype.VarioFoerdererDefinition.H_Ende) < 0.01]]></EXP>
|
||||
<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.H_Anfang - Shape_Prototype.VarioFoerdererDefinition.H_Ende < 0.01]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:22246725" SubType="Then">
|
||||
<SET Id="RDK:22304087" VarRef="shape_item.text" Suppressed="True">
|
||||
@@ -25535,68 +25532,25 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:22304080" SubType="Else">
|
||||
<IFTHENELSE Id="RDK:22069264">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.Typ="Auf"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:22069261" SubType="Then">
|
||||
<IFTHENELSE Id="RDK:22597364">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.H_Anfang>Shape_Prototype.VarioFoerdererDefinition.H_Ende]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:22597360" SubType="Then">
|
||||
<SET Id="RDK:22597361" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
|
||||
<EXP><![CDATA[$=$IIF(Shape_Prototype.VarioFoerdererDefinition.LH_fits, "↑", "O")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:22597363" SubType="Else">
|
||||
<SET Id="RDK:22597358" VarRef="Shape_Prototype.text">
|
||||
<EXP><![CDATA[$=$IIF(Shape_Prototype.VarioFoerdererDefinition.LH_fits, "↓", "O")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:22069263" SubType="Else">
|
||||
<IFTHENELSE Id="RDK:22597433">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.H_Anfang>Shape_Prototype.VarioFoerdererDefinition.H_Ende]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:22597430" SubType="Then">
|
||||
<SET Id="RDK:22597429" VarRef="Shape_Prototype.text">
|
||||
<EXP><![CDATA[$=$IIF(Shape_Prototype.VarioFoerdererDefinition.LH_fits, "↓", "O")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:22597432" SubType="Else">
|
||||
<SET Id="RDK:22597431" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
|
||||
<EXP><![CDATA[$=$IIF(Shape_Prototype.VarioFoerdererDefinition.LH_fits, "↑", "O")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
</GROUP>
|
||||
</IFTHENELSE>
|
||||
<IFTHENELSE Id="RDK:22597417" Suppressed="True">
|
||||
<VALUECONDITION Value="true">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.VarioFoerdererDefinition.H_Anfang>Shape_Prototype.VarioFoerdererDefinition.H_Ende]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<GROUP Id="RDK:22597413" SubType="Then">
|
||||
<SET Id="RDK:22597411" VarRef="Shape_Prototype.text">
|
||||
<GROUP Id="RDK:22069261" SubType="Then">
|
||||
<SET Id="RDK:22069260" VarRef="Shape_Prototype.text">
|
||||
<EXP><![CDATA[$=$IIF(Shape_Prototype.VarioFoerdererDefinition.LH_fits, "↓", "O")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22597412" VarRef="Shape_Prototype.VarioFoerdererDefinition.Typ">
|
||||
<SET Id="RDK:22246711" VarRef="Shape_Prototype.VarioFoerdererDefinition.Typ">
|
||||
<EXP><![CDATA[$C$Ab]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:22597416" SubType="Else">
|
||||
<SET Id="RDK:22597414" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
|
||||
<GROUP Id="RDK:22069263" SubType="Else">
|
||||
<SET Id="RDK:22069262" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
|
||||
<EXP><![CDATA[$=$IIF(Shape_Prototype.VarioFoerdererDefinition.LH_fits, "↑", "O")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:22597415" VarRef="Shape_Prototype.VarioFoerdererDefinition.Typ">
|
||||
<SET Id="RDK:22246713" VarRef="Shape_Prototype.VarioFoerdererDefinition.Typ">
|
||||
<EXP><![CDATA[$C$Auf]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
@@ -34289,7 +34243,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
<EXP><![CDATA[$C$True]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Hidden" />
|
||||
<PAR Name="ROnly" />
|
||||
<PAR Name="ROnly">
|
||||
<EXP><![CDATA[$C$True]]></EXP>
|
||||
</PAR>
|
||||
<PAR Name="Disabled" />
|
||||
<PAR Name="Pressed" />
|
||||
<PAR Name="AutoCommit">
|
||||
@@ -36256,4 +36212,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</PROFILES_DATA>
|
||||
<BOM_DATA />
|
||||
</EXTERNAL_DATA>
|
||||
</PROCESS>
|
||||
</PROCESS>
|
||||
Reference in New Issue
Block a user