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:26:38 +02:00
parent 50b87d3f4f 092bddb926
commit 0526b7e71e
3 changed files with 5 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor2DLibrary/SSG/shapes/svg/Gefaellestrecke_Default.xml
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg">
<g transform="rotate(0)">
<svg viewBox="0 0 26.45833 264.58333" preserveAspectRatio="none" position="absolute" overflow="visible">
<defs />
<g transform="translate(0,-13.203638)">
<path style="opacity:0.94;fill:none;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" stroke="#ffa700" />
</g>
</svg>
</g>
</svg>
Editor2DLibrary/SSG/shapes/svg/s_Gefaellestrecke.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<svg viewBox="0 0 26.45833 264.58333" preserveAspectRatio="none" position="absolute" overflow="visible">
<defs />
<g transform="translate(0,-13.203638)">
<path style="opacity:0.94;fill:none;stroke:#00ff00;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" />
<path style="opacity:0.94;fill:none;stroke-opacity:1" d="M 13.65157,13.203638 V 277.78696" stroke-width="1px" stroke="#ffa700" />
</g>
</svg>
</g>
MAIN_SSG.rdx
+4 -80
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="2024-06-18T10:07:44" LanguageVersion="2014.1.3.674" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-06-18T10:50:33" LanguageVersion="2014.1.3.674" />
<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">
@@ -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" Expanded="True" SubType="structure">
<TYPE Id="RDK:529848" Name="MUIEventType" DesignTimeRemark="Event Definition" 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" />
@@ -3752,80 +3752,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="Options" />
</ACTION_CALL>
<COMMENTS Id="RDK:18547250" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
<SET_STRUCT Id="RDK:18547251" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" 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)">
<PAR Name="SivasNummer" />
<PAR Name="Rotationsklasse" />
<PAR Name="IDCounter" />
<PAR Name="KreiselDefinition" />
<PAR Name="EckradDefinition" />
<PAR Name="GefaelleDefinition" />
<PAR Name="StreckeDefinition" />
<PAR Name="FoerdererDefinition" />
<PAR Name="WeicheDefinition" />
<PAR Name="BTMTBeladungDefinition" />
<PAR Name="BTMTEntladungDefinition" />
<PAR Name="source">
<EXP><![CDATA[$=$IIF(isDefined=False, "Gefaellestrecke_Default", IIF(Shape_Prototype.GefaelleDefinition.LH_fits=True,"Gefaellestrecke_Richtig","Gefaellestrecke_Falsch"))]]></EXP>
</PAR>
<PAR Name="sourceLibrary">
<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
</PAR>
<PAR Name="signature" />
<PAR Name="id">
<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
</PAR>
<PAR Name="name" />
<PAR Name="family" />
<PAR Name="description" />
<PAR Name="x" />
<PAR Name="y" />
<PAR Name="z" />
<PAR Name="width">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
</PAR>
<PAR Name="height">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.height, "mm", 96)]]></EXP>
</PAR>
<PAR Name="depth">
<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.depth, "mm", 96)]]></EXP>
</PAR>
<PAR Name="rotation">
<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
</PAR>
<PAR Name="text" />
<PAR Name="behaviour" />
<PAR Name="datadump" />
<PAR Name="path" />
<PAR Name="ctrl1x" />
<PAR Name="ctrl1y" />
<PAR Name="ctrl2x" />
<PAR Name="ctrl2y" />
<PAR Name="shapeFromId" />
<PAR Name="shapeFromPointIndex" />
<PAR Name="shapeToId" />
<PAR Name="shapeToPointIndex" />
<PAR Name="dimStack" />
<PAR Name="dimType" />
<PAR Name="dimDriving" />
<PAR Name="dimValue" />
<PAR Name="color" />
<PAR Name="colorOpacity" />
<PAR Name="color3D" />
<PAR Name="colorOpacity3D" />
<PAR Name="lineWidth" />
<PAR Name="lineColor" />
<PAR Name="lineOpacity" />
<PAR Name="lineColor3D" />
<PAR Name="lineOpacity3D" />
<PAR Name="links" />
<PAR Name="group" />
<PAR Name="layer" />
<PAR Name="connectionPoints" />
<PAR Name="modified" />
<PAR Name="pinned" />
<PAR Name="selected" />
<PAR Name="includeInBOM" />
</SET_STRUCT>
<SET_STRUCT Id="RDK:19341158" 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)">
<PAR Name="SivasNummer" />
<PAR Name="Rotationsklasse" />
@@ -3838,9 +3764,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
<PAR Name="WeicheDefinition" />
<PAR Name="BTMTBeladungDefinition" />
<PAR Name="BTMTEntladungDefinition" />
<PAR Name="source">
<EXP><![CDATA[$=$"Gefaellestrecke_Default"]]></EXP>
</PAR>
<PAR Name="source" />
<PAR Name="sourceLibrary">
<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
</PAR>
@@ -17324,7 +17248,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
</FUNCTION>
</GROUP>
</GROUP>
<GROUP Id="RDK:0008" Name="Main Group" SubType="Generic">
<GROUP Id="RDK:0008" Name="Main Group" SubType="Generic" Expanded="True">
<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">