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

Merge

Browse Source
This commit is contained in:
Yuelin Wang
2024-10-21 15:46:16 +02:00
parent 3e9aef40e3 eb32d69643
commit 1f5afc71ca
6 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAIN_SSG.rdx
+16 -2
View File
@@ -60,7 +60,7 @@
<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
</TYPE>
<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -83,8 +83,14 @@
<FIELD Id="RDK:18732231" Name="H_Anfang" Type="double" />
<FIELD Id="RDK:18732232" Name="H_Ende" Type="double" />
<FIELD Id="RDK:18732250" Name="Delta_h" Type="double" DesignTimeRemark="Höhendifferenz" />
<<<<<<< HEAD
<FIELD Id="RDK:20933952" Name="Richtung" Type="string" Suppressed="True" DesignTimeRemark="Links oder Rechts" />
<FIELD Id="RDK:20933954" Name="Art" Type="string" Suppressed="True" DesignTimeRemark="Gefällestrecke(nicht angetrieben) oder Förderer (angetrieben)" />
=======
<FIELD Id="RDK:20933952" Name="Richtung" Type="string" DesignTimeRemark="Auf oder Ab" />
<FIELD Id="RDK:20933954" Name="Art" Type="string" DesignTimeRemark="Gefällestrecke(nicht angetrieben) oder Förderer (angetrieben)" />
<FIELD Id="RDK:21695243" Name="HEA_fit" Type="boolean" DesignTimeRemark="True wenn die Höhen zu den Nachbarhöhen passen" />
>>>>>>> eb32d6964391e3d178d96a3caa1d762ad949bab0
</TYPE>
<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
<TYPE_VALUES />
@@ -18247,6 +18253,7 @@ me.x
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
<PAR Name="StrArr" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:20773271" VarRef="SSGParameter" ClearAll="True" ListRef="LinkTo">
<PAR Name="Key">
@@ -18269,6 +18276,7 @@ me.x
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
<PAR Name="StrArr" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:20773275" VarRef="SSGParameter" ClearAll="True" ListRef="LinkTo">
<PAR Name="Key">
@@ -18280,6 +18288,7 @@ me.x
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
<PAR Name="StrArr" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:20773279" VarRef="SSGParameter" ClearAll="True" ListRef="LinkTo">
<PAR Name="Key">
@@ -22564,13 +22573,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="Key">
<EXP><![CDATA[$C$cpId]]></EXP>
</PAR>
<PAR Name="StrArr" />
<PAR Name="Str">
<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
</PAR>
<PAR Name="Dbl" />
<PAR Name="Int" />
<PAR Name="Boo" />
<PAR Name="StrArr" />
</SET_STRUCT>
<CALLFUNCTION Id="RDK:18827141">
<PAR Name="FuncName">
@@ -22792,6 +22801,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<GROUP Id="RDK:18741873" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:18741864" Name="item" Type="Editor2DShapeType" />
<VAR Id="RDK:18732502" Name="cpId" Type="string" />
<VAR Id="RDK:21686332" Name="itemName" Type="string" />
<VAR Id="RDK:18741868" Name="hoehe" Type="double" />
<VAR Id="RDK:20622270" Name="richtung" Type="integer" />
<VAR Id="RDK:18741950" Name="RueckgabeListe" Type="SSGParameter[]" />
@@ -22806,6 +22816,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$=$ShapeList["id="+Param.Input["key=shapeID"].Str]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:21686334" VarRef="itemName" DesignTimeRemark="nur für debug Zwecke">
<EXP><![CDATA[$=$item.name]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SELECTCASE Id="RDK:18741918">
<EXP><![CDATA[$=$item.family]]></EXP>
<CASEGROUP Id="RDK:18741919" CaseType="0">