Merge Konflikt bereinigt

Editor2DLibrary/SSG/shapes/props/s_Eckrad.txt

@@ -5,6 +5,7 @@
   "icon": "SSG/shapes/img/Eckrad_32x32.png",
   "iconBig": "SSG/shapes/img/Eckrad_64x64.png",
   "srcSVG": "SSG/shapes/svg/s_Eckrad.xml",
+  "src3D": "SSG/shapes/obj/s_Eckrad.stl",
   "width": 3023.622,
   "height": 3023.622,
   "depth": 1897.3228,

Editor2DLibrary/SSG/shapes/props/s_Gefaellestrecke.txt

@@ -5,6 +5,7 @@
   "icon": "SSG/shapes/img/Gefaellestrecke.png",
   "iconBig": "SSG/shapes/img/Gefaellestrecke.png",
   "srcSVG": "SSG/shapes/svg/s_Gefaellestrecke.xml",
+  "src3D": "SSG/shapes/obj/s_Gefaellestrecke.stl",
   "text": "^",
   "width": 1625.1969,
   "height": 6047.2441,
@@ -95,4 +96,4 @@
     }
   ],
   "eventClass": "OnInserted,OnDoubleclick,OnPasted,OnLinked"
-}
+}

Editor2DLibrary/SSG/shapes/svg/s_Eckrad.xml

@@ -15,4 +15,4 @@
       </g>
     </svg>
   </g>
-</svg>
+</svg>

MAIN_SSG.rdx

@@ -3769,6 +3769,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="GefaelleDefinition">
 											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition]]></EXP>
 										</PAR>
+										<PAR Name="StreckeDefinition" />
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
@@ -3788,7 +3789,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="description" />
 										<PAR Name="x" />
 										<PAR Name="y" />
-										<PAR Name="z" />
+										<PAR Name="z">
+											<EXP><![CDATA[$=$Shape_Prototype.EckradDefinition.Hoehe]]></EXP>
+										</PAR>
 										<PAR Name="width">
 											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
 										</PAR>
@@ -3834,7 +3837,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="StreckeDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -4021,7 +4023,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="description" />
 										<PAR Name="x" />
 										<PAR Name="y" />
-										<PAR Name="z" />
+										<PAR Name="z">
+											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten + (Shape_Prototype.GefaelleDefinition.HoeheOben - Shape_Prototype.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
+										</PAR>
 										<PAR Name="width">
 											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
 										</PAR>
@@ -6732,7 +6736,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 							<IFTHENELSE Id="RDK:18729636">
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$-Delta_h/foerdererData.L1=Tan(alpha_s)]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:18729637" SubType="Then">
@@ -23761,4 +23765,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
+</PROCESS>