Merge Branches
This commit is contained in:
Simon Schmutzler
+29
-13
@@ -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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-07-16T11:10:29" LanguageVersion="2014.1.3.680" />
|
||||
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-07-10T16:39:43" LanguageVersion="2014.1.3.680" />
|
||||
<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">
|
||||
@@ -995,6 +995,7 @@
|
||||
<VAR Id="RDK:20579085" Name="shapeList_idx_0" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:20579088" Name="shape_index" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:20647980" Name="ID" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
<VAR Id="RDK:20689919" Name="shape_item" Type="string" DesignTimeRemark="Generated by RD" />
|
||||
</GROUP>
|
||||
<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
|
||||
<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
|
||||
@@ -10043,15 +10044,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
|
||||
<EXP><![CDATA[$=$FieldAffected="AbstandMS"]]></EXP>
|
||||
</VALUECONDITION>
|
||||
<EXEC_ON_VALUES Id="RDK:812296" VarRef="Shape_Prototype.KreiselDefinition.M_Strecke">
|
||||
<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" />
|
||||
<PAR Name="aktiv">
|
||||
<EXP><![CDATA[$=$IIF(me.x_M<=(Shape_Prototype.KreiselDefinition.AbstandMS-Shape_Prototype.KreiselDefinition.d_min),TRUE,FALSE)]]></EXP>
|
||||
</PAR>
|
||||
@@ -15592,7 +15584,6 @@ me.x
|
||||
</FUNCTION>
|
||||
<FUNCTION Id="RDK:20579036" Name="doPattern" DesignTimeRemark="erzeugt ein Muster dieser Gefällestrecke / Förderers an den verbundenen Kreise(ln)" InputTypeName="string[]">
|
||||
<GROUP Id="RDK:20579050" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:20579045" Name="shapeItem" Type="Editor2DShapeType" />
|
||||
<VAR Id="RDK:20579046" Name="selectedIds" Type="string[]">
|
||||
<SET Id="RDK:20579047" VarRef="me">
|
||||
<EXP><![CDATA[$=$Param.Input]]></EXP>
|
||||
@@ -15600,7 +15591,6 @@ me.x
|
||||
</SET>
|
||||
</VAR>
|
||||
<VAR Id="RDK:20579049" Name="shapeId" Type="string" />
|
||||
<VAR Id="RDK:20579090" Name="shape_index" Type="string" />
|
||||
</GROUP>
|
||||
<FOREACHLOOP Id="RDK:20579072" ItemVarRef="shapeId">
|
||||
<PAR Name="ArrayValueExp">
|
||||
@@ -15609,6 +15599,13 @@ me.x
|
||||
<PAR Name="ExitCondExp">
|
||||
<EXP><![CDATA[$V$]]></EXP>
|
||||
</PAR>
|
||||
<GROUP Id="RDK:20689948" Name="Local Variables" SubType="VarSet" IncludeDate="0">
|
||||
<VAR Id="RDK:20689950" Name="shape_index" Type="string" />
|
||||
<VAR Id="RDK:20689944" Name="shapeId_kreisel1" Type="string" />
|
||||
<VAR Id="RDK:20689945" Name="shapeId_kreisel2" Type="string" />
|
||||
<VAR Id="RDK:20689946" Name="shape_kreisel1" Type="Editor2DShapeType" />
|
||||
<VAR Id="RDK:20689947" Name="shape_kreisel2" Type="Editor2DShapeType" />
|
||||
</GROUP>
|
||||
<CALLFUNCTION Id="RDK:20579087">
|
||||
<PAR Name="FuncName">
|
||||
<EXP><![CDATA[$C$IndexOfByFieldValue_SSG]]></EXP>
|
||||
@@ -15625,6 +15622,25 @@ me.x
|
||||
<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<COMMENTS Id="RDK:20689223" DesignTimeRemark="hole beide angebundenen Kreisel " DesignTimeNotes="Process Name:
MAIN_SSG.rdx

Process Requires:


Author:


Creation Date:


Functionality:

Changes:
20231005 -1- \DVR
ERK-47
Höhenänderung Gefällestrecke (Pufferstrecke)


20230928 -1- \DVR
ERK-47
Höhenänderung Kreisel" />
|
||||
<SET Id="RDK:20689231" VarRef="shapeId_kreisel1">
|
||||
<EXP><![CDATA[$=$StrAfter(ShapeList[shape_index].links[0], ";")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20689233" VarRef="shapeId_kreisel2">
|
||||
<EXP><![CDATA[$=$StrAfter(ShapeList[shape_index].links[1], ";")]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20689918" VarRef="shape_kreisel1">
|
||||
<EXP><![CDATA[$=$ShapeList["id=" shapeId_kreisel1]]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<SET Id="RDK:20689928" VarRef="shape_kreisel2">
|
||||
<EXP><![CDATA[$=$ShapeList["id=" shapeId_kreisel2]]]></EXP>
|
||||
<PAR Name="AdvancedOptions" />
|
||||
</SET>
|
||||
<COMMENTS Id="RDK:20689952" DesignTimeRemark="daraus die Connection points der Verbindenden Strecke" DesignTimeNotes="Process Name:
MAIN_SSG.rdx

Process Requires:


Author:


Creation Date:


Functionality:

Changes:
20231005 -1- \DVR
ERK-47
Höhenänderung Gefällestrecke (Pufferstrecke)


20230928 -1- \DVR
ERK-47
Höhenänderung Kreisel" />
|
||||
<COMMENTS Id="RDK:20689954" DesignTimeRemark="Prüfe ob die Distanzen und hole die Connection points die gegenüberliegen" DesignTimeNotes="Process Name:
MAIN_SSG.rdx

Process Requires:


Author:


Creation Date:


Functionality:

Changes:
20231005 -1- \DVR
ERK-47
Höhenänderung Gefällestrecke (Pufferstrecke)


20230928 -1- \DVR
ERK-47
Höhenänderung Kreisel" />
|
||||
<SELECTCASE Id="RDK:20579308">
|
||||
<EXP><![CDATA[$=$Shape_Prototype.family]]></EXP>
|
||||
<CASEGROUP Id="RDK:20579229" CaseType="0">
|
||||
@@ -25047,4 +25063,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
|
||||
</PROFILES_DATA>
|
||||
<BOM_DATA />
|
||||
</EXTERNAL_DATA>
|
||||
</PROCESS>
|
||||
</PROCESS>
|
||||
|
||||
Reference in New Issue
Block a user