Merge

Editor2DLibrary/SSG/shapes/categories.txt

@@ -1 +1 @@
-[{"id":"c_ILS","name":"ILS","hasShapes":true,"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":"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","description":"Assemblies created while Session","hasShapes":true}]
+[{"id":"c_ILS","name":"ILS","hasShapes":true,"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":"Kurven","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}]

Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <palette><div class="paletteItem"><div><img id="s_Gefaellestrecke" class="shape" title="" family="Gefaellestrecke" shapeMode="0" src="SSG/shapes/img/Gefaellestrecke.png" /></div><div>Gefällestrecke Gerade</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_90_L_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_L_G_32px.png" /></div><div>90 Kurve links Gefällestrecke</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_90_R_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_R_G_32px.png" /></div><div>90 Kurve rechts Gefällestrecke</div></div>
@@ -11,4 +12,7 @@
 <div class="paletteItem"><div><img id="s_Kurve_60_R_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_R_F_32px.png" /></div><div>60 Kurve rechts angetriebene</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_30_L_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_L_F_32px.png" /></div><div>30 Kurve links angetriebene</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_30_R_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_R_F_32px.png" /></div><div>30 Kurve rechts angetriebene</div></div>
+=======
+<palette><div class="paletteItem"><div><img id="s_Gefaellestrecke" class="shape" title="" family="Gefaellestrecke" shapeMode="0" src="SSG/shapes/img/Gefaellestrecke.png" /></div><div>Gefällestrecke</div></div>
+>>>>>>> eb32d6964391e3d178d96a3caa1d762ad949bab0
 </palette>

Editor2DLibrary/SSG/shapes/palettes/c_Kurven.xml

@@ -0,0 +1,7 @@
+<palette><div class="paletteItem"><div><img id="s_Kurve_90_L" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_L_32px.png" /></div><div>90 Kurve links</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_90_R" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_R_32px.png" /></div><div>90 Kurve rechts</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_60_L" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_L_32px.png" /></div><div>60 Kurve links</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_60_R" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_R_32px.png" /></div><div>60 Kurve rechts</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_30_L" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_L_32px.png" /></div><div>30 Kurve links</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_30_R" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_R_32px.png" /></div><div>30 Kurve rechts</div></div>
+</palette>

Editor2DLibrary/SSG/shapes/settings.txt

@@ -1 +1 @@
-{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"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}},"shapes":{}}

MAIN_SSG.rdx

@@ -60,7 +60,7 @@
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -83,8 +83,14 @@
 					<FIELD Id="RDK:18732231" Name="H_Anfang" Type="double" />
 					<FIELD Id="RDK:18732232" Name="H_Ende" Type="double" />
 					<FIELD Id="RDK:18732250" Name="Delta_h" Type="double" DesignTimeRemark="Höhendifferenz" />
+<<<<<<< HEAD
 					<FIELD Id="RDK:20933952" Name="Richtung" Type="string" Suppressed="True" DesignTimeRemark="Links oder Rechts" />
 					<FIELD Id="RDK:20933954" Name="Art" Type="string" Suppressed="True" DesignTimeRemark="Gefällestrecke(nicht angetrieben) oder Förderer (angetrieben)" />
+=======
+					<FIELD Id="RDK:20933952" Name="Richtung" Type="string" DesignTimeRemark="Auf oder Ab" />
+					<FIELD Id="RDK:20933954" Name="Art" Type="string" DesignTimeRemark="Gefällestrecke(nicht angetrieben) oder Förderer (angetrieben)" />
+					<FIELD Id="RDK:21695243" Name="HEA_fit" Type="boolean" DesignTimeRemark="True wenn die Höhen zu den Nachbarhöhen passen" />
+>>>>>>> eb32d6964391e3d178d96a3caa1d762ad949bab0
 				</TYPE>
 				<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
 					<TYPE_VALUES />
@@ -18247,6 +18253,7 @@ me.x
 									<PAR Name="Dbl" />
 									<PAR Name="Int" />
 									<PAR Name="Boo" />
+									<PAR Name="StrArr" />
 								</SET_STRUCT>
 								<SET_STRUCT Id="RDK:20773271" VarRef="SSGParameter" ClearAll="True" ListRef="LinkTo">
 									<PAR Name="Key">
@@ -18269,6 +18276,7 @@ me.x
 									<PAR Name="Dbl" />
 									<PAR Name="Int" />
 									<PAR Name="Boo" />
+									<PAR Name="StrArr" />
 								</SET_STRUCT>
 								<SET_STRUCT Id="RDK:20773275" VarRef="SSGParameter" ClearAll="True" ListRef="LinkTo">
 									<PAR Name="Key">
@@ -18280,6 +18288,7 @@ me.x
 									<PAR Name="Dbl" />
 									<PAR Name="Int" />
 									<PAR Name="Boo" />
+									<PAR Name="StrArr" />
 								</SET_STRUCT>
 								<SET_STRUCT Id="RDK:20773279" VarRef="SSGParameter" ClearAll="True" ListRef="LinkTo">
 									<PAR Name="Key">
@@ -22564,13 +22573,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="Key">
 						<EXP><![CDATA[$C$cpId]]></EXP>
 					</PAR>
+					<PAR Name="StrArr" />
 					<PAR Name="Str">
 						<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
 					</PAR>
 					<PAR Name="Dbl" />
 					<PAR Name="Int" />
 					<PAR Name="Boo" />
-					<PAR Name="StrArr" />
 				</SET_STRUCT>
 				<CALLFUNCTION Id="RDK:18827141">
 					<PAR Name="FuncName">
@@ -22792,6 +22801,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				<GROUP Id="RDK:18741873" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:18741864" Name="item" Type="Editor2DShapeType" />
 					<VAR Id="RDK:18732502" Name="cpId" Type="string" />
+					<VAR Id="RDK:21686332" Name="itemName" Type="string" />
 					<VAR Id="RDK:18741868" Name="hoehe" Type="double" />
 					<VAR Id="RDK:20622270" Name="richtung" Type="integer" />
 					<VAR Id="RDK:18741950" Name="RueckgabeListe" Type="SSGParameter[]" />
@@ -22806,6 +22816,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input["key=shapeID"].Str]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
+				<SET Id="RDK:21686334" VarRef="itemName" DesignTimeRemark="nur für debug Zwecke">
+					<EXP><![CDATA[$=$item.name]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
 				<SELECTCASE Id="RDK:18741918">
 					<EXP><![CDATA[$=$item.family]]></EXP>
 					<CASEGROUP Id="RDK:18741919" CaseType="0">

cleanLocalShapes.bat

@@ -1,5 +1,10 @@
 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:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt"
+del "C:\PLM\RuleDesigner\RDConfigurator Fusion\WebApi\Editor2D\SSG\shapes\svg\Copy_*.xml"
-del "C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml"
+
+del "C:\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\shape_*.txt"
+del "C:\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\props\Copy_*.txt"
+del "C:\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\shape_*.xml"
+del "C:\10-Develop\SSG-Ruledesigner-Konfigurator\Editor2DLibrary\SSG\shapes\svg\Copy_*.xml"
 pause