Merge erledgit

This commit is contained in:
2025-02-21 11:36:59 +01:00
7 changed files with 1790 additions and 1770 deletions
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
[{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_TEFBoegen","name":"TEF Bögen","hasShapes":true}]},{"id":"c_OmnifloParts","name":"Omniflo Parts","hasShapes":false,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":false},{"id":"c_Boegen_67_5","name":"Bögen 67.5°","hasShapes":false},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":true},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":false},{"id":"c_Boegen_180","name":"Bögen 180°","hasShapes":false}]}] [{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_TEFBoegen","name":"TEF Bögen","hasShapes":true}]},{"id":"c_OmnifloParts","name":"Omniflo Parts","hasShapes":false,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":false},{"id":"c_Boegen_67_5","name":"Bögen 67.5°","hasShapes":false},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":true},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":false},{"id":"c_Boegen_180","name":"Bögen 180°","hasShapes":false},{"id":"c25","name":"AP","hasShapes":true}]}]
Binary file not shown.
@@ -8,7 +8,23 @@
"width": 158.7402, "width": 158.7402,
"height": 3779.5276, "height": 3779.5276,
"depth": 415.748, "depth": 415.748,
"behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "behaviour": "(NOHHSTRETCH)(NODSTRETCH)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
"group3d": [
{
"source": "AP 110",
"id": "s70",
"width": 158.7402,
"height": 3779.5276,
"depth": 415.748,
"x": 0.0,
"y": 0.0,
"z": 207.874,
"rotation": "0",
"data": "",
"color": "#FFFF00",
"colorOpacity": 0.5
}
],
"connectionPoints": [ "connectionPoints": [
{ {
"id": "cp1", "id": "cp1",
+1 -1
View File
@@ -1 +1 @@
{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":false},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_TEFBoegen":{"expanded":true},"c_OmnifloParts":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_Boegen_67_5":{"expanded":false},"c_Boegen_45":{"expanded":true},"c_Boegen_22_5":{"expanded":false},"c_Boegen_180":{"expanded":false}},"shapes":{}} {"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_TEFBoegen":{"expanded":true},"c_OmnifloParts":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_Boegen_67_5":{"expanded":false},"c_Boegen_45":{"expanded":true},"c_Boegen_22_5":{"expanded":false},"c_Boegen_180":{"expanded":false},"c25":{"expanded":true}},"shapes":{}}
+10 -6
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True"> <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-02-21T11:32:49" LanguageVersion="2014.1.3.699" /> <PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-02-21T11:32:49" LanguageVersion="2014.1.3.699" />
<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True"> <GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0"> <GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0"> <GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True"> <TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
@@ -1393,7 +1393,7 @@
<EXP><![CDATA[$=$GS2DLibraryName]]></EXP> <EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
</PAR> </PAR>
<PAR Name="ShapeLibraryHideList"> <PAR Name="ShapeLibraryHideList">
<EXP><![CDATA[$C$c_Background,c10,c_Parts,c_Session,c_OmnifloParts]]></EXP> <EXP><![CDATA[$C$c_Background,c_Parts,c_Session,c_OmnifloParts]]></EXP>
</PAR> </PAR>
<PAR Name="ShapeLibraryOpenList"> <PAR Name="ShapeLibraryOpenList">
<EXP><![CDATA[$C$c_ILS,c_Omniflo]]></EXP> <EXP><![CDATA[$C$c_ILS,c_Omniflo]]></EXP>
@@ -4036,7 +4036,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<SET_STRUCT Id="RDK:23017410" VarRef="ChiltItem" ClearAll="True" ListRef="ChildList" Suppressed="True" DesignTimeNotes="0-&gt;X------------------------------------------------------------&#xD;&#xA; | |&#xD;&#xA;Y M S |&#xD;&#xA;| |&#xD;&#xA;--------------------------------------------------------------------"> <SET_STRUCT Id="RDK:23017410" VarRef="ChiltItem" ClearAll="True" ListRef="ChildList" Suppressed="True" DesignTimeNotes="0-&gt;X------------------------------------------------------------&#xD;&#xA; | |&#xD;&#xA;Y M S |&#xD;&#xA;| |&#xD;&#xA;--------------------------------------------------------------------">
<PAR Name="id" /> <PAR Name="id" />
<PAR Name="source"> <PAR Name="source">
<EXP><![CDATA[$C$s_Gefaellestrecke2D]]></EXP> <EXP><![CDATA[$C$s70]]></EXP>
</PAR> </PAR>
<PAR Name="width"> <PAR Name="width">
<EXP><![CDATA[$=$ConvertToPixel(GefaelleWidth, "mm", 96)]]></EXP> <EXP><![CDATA[$=$ConvertToPixel(GefaelleWidth, "mm", 96)]]></EXP>
@@ -4196,7 +4196,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<EXP><![CDATA[$C$0]]></EXP> <EXP><![CDATA[$C$0]]></EXP>
</PAR> </PAR>
<PAR Name="linkClass"> <PAR Name="linkClass">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP> <EXP><![CDATA[$C$Omniflo]]></EXP>
</PAR> </PAR>
<PAR Name="label"> <PAR Name="label">
<EXP><![CDATA[$C$Oben]]></EXP> <EXP><![CDATA[$C$Oben]]></EXP>
@@ -4229,7 +4229,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<EXP><![CDATA[$C$180]]></EXP> <EXP><![CDATA[$C$180]]></EXP>
</PAR> </PAR>
<PAR Name="linkClass"> <PAR Name="linkClass">
<EXP><![CDATA[$C$Gefaellestrecke]]></EXP> <EXP><![CDATA[$C$Omniflo]]></EXP>
</PAR> </PAR>
<PAR Name="label"> <PAR Name="label">
<EXP><![CDATA[$C$Unten]]></EXP> <EXP><![CDATA[$C$Unten]]></EXP>
@@ -5179,6 +5179,8 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="KurveDefinition" /> <PAR Name="KurveDefinition" />
<PAR Name="KurveFoerdererDefinition" /> <PAR Name="KurveFoerdererDefinition" />
<PAR Name="VarioFoerdererDefinition" /> <PAR Name="VarioFoerdererDefinition" />
<PAR Name="OFGeradeDefinition" />
<PAR Name="OFBogenDefinition" />
</SET_STRUCT> </SET_STRUCT>
<SET_STRUCT Id="RDK:20164888" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)&#xD;&#xA;&#xD;&#xA;depth&#xD;&#xA;"> <SET_STRUCT Id="RDK:20164888" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)&#xD;&#xA;&#xD;&#xA;depth&#xD;&#xA;">
<PAR Name="SivasNummer" /> <PAR Name="SivasNummer" />
@@ -5258,6 +5260,8 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="includeInBOM" /> <PAR Name="includeInBOM" />
<PAR Name="KurveFoerdererDefinition" /> <PAR Name="KurveFoerdererDefinition" />
<PAR Name="VarioFoerdererDefinition" /> <PAR Name="VarioFoerdererDefinition" />
<PAR Name="OFGeradeDefinition" />
<PAR Name="OFBogenDefinition" />
</SET_STRUCT> </SET_STRUCT>
</GROUP> </GROUP>
</CASEGROUP> </CASEGROUP>