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
2025-03-27 14:43:11 +01:00
parent 8d2e45db60 429d8c8f7f
commit 2b4ae72370
13 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CAD/templates/ILS/Gefaellestrecke_Verbinder.par
BIN
View File
Binary file not shown.
CAD/templates/ILS/Gefaellestrecke_allgemein.asm
BIN
View File
Binary file not shown.
CAD/templates/ILS/Gefaellestrecke_allgemein.cfg
BIN
View File
Binary file not shown.
CAD/templates/ILS/Kreisel.asm
BIN
View File
Binary file not shown.
CAD/templates/ILS/Kreisel.cfg
BIN
View File
Binary file not shown.
CAD/templates/ILS/Motor.par
BIN
View File
Binary file not shown.
CAD/templates/ILS/Spannstation.par
BIN
View File
Binary file not shown.
CAD/templates/Omniflo/821104021.asm
BIN
View File
Binary file not shown.
CAD/templates/Omniflo/821104021.par
BIN
View File
Binary file not shown.
CAD/templates/Omniflo/821104022.asm
BIN
View File
Binary file not shown.
CAD/templates/Omniflo/821104022.par
BIN
View File
Binary file not shown.
MAIN_SSG.rdx
+33 -39
View File
@@ -1021,7 +1021,6 @@
<TYPE Id="RDK:23017792" Name="OFBogenMerkmaleType" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:23017787" Name="Länge in Meter" Type="string" />
<FIELD Id="RDK:23017788" Name="Kurvenrichtung" Type="string" />
<FIELD Id="RDK:23017789" Name="Kurvenwinkel" Type="double" />
<FIELD Id="RDK:23017790" Name="Höhe Anfang" Type="string" />
<FIELD Id="RDK:23017791" Name="Höhe Ende" Type="string" />
@@ -33907,7 +33906,7 @@ me.x
<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.L1]]></EXP>
</PAR>
<PAR Name="Kurvenrichtung">
<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.KurvenRichtung]]></EXP>
<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.]]></EXP>
</PAR>
<PAR Name="Kurvenwinkel">
<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.KurvenWinkel]]></EXP>
@@ -33918,8 +33917,6 @@ me.x
<PAR Name="Höhe Ende">
<EXP><![CDATA[$=$StrReplace(ShapeItem.OFBogenDefinition.H_Ende/1000, ",", ".")]]></EXP>
</PAR>
<PAR Name="Antrieb Innen" />
<PAR Name="Antrieb Aussen" />
<PAR Name="SivasNummer">
<EXP><![CDATA[$C$notyetdone]]></EXP>
</PAR>
@@ -34389,10 +34386,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="ExitCondExp">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<SET Id="RDK:24026609" VarRef="SE_Item.SEFilename">
<EXP><![CDATA[$=$""]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SELECTCASE Id="RDK:24026697">
<EXP><![CDATA[$=$ShapeItem.family]]></EXP>
<CASEGROUP Id="RDK:24026630" CaseType="0">
@@ -34494,10 +34487,21 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="ExitCondExp">
<EXP><![CDATA[$V$]]></EXP>
</PAR>
<SET Id="RDK:19259862" VarRef="SE_Item.SEFilename">
<EXP><![CDATA[$=$""]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET_STRUCT Id="RDK:24069543" VarRef="SE_Item" ClearAll="True">
<PAR Name="Elementnummer" />
<PAR Name="TeileArt" />
<PAR Name="TeileId" />
<PAR Name="X" />
<PAR Name="Y" />
<PAR Name="Z" />
<PAR Name="rotation">
<EXP><![CDATA[$C$0]]></EXP>
</PAR>
<PAR Name="ItemName" />
<PAR Name="SEFilename" />
<PAR Name="SESubdir" />
<PAR Name="toSetParameters" />
</SET_STRUCT>
<SET Id="RDK:18760836" VarRef="LevelOfDetail">
<EXP><![CDATA[$C$templates]]></EXP>
<PAR Name="AdvancedOptions" />
@@ -34585,33 +34589,25 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$=$ShapeItem.y]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<IFTHENELSE Id="RDK:20801331">
<IFTHENELSE Id="RDK:24217050">
<VALUECONDITION Value="true">
<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten > ShapeItem.GefaelleDefinition.HoeheOben]]></EXP>
<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheOben > ShapeItem.GefaelleDefinition.HoeheUnten]]></EXP>
</VALUECONDITION>
<GROUP Id="RDK:20801328" SubType="Then">
<SET Id="RDK:20801343" VarRef="SE_Item.Z">
<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten - (ShapeItem.GefaelleDefinition.HoeheUnten - ShapeItem.GefaelleDefinition.HoeheOben)/2 ]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20801349" VarRef="winkel">
<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel]]></EXP>
<GROUP Id="RDK:24217051" SubType="Then">
<SET Id="RDK:24217049" VarRef="winkel">
<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel ]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
<GROUP Id="RDK:20801330" SubType="Else">
<SET Id="RDK:20801345" VarRef="SE_Item.Z">
<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten + (ShapeItem.GefaelleDefinition.HoeheOben - ShapeItem.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:20801351" VarRef="winkel">
<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel*-1]]></EXP>
<GROUP Id="RDK:24217052" SubType="Else">
<SET Id="RDK:24217060" VarRef="winkel">
<EXP><![CDATA[$=$-1*ShapeItem.GefaelleDefinition.winkel ]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</GROUP>
</IFTHENELSE>
<SET Id="RDK:18931672" VarRef="SE_Item.Z">
<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten + (ShapeItem.GefaelleDefinition.HoeheOben - ShapeItem.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
<SET Id="RDK:20801343" VarRef="SE_Item.Z">
<EXP><![CDATA[$=$(ShapeItem.GefaelleDefinition.HoeheUnten + ShapeItem.GefaelleDefinition.HoeheOben)/2 ]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:18931673" VarRef="SE_Item.rotation">
@@ -34645,11 +34641,11 @@ ShapeList["id="+Param.Input[1].shapeID].name
</PAR>
<PAR Name="POS_TO_ADD" />
</LIST_ADD>
<SET Id="RDK:18951808" VarRef="Par2.key">
<SET Id="RDK:24209276" VarRef="Par2.key">
<EXP><![CDATA[$C$Winkel]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:18951810" VarRef="Par2.value">
<SET Id="RDK:24209278" VarRef="Par2.value">
<EXP><![CDATA[$=$winkel]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
@@ -34768,7 +34764,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:24026429" VarRef="SE_Item.SEFilename">
<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Sivasnr+".par"]]></EXP>
<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Sivasnr+".asm"]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:24026452" VarRef="SE_Item.SESubdir">
@@ -34878,17 +34874,15 @@ ShapeList["id="+Param.Input[1].shapeID].name
<EXP><![CDATA[$=$SE_Item.X]]></EXP>
</PAR>
<PAR Name="OriginY">
<EXP><![CDATA[$=$SE_Item.Y]]></EXP>
<EXP><![CDATA[$=$-1 * SE_Item.Y]]></EXP>
</PAR>
<PAR Name="OriginZ">
<EXP><![CDATA[$=$-1*SE_Item.Z]]></EXP>
</PAR>
<PAR Name="AngleX">
<EXP><![CDATA[$C$180]]></EXP>
<EXP><![CDATA[$=$SE_Item.Z]]></EXP>
</PAR>
<PAR Name="AngleX" />
<PAR Name="AngleY" />
<PAR Name="AngleZ">
<EXP><![CDATA[$=$SE_Item.rotation -90]]></EXP>
<EXP><![CDATA[$=$SE_Item.rotation]]></EXP>
</PAR>
<PAR Name="AsmCoordSys" />
<PAR Name="RefPartName" />
cleanLocalShapes.bat
+12 -8
View File
@@ -1,10 +1,14 @@
del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\shape_*.txt"
del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\Copy_*.txt"
del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\shape_*.xml"
del "C:\Program Files\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\Copy_*.xml"
del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\shape_*.txt"
del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\props\Copy_*.txt"
del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\shape_*.xml"
del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\Copy_*.xml"
del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt"
del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\Copy_*.txt"
del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml"
del "C:\10-Develop\gitrepos\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\Copy_*.xml"
del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt"
del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\Copy_*.txt"
del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml"
del "C:\Users\y.wang\Documents\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\Copy_*.xml"
pause