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

Auflösung Merge Konflikt

Browse Source
This commit is contained in:
Yuelin Wang
2024-06-18 11:23:03 +02:00
parent 82c9543b4c 248d8051ee
commit 50b87d3f4f
24 changed files with 696940 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAIN_SSG.rdx
+124 -135
View File
@@ -656,7 +656,7 @@
<FIELD Id="RDK:529837" Name="Status" Type="string" DesignTimeRemark="Rendering status disposition: empty=definition, changed, updated, unchanged" DesignTimeNotes="Status disposition:&#xD;&#xA;unchanged: -- First panel definition&#xD;&#xA;changed: -- Layout remain the same, import new data to controls&#xD;&#xA;updated: -- Layout changed, import new data to controls&#xD;&#xA;unchanged: -- Layout is frozed, ignore control definition" />
<FIELD Id="RDK:529838" Name="Options" Type="string" DesignTimeRemark="(TAB) Create custom tab panel controlset" DesignTimeNotes="(TAB) Create custom tab panels as controlset" />
</TYPE>
<TYPE Id="RDK:529848" Name="MUIEventType" DesignTimeRemark="Event Definition" SubType="structure">
<TYPE Id="RDK:529848" Name="MUIEventType" DesignTimeRemark="Event Definition" Expanded="True" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:529840" Name="Name" Type="string" DesignTimeRemark="Event Name" DesignTimeNotes="SUBMIT&#xD;&#xA;TREEMOVEROW&#xD;&#xA;ROWSTATE&#xD;&#xA;SELECTALL&#xD;&#xA;UNSELECTALL&#xD;&#xA;SELECT&#xD;&#xA;UNSELECT&#xD;&#xA;AUTOCOMMIT&#xD;&#xA;DRAGDROP&#xD;&#xA;FILEDELETE_&lt;SINGLE|MULTIPLE&gt;&#xD;&#xA;POIADD&#xD;&#xA;POIUPDATE&#xD;&#xA;POIDELETE&#xD;&#xA;ROWACTION&#xD;&#xA;POIADDED&#xD;&#xA;FILEUPLOADED_&lt;SINGLE|MULTIPLE&gt;_&lt;NEW|ADD&gt;&#xD;&#xA;STATUSCHANGE&#xD;&#xA;WEBVIEWBUTTON&#xD;&#xA;FILEDOWNLOADED" />
<FIELD Id="RDK:529841" Name="Source" Type="string" DesignTimeRemark="ID of the control originating the event" />
@@ -984,19 +984,7 @@
<VAR Id="RDK:1007743" Name="Schiene" Type="SSY_Shapes" />
<VAR Id="RDK:1007447" Name="Point2DList" Type="Point2D[]" />
<VAR Id="RDK:1007444" Name="Point2D" Type="Point2D" />
<VAR Id="RDK:1054119" Name="Trace" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:1241416" Name="ExportSnapshot" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:1519830" Name="SessionZip" Type="string" />
<VAR Id="RDK:1621335" Name="ID" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:1710591" Name="cp" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:1711732" Name="cp_gfs" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:1712885" Name="gefaellestrecke" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:18732365" Name="strecke" Type="Editor2DShapeType" />
<VAR Id="RDK:18115984" Name="foerderer" Type="Editor2DShapeType" />
<VAR Id="RDK:19841636" Name="shape_item" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:19841637" Name="shape_item" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:19866002" Name="shapeList_idx" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:19871466" Name="winkel_th" Type="double" DesignTimeRemark="Generated by RD" />
</GROUP>
<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -5111,7 +5099,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
</FUNCTION>
<FUNCTION Id="RDK:1219214" Name="CollectLinkedShapesByTempLink" DesignTimeNotes="20230928 -1-" InputTypeName="string[]">
<GROUP Id="RDK:1219207" Name="Local Variables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:1219206" Name="ID" Type="string" DesignTimeRemark="Generated by RD" />
<VAR Id="RDK:1219206" Name="ID" Type="string" />
<VAR Id="RDK:1303110" Name="TempLink" Type="string" />
</GROUP>
<FOREACHLOOP Id="RDK:1219213" ItemVarRef="ID">
@@ -8148,6 +8136,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
</PAR>
<GROUP Id="RDK:19842999" Name="Local Vars" SubType="VarSet" IncludeDate="0" DesignTimeNotes="20230928 -1-">
<VAR Id="RDK:19843001" Name="UebergabeListe" Type="SSGParameter[]" />
<VAR Id="RDK:19881500" Name="shape_item" Type="Editor2DShapeType" />
</GROUP>
<SET Id="RDK:19841635" VarRef="shape_item">
<EXP><![CDATA[$=$ShapeList["id=" + StrAfter(Link, ";")]]]></EXP>
@@ -14685,125 +14674,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="AdvancedOptions" />
</SET>
</FUNCTION>
<FUNCTION Id="RDK:19595231" Name="SetHeight" InputTypeName="SSGParameter[]">
<GROUP Id="RDK:19595239" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:19595236" Name="shapeId" Type="string">
<SET Id="RDK:19595241" VarRef="Me">
<EXP><![CDATA[$=$Param.Input["key=ShapeId"].Str]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
<VAR Id="RDK:19595237" Name="label" Type="string">
<SET Id="RDK:19595243" VarRef="Me">
<EXP><![CDATA[$=$E$ Param.Input["key=Label"].Str]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
<VAR Id="RDK:19595238" Name="hoehe" Type="double">
<SET Id="RDK:19595245" VarRef="Me">
<EXP><![CDATA[$=$Param.Input["key=Hoehe"].Dbl]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
<VAR Id="RDK:19595247" Name="shape_item" Type="Editor2DShapeType">
<SET Id="RDK:19595248" VarRef="Me">
<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
</GROUP>
<SELECTCASE Id="RDK:19595360">
<EXP><![CDATA[$=$shape_item.family]]></EXP>
<CASEGROUP Id="RDK:19595346" CaseType="0">
<EXP><![CDATA[$C$Kreisel]]></EXP>
<SET Id="RDK:19615251" VarRef="ShapeList[&quot;id=&quot;+shapeId].KreiselDefinition.Hoehe">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19595362" CaseType="0">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
<IFTHENELSE Id="RDK:19595387">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$label="cp1"]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:19595384" SubType="Then">
<SET Id="RDK:19595383" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheOben">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:19595386" SubType="Else">
<SET Id="RDK:19595385" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheUnten">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
<CALLFUNCTION Id="RDK:19595391">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</CASEGROUP>
<CASEGROUP Id="RDK:19595364" CaseType="0">
<EXP><![CDATA[$C$Foerderer]]></EXP>
<IFTHENELSE Id="RDK:19595403">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$label="cp1"]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:19595400" SubType="Then">
<SET Id="RDK:19595399" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_1">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:19595402" SubType="Else">
<SET Id="RDK:19595401" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_0">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
<SET Id="RDK:19595407" VarRef="Shape_Prototype" Suppressed="True">
<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<CALLFUNCTION Id="RDK:19595409" Suppressed="True">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Calculate Foerderer]]></EXP>
</PAR>
<PAR Name="InputExp" />
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</CASEGROUP>
<CASEGROUP Id="RDK:19595347" CaseType="0">
<EXP><![CDATA[$C$Weiche]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19595348" CaseType="0">
<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19595349" CaseType="0">
<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19595375" CaseType="0">
<EXP><![CDATA[$C$Eckrad]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19595359" CaseType="1">
<EXP />
</CASEGROUP>
</SELECTCASE>
</FUNCTION>
<FUNCTION Id="RDK:1772330" Name="SetGefaellestreckeHeight" Suppressed="True" InputTypeName="SSGParameter[]">
<GROUP Id="RDK:1773485" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:1773487" Name="shapeId" Type="string" />
@@ -15178,6 +15048,125 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="AdvancedOptions" />
</SET>
</FUNCTION>
<FUNCTION Id="RDK:19595231" Name="SetHeight" InputTypeName="SSGParameter[]">
<GROUP Id="RDK:19595239" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:19595236" Name="shapeId" Type="string">
<SET Id="RDK:19595241" VarRef="Me">
<EXP><![CDATA[$=$Param.Input["key=ShapeId"].Str]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
<VAR Id="RDK:19595237" Name="label" Type="string">
<SET Id="RDK:19595243" VarRef="Me">
<EXP><![CDATA[$=$E$ Param.Input["key=Label"].Str]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
<VAR Id="RDK:19595238" Name="hoehe" Type="double">
<SET Id="RDK:19595245" VarRef="Me">
<EXP><![CDATA[$=$Param.Input["key=Hoehe"].Dbl]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
<VAR Id="RDK:19595247" Name="shape_item" Type="Editor2DShapeType">
<SET Id="RDK:19595248" VarRef="Me">
<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</VAR>
</GROUP>
<SELECTCASE Id="RDK:19595360">
<EXP><![CDATA[$=$shape_item.family]]></EXP>
<CASEGROUP Id="RDK:19595346" CaseType="0">
<EXP><![CDATA[$C$Kreisel]]></EXP>
<SET Id="RDK:19615251" VarRef="ShapeList[&quot;id=&quot;+shapeId].KreiselDefinition.Hoehe">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19595362" CaseType="0">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
<IFTHENELSE Id="RDK:19595387">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$label="cp1"]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:19595384" SubType="Then">
<SET Id="RDK:19595383" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheOben">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:19595386" SubType="Else">
<SET Id="RDK:19595385" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheUnten">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
<CALLFUNCTION Id="RDK:19595391">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
</PAR>
<PAR Name="InputExp">
<EXP><![CDATA[$=$shapeId]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</CASEGROUP>
<CASEGROUP Id="RDK:19595364" CaseType="0">
<EXP><![CDATA[$C$Foerderer]]></EXP>
<IFTHENELSE Id="RDK:19595403">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$label="cp1"]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:19595400" SubType="Then">
<SET Id="RDK:19595399" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_1">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:19595402" SubType="Else">
<SET Id="RDK:19595401" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_0">
<EXP><![CDATA[$=$hoehe]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
<SET Id="RDK:19595407" VarRef="Shape_Prototype" Suppressed="True">
<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<CALLFUNCTION Id="RDK:19595409" Suppressed="True">
<PAR Name="FuncName">
<EXP><![CDATA[$C$Calculate Foerderer]]></EXP>
</PAR>
<PAR Name="InputExp" />
<PAR Name="ResultRef">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
</CASEGROUP>
<CASEGROUP Id="RDK:19595347" CaseType="0">
<EXP><![CDATA[$C$Weiche]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19595348" CaseType="0">
<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19595349" CaseType="0">
<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19595375" CaseType="0">
<EXP><![CDATA[$C$Eckrad]]></EXP>
</CASEGROUP>
<CASEGROUP Id="RDK:19595359" CaseType="1">
<EXP />
</CASEGROUP>
</SELECTCASE>
</FUNCTION>
<FUNCTION Id="RDK:1698052" Name="SetHeightOnConnect" InputTypeName="SSGParameter[]" ResultTypeName="SSGParameter[]">
<GROUP Id="RDK:1772339" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:1772341" Name="item_0" Type="Editor2DShapeType" />
@@ -17335,7 +17324,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
</FUNCTION>
</GROUP>
</GROUP>
<GROUP Id="RDK:0008" Name="Main Group" SubType="Generic" Expanded="True">
<GROUP Id="RDK:0008" Name="Main Group" SubType="Generic">
<COMMENTS Id="RDK:1144004" DesignTimeRemark="Process Information" DesignTimeNotes="Process Name:&#xD;&#xA;MAIN_SSG.rdx&#xD;&#xA;&#xD;&#xA;Process Requires:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Author:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Creation Date:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Functionality:&#xD;&#xA;&#xD;&#xA;Changes:&#xD;&#xA;20231005 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Gefällestrecke (Pufferstrecke)&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;20230928 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Kreisel" />
<GROUP Id="RDK:304" Name="INIT" SubType="Generic">
<SET Id="RDK:318" VarRef="GS2DLibraryName">
@@ -22453,4 +22442,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
</PROFILES_DATA>
<BOM_DATA />
</EXTERNAL_DATA>
</PROCESS>
</PROCESS>