TEF für Einfachweiche 90°R700 links und rechts sind eingepflegt.

This commit is contained in:
2025-04-01 11:15:06 +02:00
parent 7d2b431fe4
commit b3714b4865
23 changed files with 299 additions and 7 deletions
Binary file not shown.
@@ -153,6 +153,17 @@
"KurvenRichtung": 1,
"SivasnrTEF": null
},
{
"Sivasnr": "834372028+0_B10080+0_B10090",
"ProfilTyp": "WEICHE S 90°-L-700/700, KPL. MIT P mit TEF Innen",
"WeichenTyp": "Einzelweiche",
"KurvenWinkel": 90,
"Schaltungstyp": "P",
"Breite": 700,
"Länge": 700,
"KurvenRichtung": 1,
"SivasnrTEF": "0_B10080+0_B10090"
} ,
{
"Sivasnr": 834372030,
"ProfilTyp": "WEICHE S 90°-R-700/700, KPL. MIT M",
@@ -175,6 +186,17 @@
"KurvenRichtung": 2,
"SivasnrTEF": null
},
{
"Sivasnr": "834372031+0_B10080+0_B10090",
"ProfilTyp": "WEICHE S 90°-R-700/700, KPL. MIT P mit TEF Innen",
"WeichenTyp": "Einzelweiche",
"KurvenWinkel": 90,
"Schaltungstyp": "P",
"Breite": 700,
"Länge": 700,
"KurvenRichtung": 2,
"SivasnrTEF": "0_B10080+0_B10090"
},
{
"Sivasnr": 834372047,
"ProfilTyp": "WEICHE S PARALLEL-L-200/750, KPL. MIT M",
Binary file not shown.

After

Width:  |  Height:  |  Size: 849 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 825 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 B

After

Width:  |  Height:  |  Size: 617 B

@@ -1,7 +1,9 @@
<palette><div class="paletteItem"><div><img id="834372027" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/Weiche_90_700_700_L_M_834372030_32px.png" /></div><div>Einfach 90° 700/700 links M</div></div>
<div class="paletteItem"><div><img id="834372030" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/Weiche_90_700_700_R_M_834372030_32px.png" /></div><div>Einfach 90° 700/700 rechts M</div></div>
<div class="paletteItem"><div><img id="834372028" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/Weiche_90_700_700_L_P_834372028_32px.png" /></div><div>Einfach 90° 700/700 links P</div></div>
<div class="paletteItem"><div><img id="834372028+0_B10080+0_B10090" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700_links_32px.png" /></div><div>Einfach 90° 700/700 links P mit TEF Innen</div></div>
<div class="paletteItem"><div><img id="834372031" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/Weiche_90_700_700_R_P_834372031_32px.png" /></div><div>Einfach 90° 700/700 rechts P</div></div>
<div class="paletteItem"><div><img id="834372031+0_B10080+0_B10090" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700_rechts_32px.png" /></div><div>Einfach 90° 700/700 rechs P mit TEF Innen</div></div>
<div class="paletteItem"><div><img id="834372021" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/Weiche_90_500_600_L_M_834372021_32px.png" /></div><div>Einfach 90° 500/600 links M</div></div>
<div class="paletteItem"><div><img id="834372024" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/Weiche_90_500_600_R_M_834372024_32px.png" /></div><div>Einfach 90° 500/600 rechts M</div></div>
<div class="paletteItem"><div><img id="834372022" class="shape" title="" family="OFWeiche" shapeMode="0" src="SSG/shapes/img/Weiche_90_500_600_L_P_834372022_32px.png" /></div><div>Einfach 90° 500/600 links P</div></div>
@@ -0,0 +1,110 @@
{
"shapeMode": 0,
"name": "Einfach 90° 700/700 links P mit TEF Innen",
"family": "OFWeiche",
"icon": "SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700_links_32px.png",
"iconBig": "SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700__x0020_links_64px.png",
"srcSVG": "SSG/shapes/svg/834372028+0_B10080+0_B10090.xml",
"width": 2645.6693,
"height": 3169.5874,
"depth": 415.748,
"behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
"connectionPoints": [
{
"id": "cp1",
"x": 1.989,
"y": 0.0,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 270.0,
"linkClass": "Omniflo",
"label": "",
"isDimension": true
},
{
"id": "cp2",
"x": 1000.0,
"y": 833.744,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 180.0,
"linkClass": "Omniflo",
"label": "",
"isDimension": true
},
{
"id": "cp3",
"x": 1000.0,
"y": 403.13,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 0.0,
"linkClass": "Omniflo",
"label": "",
"isDimension": true
},
{
"id": "cp4",
"x": 0.0,
"y": 117.143,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 270.0,
"linkClass": "OmnifloTEF",
"label": "",
"isDimension": true
},
{
"id": "cp5",
"x": 720.471,
"y": 1000.0,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 180.0,
"linkClass": "OmnifloTEF",
"label": "",
"isDimension": true
}
],
"eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved"
}
@@ -0,0 +1,110 @@
{
"shapeMode": 0,
"name": "Einfach 90° 700/700 rechs P mit TEF Innen",
"family": "OFWeiche",
"icon": "SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700_rechts_32px.png",
"iconBig": "SSG/shapes/img/_x0030__BG080090_TEF_Bogen_Weiche_S_90_700_rechts_64px.png",
"srcSVG": "SSG/shapes/svg/834372031+0_B10080+0_B10090.xml",
"width": 2645.6693,
"height": 3169.5874,
"depth": 415.748,
"behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
"connectionPoints": [
{
"id": "cp1",
"x": 1000.0,
"y": 0.0,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 90.0,
"linkClass": "Omniflo",
"label": "",
"isDimension": true
},
{
"id": "cp2",
"x": 0.0,
"y": 833.744,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 180.0,
"linkClass": "Omniflo",
"label": "",
"isDimension": true
},
{
"id": "cp3",
"x": 0.0,
"y": 403.13,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 0.0,
"linkClass": "Omniflo",
"label": "",
"isDimension": true
},
{
"id": "cp4",
"x": 914.28,
"y": 116.676,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 90.0,
"linkClass": "OmnifloTEF",
"label": "",
"isDimension": true
},
{
"id": "cp5",
"x": 141.266,
"y": 1000.0,
"z": 0.0,
"xMin": "",
"xMax": "",
"xStep": "",
"yMin": "",
"yMax": "",
"yStep": "",
"zMin": "",
"zMax": "",
"zStep": "",
"direction": 180.0,
"linkClass": "OmnifloTEF",
"label": "",
"isDimension": true
}
],
"eventClass": "OnDoubleclick,OnPasted,OnInserted,OnLinked,OnRemoved"
}
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg">
<g transform="rotate(0)">
<svg viewBox="0 0 838.75 1e3" preserveAspectRatio="none" position="absolute" overflow="visible">
<g transform="matrix(.9981 0 0 .9981 1.8907 .0062146)" fill="none" stroke-linecap="square">
<path d="m835.98 405.78v427.65m0-112.48-131.17-315.74c-101.41-244.14-340.31-403.33-605.31-403.33h-97.392" stroke="#ffe31b" stroke-width="1px" />
<path d="m716.27 998.11v-148.49c-7.4e-4 -70.201-13.868-139.72-40.809-204.57l-95.748-230.58c-73.753-177.56-247.5-293.33-440.23-293.33h-137.59" style="stroke:#ec2525;stroke-dasharray:5, 5;stroke-width:2px" />
</g>
</svg>
</g>
</svg>
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg">
<g transform="rotate(0)">
<svg viewBox="0 0 852.39 1e3" preserveAspectRatio="none" position="absolute" overflow="visible">
<g fill="none" stroke-linecap="square">
<path d="m2.4769 719.6 133.39-315.14m-133.39 0.55945v426.84m748.97-829.97h99.046m-99.046 0a666.31 652.12 0 0 0-615.58 402.57" stroke="#ffe31b" stroke-width="1px" />
<path d="m124.21 996.22v-148.2c2e-3 -70.068 14.104-139.45 41.503-204.18l98.058-230.6c75.003-177.22 251.7-292.78 447.7-292.78h67.849" style="stroke:#ec2525;stroke-dasharray:5, 5;stroke-width:2px" />
</g>
</svg>
</g>
</svg>
+7 -7
View File
@@ -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="y.wang [ANGEBOT-NB02]" ModDate="2025-03-27T15:11:13" LanguageVersion="2014.1.3.698" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-04-01T11:05:14" LanguageVersion="2014.1.3.698" />
<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">
@@ -212,7 +212,7 @@
<FIELD Id="RDK:23222856" Name="Länge" Options="Ausdehnung im Bild nach oben" Type="double" />
<FIELD Id="RDK:23222860" Name="Breite" Options="Ausdehnung im Bild nach rechts" Type="double" />
</TYPE>
<TYPE Id="RDK:23221861" Name="OFWeicheType" SubType="structure" HasArrayType="True">
<TYPE Id="RDK:23221861" Name="OFWeicheType" Expanded="True" SubType="structure" HasArrayType="True">
<TYPE_VALUES />
<FIELD Id="RDK:23221848" Name="Beschreibung" Type="string" />
<FIELD Id="RDK:23221857" Name="WeichenTyp" Type="string" />
@@ -244,7 +244,7 @@
<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
<FIELD Id="RDK:16577441" Name="Beschreibung" Type="string" />
</TYPE>
<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -267,7 +267,7 @@
<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
<FIELD Id="RDK:19961198" Name="isDefined" Type="boolean" />
</TYPE>
<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
<TYPE_VALUES />
<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
@@ -13146,7 +13146,7 @@ SSGConnectionPoint.x_M
<EXP><![CDATA[$=$SivasNummer]]></EXP>
</PAR>
<PAR Name="ResultRef">
<EXP><![CDATA[$V$BogenData]]></EXP>
<EXP><![CDATA[$V$WeicheData]]></EXP>
</PAR>
<PAR Name="Options" />
</CALLFUNCTION>
@@ -14231,9 +14231,9 @@ SSGConnectionPoint.x_M
</GROUP>
</IFTHENELSE>
</FUNCTION>
<FUNCTION Id="RDK:23222191" Name="RefreshOFWeicheUI" DesignTimeRemark="Wird nur innerhalb der MUI OFWeicheUI aufgerufen und verwendet Daten aus Shape_Prototype" InputTypeName="double">
<FUNCTION Id="RDK:23222191" Name="RefreshOFWeicheUI" DesignTimeRemark="Wird nur innerhalb der MUI OFWeicheUI aufgerufen und verwendet Daten aus Shape_Prototype" InputTypeName="string">
<GROUP Id="RDK:23222175" Name="Local Variables" SubType="VarSet" IncludeDate="0">
<VAR Id="RDK:23222173" Name="SivasNummer" Type="double">
<VAR Id="RDK:23222173" Name="SivasNummer" Type="string">
<SET Id="RDK:23222172" VarRef="Me">
<EXP><![CDATA[$=$Param.Input]]></EXP>
<PAR Name="AdvancedOptions" />
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="838.75" height="1e3" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round" version="1.1" viewBox="0 0 838.75 1e3" xml:space="preserve"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(.9981 0 0 .9981 1.8907 .0062146)" fill="none" stroke-linecap="square" >
<path d="m835.98 405.78v427.65m0-112.48-131.17-315.74c-101.41-244.14-340.31-403.33-605.31-403.33h-97.392" stroke="#ffe31b" stroke-width="3.7867"/>
<path d="m716.27 998.11v-148.49c-7.4e-4 -70.201-13.868-139.72-40.809-204.57l-95.748-230.58c-73.753-177.56-247.5-293.33-440.23-293.33h-137.59" style="stroke:#ec2525;stroke-dasharray:18.9335, 18.9335;" stroke-width="7.5734"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 743 B

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="852.39" height="1e3" fill-rule="evenodd" stroke-linejoin="round" version="1.1" viewBox="0 0 852.39 1e3" xml:space="preserve"
xmlns="http://www.w3.org/2000/svg">
<g fill="none" stroke-linecap="square" >
<path d="m2.4769 719.6 133.39-315.14m-133.39 0.55945v426.84m748.97-829.97h99.046m-99.046 0a666.31 652.12 0 0 0-615.58 402.57" stroke="#ffe31b" stroke-width="3.7867"/>
<path d="m124.21 996.22v-148.2c2e-3 -70.068 14.104-139.45 41.503-204.18l98.058-230.6c75.003-177.22 251.7-292.78 447.7-292.78h67.849" style="stroke:#ec2525;stroke-dasharray:18.9335, 18.9335;" stroke-width="7.5734"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 677 B