From b925ed83daa575d110003c64e3b64b88fb7c9162 Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Thu, 26 Sep 2024 14:31:48 +0200
Subject: [PATCH] =?UTF-8?q?Strecke=20wurde=20in=20Kurve=20umbenannt,=20und?=
 =?UTF-8?q?=20die=20Interface=20Combobox=20f=C3=BCr=20Kurve=20eingebaut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml |   6 +-
 .../SSG/shapes/props/s_Kurve_30.txt           |   2 +-
 .../SSG/shapes/props/s_Kurve_60.txt           |   2 +-
 .../SSG/shapes/props/s_Kurve_90.txt           |   2 +-
 MAIN_SSG.rdx                                  | 804 ++++++++++++++++--
 5 files changed, 723 insertions(+), 93 deletions(-)

diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml
index 4b9c061..bd931c3 100644
--- a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml
@@ -1,5 +1,5 @@
 <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>
-<div class="paletteItem"><div><img id="s_Kurve_90" class="shape" title="" family="Strecke" shapeMode="0" src="SSG/shapes/img/Kurve_90_32px.png" /></div><div>90 Kurve</div></div>
-<div class="paletteItem"><div><img id="s_Kurve_60" class="shape" title="" family="Strecke" shapeMode="0" src="SSG/shapes/img/Kurve_60_32px.png" /></div><div>60 Kurve</div></div>
-<div class="paletteItem"><div><img id="s_Kurve_30" class="shape" title="" family="Strecke" shapeMode="0" src="SSG/shapes/img/Kurve_30_32px.png" /></div><div>30 Kurve</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_90" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_32px.png" /></div><div>90 Kurve</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_60" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_32px.png" /></div><div>60 Kurve</div></div>
+<div class="paletteItem"><div><img id="s_Kurve_30" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_32px.png" /></div><div>30 Kurve</div></div>
 </palette>
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30.txt
index 0a4d0f5..576eb1c 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_30.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_30.txt
@@ -1,7 +1,7 @@
 {
   "shapeMode": 0,
   "name": "30 Kurve",
-  "family": "Strecke",
+  "family": "Kurve",
   "icon": "SSG/shapes/img/Kurve_30_32px.png",
   "iconBig": "SSG/shapes/img/Kurve_30_64px.png",
   "srcSVG": "SSG/shapes/svg/s_Kurve_30.xml",
diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60.txt
index 958af94..9758bf1 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_60.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_60.txt
@@ -1,7 +1,7 @@
 {
   "shapeMode": 0,
   "name": "60 Kurve",
-  "family": "Strecke",
+  "family": "Kurve",
   "icon": "SSG/shapes/img/Kurve_60_32px.png",
   "iconBig": "SSG/shapes/img/Kurve_60_64px.png",
   "srcSVG": "SSG/shapes/svg/s_Kurve_60.xml",
diff --git a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90.txt b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90.txt
index be2af34..d4dc4eb 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Kurve_90.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Kurve_90.txt
@@ -1,7 +1,7 @@
 {
   "shapeMode": 0,
   "name": "90 Kurve",
-  "family": "Strecke",
+  "family": "Kurve",
   "icon": "SSG/shapes/img/Kurve_90_32px.png",
   "iconBig": "SSG/shapes/img/Kurve_90_64px.png",
   "srcSVG": "SSG/shapes/svg/s_Kurve_90.xml",
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 8596c56..5803e3b 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -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="m.stangl [ENTW-NB08]" ModDate="2024-09-25T17:16:29" LanguageVersion="2014.1.3.690" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-09-26T14:25:47" LanguageVersion="2014.1.3.679" />
 	<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">
@@ -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" />
@@ -76,15 +76,17 @@
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18732236" Name="StreckeType" SubType="structure">
+				<TYPE Id="RDK:18732236" Name="KurveType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18732225" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18732226" Name="L1" Type="double" />
-					<FIELD Id="RDK:18732231" Name="HoeheOben" Type="double" />
-					<FIELD Id="RDK:18732232" Name="HoeheUnten" Type="double" />
+					<FIELD Id="RDK:18732231" Name="H_0" Type="double" />
+					<FIELD Id="RDK:18732232" Name="H_1" Type="double" />
 					<FIELD Id="RDK:18732250" Name="Delta_h" Type="double" DesignTimeRemark="Höhendifferenz" />
+					<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)" />
 				</TYPE>
-				<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
+				<TYPE Id="RDK:18116690" Name="FoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18116683" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18116696" Name="Typ" Type="string" DesignTimeRemark="Auf oder Ab" />
@@ -131,7 +133,7 @@
 					<FIELD Id="RDK:122039" Name="KreiselDefinition" Type="KreiselType" />
 					<FIELD Id="RDK:1520553" Name="EckradDefinition" Type="EckradType" />
 					<FIELD Id="RDK:412309" Name="GefaelleDefinition" Type="GefaelleType" />
-					<FIELD Id="RDK:18732284" Name="StreckeDefinition" Type="StreckeType" />
+					<FIELD Id="RDK:18732284" Name="KurveDefinition" Type="KurveType" />
 					<FIELD Id="RDK:18116672" Name="FoerdererDefinition" Type="FoerdererType" />
 					<FIELD Id="RDK:973719" Name="WeicheDefinition" Type="WeicheType" />
 					<FIELD Id="RDK:1652536" Name="BTMTBeladungDefinition" Type="BTMTBeladungType" />
@@ -144,7 +146,7 @@
 					<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
 					<FIELD Id="RDK:18530522" Name="GefaelleDefinition" Type="GefaelleType" />
 					<FIELD Id="RDK:18530523" Name="FoerdererDefinition" Type="FoerdererType" />
-					<FIELD Id="RDK:18732357" Name="StreckeDefinition" Type="StreckeType" />
+					<FIELD Id="RDK:18732357" Name="KurveDefinition" Type="KurveType" />
 				</TYPE>
 				<TYPE Id="RDK:1783792" Name="SSGParameter" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
@@ -162,8 +164,8 @@
 					<FIELD Id="RDK:18530552" Name="Eckrad_bot" Type="EckradType" />
 					<FIELD Id="RDK:18530556" Name="Gefaelle_top" Type="GefaelleType" />
 					<FIELD Id="RDK:18530554" Name="Gefaelle_bot" Type="GefaelleType" />
-					<FIELD Id="RDK:18732359" Name="Strecke_top" Type="StreckeType" />
-					<FIELD Id="RDK:18732361" Name="Strecke_bot" Type="StreckeType" />
+					<FIELD Id="RDK:18732359" Name="Kurve_top" Type="KurveType" />
+					<FIELD Id="RDK:18732361" Name="Kurve_bot" Type="KurveType" />
 					<FIELD Id="RDK:18530558" Name="Foerderer_auf_top" Type="FoerdererType" />
 					<FIELD Id="RDK:18530560" Name="Foerderer_auf_bot" Type="FoerdererType" />
 					<FIELD Id="RDK:18598081" Name="Foerderer_ab_top" Type="FoerdererType" />
@@ -658,7 +660,7 @@
 					<FIELD Id="RDK:529831" Name="DataSource" Type="variant" DesignTimeRemark="Datasource for multi-values control type (dropdown,radiobuttons,grids)" DesignTimeNotes="For multivalue single controls:&#xD;&#xA;    DataSourceValInfo Type&#xD;&#xA;For grids:&#xD;&#xA;    DataSourceColInfo Type&#xD;&#xA;    Simple structure (field/caption)&#xD;&#xA;For simple dropdown&#xD;&#xA;    List of number or string" />
 					<FIELD Id="RDK:529832" Name="Options" Type="string" DesignTimeRemark="Control related options" DesignTimeNotes="(CLASSCSS=xxx)           Add a css class specific to the control&#xD;&#xA;(WIDTH=xxx)              Control width&#xD;&#xA;(HEIGHT=xxx)             Control height&#xD;&#xA;(INDENT=nn)              Control indentation&#xD;&#xA;(BREAK)                  Interrupt fluent flow and place control on a new line&#xD;&#xA;(FONTNAME=xxx)           Control font name style&#xD;&#xA;(FONTSIZE=xxx)           Control font size style&#xD;&#xA;(BOLD)                   Control bold style if used&#xD;&#xA;(ITALIC)                 Control italic style if used&#xD;&#xA;(FORECOLOR=xxx)          Control forecolor style&#xD;&#xA;(BACKCOLOR=xxx)          Control backcolor style&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;For Textzoom:&#xD;&#xA;   (LEFTICON)                  &#xD;&#xA;   (CONFIRM=xxx)            &#xD;&#xA;For Slider:&#xD;&#xA;   (RANGE=min,max,step)            &#xD;&#xA;For DataGrids:&#xD;&#xA;   (GRIDHEADERS=EXPORT,SWITCH,SEARCH,FILTERS,COLUMNS,ORDERBY,DOWNLOAD,REFRESH)&#xD;&#xA;   (GRIDFOOTERS=RECENT,FAVORITE,DEFAULT)        &#xD;&#xA;   (SELECTION=NONE,SINGLE,MULTIPLE,ASYNC)       &#xD;&#xA;   (NOROWEDIT)              &#xD;&#xA;   (ACTION=xx,yy,zz)       &#xD;&#xA;   (ROWCLICKACTION=key)&#xD;&#xA;   (ROWACTION=key,icon,description,columns,confirm,confirmMessage)     &#xD;&#xA;   (TABLEHEIGHT=&lt;size&gt;|xs:&lt;size&gt;;..;lg:&lt;size&gt;)&#xD;&#xA;For CardGrid:&#xD;&#xA;   (CARDBUTTONS=NEW,VIEW,EDIT,DELETE,DOWNLOAD)        &#xD;&#xA;For controlset&#xD;&#xA;   (GROUPCSS=class) - Class to be applied to controlset&#xD;&#xA;   (GROUPTYPE=ACCORDION,PANEL) - Default is accordion" />
 				</TYPE>
-				<TYPE Id="RDK:529839" Name="MUIPanelType" DesignTimeRemark="Panel Definition" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:529839" Name="MUIPanelType" DesignTimeRemark="Panel Definition" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:529834" Name="Name" Type="string" DesignTimeRemark="Panel name (MAIN, TOP_TOOLBAR, BOTTOM_TOOLBAR, RIGHT_TOOLBAR, LEFT_TOOLBAR, FAB_TOOLBAR, TREE, MENUBAR, HEADER, FOOTER, TOP_IMAGE, BOTTOM_IMAGE, RIGHT_IMAGE, LEFT_IMAGE, MASTER_IMAGE, DETAIL" />
 					<FIELD Id="RDK:529835" Name="BindingType" Type="string" DesignTimeRemark="Name of the structure type binded to the panel" />
@@ -733,7 +735,7 @@
 					<FIELD Id="RDK:529888" Name="State" Type="string" />
 					<FIELD Id="RDK:529889" Name="Options" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:529908" Name="DataSourceColInfo" DesignTimeRemark="Used for complex DataSource" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:529908" Name="DataSourceColInfo" DesignTimeRemark="Used for complex DataSource" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:529891" Name="Field" Type="string" />
 					<FIELD Id="RDK:529892" Name="DataType" Type="string" DesignTimeRemark="Empty=auto,string,integer,double,boolean,date,array,object" />
@@ -781,7 +783,7 @@
 					<FIELD Id="RDK:903600" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:1674242" Name="Anzahl der Scanner" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18732296" Name="StreckeMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:18732296" Name="KurveMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:19257152" Name="Anzahl Zusatzseparatoren" Type="string" />
 					<FIELD Id="RDK:19257154" Name="Gesamtanzahl Separatoren" Type="string" />
@@ -885,7 +887,7 @@
 				<VAR Id="RDK:112239" Name="KreiselData_defaults" Type="KreiselType" />
 				<VAR Id="RDK:1520435" Name="EckradData_defaults" Type="EckradType" />
 				<VAR Id="RDK:837487" Name="GefaelleData_defaults" Type="GefaelleType" />
-				<VAR Id="RDK:18732238" Name="StreckeData_defaults" Type="StreckeType" />
+				<VAR Id="RDK:18732238" Name="KurveData_defaults" Type="KurveType" />
 				<VAR Id="RDK:18116704" Name="FoerdererData_defaults" Type="FoerdererType" />
 				<VAR Id="RDK:1652538" Name="BTMTBeladungData_defaults" Type="BTMTBeladungType" />
 				<VAR Id="RDK:16525381" Name="BTMTEntladungData_defaults" Type="BTMTEntladungType" />
@@ -913,7 +915,7 @@
 				<VAR Id="RDK:1810765" Name="Render_BTMTBeladung" Type="MUIPanelType[]" />
 				<VAR Id="RDK:18107651" Name="Render_BTMTEntladung" Type="MUIPanelType[]" />
 				<VAR Id="RDK:397368" Name="Render_Gefaelle" Type="MUIPanelType[]" />
-				<VAR Id="RDK:18732363" Name="Render_Strecke" Type="MUIPanelType[]" />
+				<VAR Id="RDK:18732363" Name="Render_Kurve" Type="MUIPanelType[]" />
 				<VAR Id="RDK:18119699" Name="Render_Foerderer" Type="MUIPanelType[]" />
 				<VAR Id="RDK:973744" Name="Render_Weiche" Type="MUIPanelType[]" />
 				<VAR Id="RDK:532690" Name="Render_CP" Type="MUIPanelType[]" />
@@ -959,6 +961,10 @@
 					<VAR Id="RDK:18610415" Name="RichtungItem" Type="DataSourceValInfo" />
 					<VAR Id="RDK:18610416" Name="RichtungList" Type="DataSourceValInfo[]" />
 				</GROUP>
+				<GROUP Id="RDK:20936804" Name="Antriebsart" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:20936802" Name="AntriebartItem" Type="DataSourceValInfo" />
+					<VAR Id="RDK:20936803" Name="AntriebsartList" Type="DataSourceValInfo[]" />
+				</GROUP>
 			</GROUP>
 			<GROUP Id="RDK:324" Name="INIT" SubType="VarSet" IncludeDate="0">
 				<VAR Id="RDK:322" Name="Editor2DOption" Type="Editor2DOptionType" />
@@ -2012,6 +2018,10 @@
 														<PAR Name="IDCounter" />
 														<PAR Name="EckradDefinition" />
 														<PAR Name="BTMTBeladungDefinition" />
+														<PAR Name="KurveDefinition" />
+														<PAR Name="FoerdererDefinition" />
+														<PAR Name="BTMTEntladungDefinition" />
+														<PAR Name="isDefined" />
 													</SET_STRUCT>
 													<GROUP Id="RDK:42950" Name="Horizontal Text" SubType="Generic">
 														<SET_STRUCT Id="RDK:42954" VarRef="LayoutGridSplineItem" ClearAll="True" ListRef="ShapeList" DesignTimeNotes="(NOSELECT)">
@@ -2099,6 +2109,8 @@
 															<PAR Name="FoerdererDefinition" />
 															<PAR Name="BTMTBeladungDefinition" />
 															<PAR Name="BTMTEntladungDefinition" />
+															<PAR Name="KurveDefinition" />
+															<PAR Name="isDefined" />
 														</SET_STRUCT>
 													</GROUP>
 												</GROUP>
@@ -2220,6 +2232,7 @@
 														<PAR Name="BTMTBeladungDefinition" />
 														<PAR Name="BTMTEntladungDefinition" />
 														<PAR Name="isDefined" />
+														<PAR Name="KurveDefinition" />
 													</SET_STRUCT>
 													<GROUP Id="RDK:70633" Name="Vertical Text" SubType="Generic">
 														<SET_STRUCT Id="RDK:70632" VarRef="LayoutGridSplineItem" ClearAll="True" ListRef="ShapeList" DesignTimeNotes="(NOSELECT)">
@@ -2300,6 +2313,14 @@
 															<PAR Name="pinned" />
 															<PAR Name="selected" />
 															<PAR Name="includeInBOM" />
+															<PAR Name="Rotationsklasse" />
+															<PAR Name="IDCounter" />
+															<PAR Name="EckradDefinition" />
+															<PAR Name="KurveDefinition" />
+															<PAR Name="FoerdererDefinition" />
+															<PAR Name="BTMTBeladungDefinition" />
+															<PAR Name="BTMTEntladungDefinition" />
+															<PAR Name="isDefined" />
 														</SET_STRUCT>
 													</GROUP>
 												</GROUP>
@@ -3582,7 +3603,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							</SET>
 						</GROUP>
 					</FUNCTION>
-					<FUNCTION Id="RDK:18732260" Name="CreatePrototype_Strecke">
+					<FUNCTION Id="RDK:18732260" Name="CreatePrototype_Kurve">
 						<GROUP Id="RDK:18732256" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
 						<COMMENTS Id="RDK:18732257" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes="           0&#xD;&#xA;            |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA;            |&#xD;&#xA;          180&#xD;&#xA;" />
 						<SET Id="RDK:18732258" VarRef="Property_Prototype">
@@ -4341,6 +4362,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
 										<PAR Name="isDefined" />
+										<PAR Name="KurveDefinition" />
 									</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;">
 										<PAR Name="SivasNummer" />
@@ -4416,14 +4438,15 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="KurveDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:18732280" CaseType="0">
-								<EXP><![CDATA[$C$Strecke]]></EXP>
-								<GROUP Id="RDK:18732273" Name="Strecke in der Library anlegen" SubType="Generic">
+								<EXP><![CDATA[$C$Kurve]]></EXP>
+								<GROUP Id="RDK:18732273" Name="Kurve in der Library anlegen" SubType="Generic">
 									<SET Id="RDK:18732271" VarRef="Property_Prototype.eventClass">
-										<EXP><![CDATA[$C$OnInserted,OnLinked,OnPasted]]></EXP>
+										<EXP><![CDATA[$C$OnDoubleclick,OnInserted,OnLinked,OnPasted]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<ACTION_CALL Id="RDK:18732272" Name="RDEngineering_E2DManageShape">
@@ -4463,7 +4486,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										</PAR>
 									</ACTION_CALL>
 								</GROUP>
-								<GROUP Id="RDK:18732279" Name="Strecke platzieren" SubType="Generic">
+								<GROUP Id="RDK:18732279" Name="Kurve platzieren" SubType="Generic">
 									<COMMENTS Id="RDK:18732274" DesignTimeRemark="pixel in mm" />
 									<COMMENTS Id="RDK:18732275" DesignTimeRemark="Shape in ShapeList wird gedreht" />
 									<ACTION_CALL Id="RDK:18732276" Name="RDEngineering_E2DManageShape">
@@ -4508,7 +4531,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
-										<PAR Name="StreckeDefinition" />
+										<PAR Name="KurveDefinition" />
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
@@ -5127,6 +5150,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
 										<PAR Name="isDefined" />
+										<PAR Name="KurveDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -6930,7 +6954,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:18732369" CaseType="0">
-							<EXP><![CDATA[$C$Strecke]]></EXP>
+							<EXP><![CDATA[$C$Kurve]]></EXP>
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:18591709" CaseType="0">
 							<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -12532,19 +12556,20 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						</CASEGROUP>
 					</SELECTCASE>
 				</FUNCTION>
-				<FUNCTION Id="RDK:18732414" Name="StreckeUI">
+				<FUNCTION Id="RDK:18732414" Name="KurveUI">
+					<GROUP Id="RDK:20979937" Name="Update Controls" SubType="Generic" />
 					<ACTION_CALL Id="RDK:18732395" Name="RDEngineering_ModernUIRender">
 						<PAR Name="RDLibraryName">
 							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 						</PAR>
 						<PAR Name="RenderList">
-							<EXP><![CDATA[$=$Render_Strecke]]></EXP>
+							<EXP><![CDATA[$=$Render_Kurve]]></EXP>
 						</PAR>
 						<PAR Name="BindingMode">
 							<EXP><![CDATA[$C$0]]></EXP>
 						</PAR>
 						<PAR Name="InputData">
-							<EXP><![CDATA[$=$Shape_Prototype.StreckeDefinition]]></EXP>
+							<EXP><![CDATA[$=$Shape_Prototype.KurveDefinition]]></EXP>
 						</PAR>
 						<PAR Name="CSSStyle" />
 						<PAR Name="RDActionTimeOut" />
@@ -12568,13 +12593,13 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						<CASEGROUP Id="RDK:18732406" CaseType="0">
 							<EXP><![CDATA[$C$OK]]></EXP>
 							<GROUP Id="RDK:18732401" Name="Write Properties" SubType="Generic">
-								<SET Id="RDK:18732398" VarRef="Shape_Prototype.height">
-									<EXP><![CDATA[$=$Shape_Prototype.StreckeDefinition.L1]]></EXP>
+								<SET Id="RDK:18732398" VarRef="Shape_Prototype.height" Suppressed="True">
+									<EXP><![CDATA[$=$Shape_Prototype.KurveDefinition.L1]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<CALLFUNCTION Id="RDK:18732399">
 									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$CreatePrototype_Strecke]]></EXP>
+										<EXP><![CDATA[$C$CreatePrototype_Kurve]]></EXP>
 									</PAR>
 									<PAR Name="InputExp">
 										<EXP><![CDATA[$=$]]></EXP>
@@ -12597,12 +12622,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="Options" />
 								</CALLFUNCTION>
 							</GROUP>
-							<GROUP Id="RDK:18732404" Name="Strecke HoeheOben OR HoeheUnten was changed" SubType="Generic" Suppressed="True" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
+							<GROUP Id="RDK:18732404" Name="Kurve HoeheOben OR HoeheUnten was changed" SubType="Generic" Suppressed="True" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
 								<VALUECONDITION Value="true" Oper="OR">
-									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].StreckeDefinition.HoeheOben <> Shape_Prototype.StreckeDefinition.HoeheOben]]></EXP>
+									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].KurveDefinition.HoeheOben <> Shape_Prototype.KurveDefinition.HoeheOben]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].StreckeDefinition.HoeheUnten <> Shape_Prototype.StreckeDefinition.HoeheUnten]]></EXP>
+									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].KurveDefinition.HoeheUnten <> Shape_Prototype.KurveDefinition.HoeheUnten]]></EXP>
 								</VALUECONDITION>
 								<SET_STRUCT Id="RDK:18732402" VarRef="InheritHeightData" ClearAll="True">
 									<PAR Name="ParentIndex">
@@ -12610,10 +12635,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="NewHoehe" />
 									<PAR Name="NewHoeheOben">
-										<EXP><![CDATA[$=$Shape_Prototype.StreckeDefinition.HoeheOben]]></EXP>
+										<EXP><![CDATA[$=$Shape_Prototype.KurveDefinition.HoeheOben]]></EXP>
 									</PAR>
 									<PAR Name="NewHoeheUnten">
-										<EXP><![CDATA[$=$Shape_Prototype.StreckeDefinition.HoeheUnten]]></EXP>
+										<EXP><![CDATA[$=$Shape_Prototype.KurveDefinition.HoeheUnten]]></EXP>
 									</PAR>
 									<PAR Name="Text">
 										<EXP><![CDATA[$C$^]]></EXP>
@@ -12634,6 +12659,17 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</GROUP>
 							<EXIT_PROCESS Id="RDK:18732405" BreakType="3" ExitStatus="0" />
 						</CASEGROUP>
+						<CASEGROUP Id="RDK:20934679" CaseType="0">
+							<EXP><![CDATA[$C$AUTOCOMMIT]]></EXP>
+							<GROUP Id="RDK:20979925" Name="Group" SubType="Generic">
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="Richtung"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="Art"]]></EXP>
+								</VALUECONDITION>
+							</GROUP>
+						</CASEGROUP>
 						<CASEGROUP Id="RDK:18732412" CaseType="0">
 							<EXP><![CDATA[$C$CLOSEPOPUP]]></EXP>
 							<EXIT_PROCESS Id="RDK:18732411" BreakType="3" ExitStatus="0" />
@@ -14099,13 +14135,13 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						</GROUP>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18732210" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<GROUP Id="RDK:18732204" Name="UI" SubType="Generic">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
 							</VALUECONDITION>
-							<SET Id="RDK:18732203" VarRef="Shape_Prototype.StreckeDefinition">
-								<EXP><![CDATA[$=$StreckeData_defaults]]></EXP>
+							<SET Id="RDK:18732203" VarRef="Shape_Prototype.KurveDefinition">
+								<EXP><![CDATA[$=$KurveData_defaults]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</GROUP>
@@ -14117,23 +14153,23 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$C$Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:18732207" VarRef="Shape_Prototype.StreckeDefinition.Beschreibung">
+						<SET Id="RDK:18732207" VarRef="Shape_Prototype.KurveDefinition.Beschreibung">
 							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<CALLFUNCTION Id="RDK:18732208">
 							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$CreatePrototype_Strecke]]></EXP>
+								<EXP><![CDATA[$C$CreatePrototype_Kurve]]></EXP>
 							</PAR>
 							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$]]></EXP>
+								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
 							</PAR>
 							<PAR Name="ResultRef">
 								<EXP><![CDATA[$V$]]></EXP>
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:18732209">
+						<CALLFUNCTION Id="RDK:18732209" Suppressed="True">
 							<PAR Name="FuncName">
 								<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
 							</PAR>
@@ -14145,6 +14181,111 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
+						<GROUP Id="RDK:20935428" Name="UI" SubType="Generic">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
+							</VALUECONDITION>
+							<ACTION_CALL Id="RDK:20935424" Name="RDEngineering_RemoteRedirect" DesignTimeRemark="{Action Mode} {Url}" DesignTimeNotes="(CLOSEBUTTON)(TITLE=TITOLO DEL POP UP)(TITLECOLOR=#000000)(TITLEBACKCOLOR=RED)(STARTPOSITION=bottom)(NOPADDING)(DRAGGABLE)">
+								<PAR Name="RDLibraryName">
+									<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+								</PAR>
+								<PAR Name="RedirectMode">
+									<EXP><![CDATA[$C$5]]></EXP>
+								</PAR>
+								<PAR Name="Url" />
+								<PAR Name="HtmlFile" />
+								<PAR Name="HtmlData" />
+								<PAR Name="JsCode" />
+								<PAR Name="JsResult">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="CssSource" />
+								<PAR Name="PopupName" />
+								<PAR Name="PopupStyle" />
+								<PAR Name="Process" />
+								<PAR Name="RunTimeRemark" />
+								<PAR Name="WaitForInput">
+									<EXP><![CDATA[$C$true]]></EXP>
+								</PAR>
+								<PAR Name="RDActionTimeOut" />
+								<PAR Name="WebResourcePath" />
+								<PAR Name="ImgTop" />
+								<PAR Name="ImgBottom" />
+								<PAR Name="ImgLeft" />
+								<PAR Name="ImgRight" />
+								<PAR Name="CSSStyle" />
+								<PAR Name="ButtonsMode">
+									<EXP><![CDATA[$C$0]]></EXP>
+								</PAR>
+								<PAR Name="ButtonList" />
+								<PAR Name="ButtonImgs" />
+								<PAR Name="ButtonAction" />
+								<PAR Name="ButtonOptions" />
+								<PAR Name="ButtonDefs" />
+								<PAR Name="ButtonPressed">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="HeaderData" />
+								<PAR Name="Options">
+									<EXP><![CDATA[$=$"(CLOSEBUTTON)(TITLE="+Shape_Prototype.name+")(NOPADDING)(STARTPOSITION=bottom)"]]></EXP>
+								</PAR>
+							</ACTION_CALL>
+							<WHILELOOP Id="RDK:20935426">
+								<CALLFUNCTION Id="RDK:20935425">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$KurveUI]]></EXP>
+									</PAR>
+									<PAR Name="InputExp" />
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</WHILELOOP>
+							<ACTION_CALL Id="RDK:20935427" Name="RDEngineering_RemoteRedirect" DesignTimeRemark="{Action Mode} {Url}">
+								<PAR Name="RDLibraryName">
+									<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+								</PAR>
+								<PAR Name="RedirectMode">
+									<EXP><![CDATA[$C$7]]></EXP>
+								</PAR>
+								<PAR Name="Url" />
+								<PAR Name="HtmlFile" />
+								<PAR Name="HtmlData" />
+								<PAR Name="JsCode" />
+								<PAR Name="JsResult">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="CssSource" />
+								<PAR Name="PopupName" />
+								<PAR Name="PopupStyle" />
+								<PAR Name="Process" />
+								<PAR Name="RunTimeRemark" />
+								<PAR Name="WaitForInput">
+									<EXP><![CDATA[$C$true]]></EXP>
+								</PAR>
+								<PAR Name="RDActionTimeOut" />
+								<PAR Name="WebResourcePath" />
+								<PAR Name="ImgTop" />
+								<PAR Name="ImgBottom" />
+								<PAR Name="ImgLeft" />
+								<PAR Name="ImgRight" />
+								<PAR Name="CSSStyle" />
+								<PAR Name="ButtonsMode">
+									<EXP><![CDATA[$C$0]]></EXP>
+								</PAR>
+								<PAR Name="ButtonList" />
+								<PAR Name="ButtonImgs" />
+								<PAR Name="ButtonAction" />
+								<PAR Name="ButtonOptions" />
+								<PAR Name="ButtonDefs" />
+								<PAR Name="ButtonPressed">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="HeaderData" />
+								<PAR Name="Options" />
+							</ACTION_CALL>
+						</GROUP>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18116664" CaseType="0">
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -14542,6 +14683,15 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
+											<PAR Name="id" />
+											<PAR Name="x_S" />
+											<PAR Name="x" />
+											<PAR Name="y" />
+											<PAR Name="z" />
+											<PAR Name="direction" />
+											<PAR Name="linkClass" />
+											<PAR Name="label" />
+											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 									<GROUP Id="RDK:607197" Name="Spannstation" SubType="Generic">
@@ -14559,6 +14709,15 @@ ShapeTotalLength
 me.x
 ))-(Shape_Prototype.KreiselDefinition.Durchmesser/2)]]></EXP>
 											</PAR>
+											<PAR Name="id" />
+											<PAR Name="x_M" />
+											<PAR Name="x" />
+											<PAR Name="y" />
+											<PAR Name="z" />
+											<PAR Name="direction" />
+											<PAR Name="linkClass" />
+											<PAR Name="label" />
+											<PAR Name="aktiv" />
 										</EXEC_ON_VALUES>
 									</GROUP>
 								</GROUP>
@@ -15301,7 +15460,64 @@ me.x
 					</REMOVE_ADD>
 				</FOREACHLOOP>
 			</FUNCTION>
-			<FUNCTION Id="RDK:290" Name="OnEditor2DRemoved" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)" />
+			<FUNCTION Id="RDK:290" Name="OnEditor2DRemoved" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)">
+				<GROUP Id="RDK:20931166" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:20931168" Name="id0" Type="string">
+						<SET Id="RDK:20931172" VarRef="Me">
+							<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</VAR>
+					<VAR Id="RDK:20931170" Name="id1" Type="string">
+						<SET Id="RDK:20931174" VarRef="Me">
+							<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</VAR>
+				</GROUP>
+				<SET Id="RDK:20932541" VarRef="Shape_Prototype">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<IFTHENELSE Id="RDK:20931161">
+					<VALUECONDITION Value="true" Oper="OR">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Kurve"]]></EXP>
+					</VALUECONDITION>
+					<VALUECONDITION Value="true" Oper="OR">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Foerderer"]]></EXP>
+					</VALUECONDITION>
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Gefaellestrecke"]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:20931160" SubType="Then">
+						<IFTHENELSE Id="RDK:20931159">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Kurve"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Foerderer"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Gefaellestrecke"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:20931158" SubType="Then">
+								<CALLFUNCTION Id="RDK:20931157" DesignTimeNotes="20231005 -1-">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$RemoveFromGroup]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+						</IFTHENELSE>
+					</GROUP>
+				</IFTHENELSE>
+			</FUNCTION>
 			<FUNCTION Id="RDK:291" Name="OnEditor2DRotated" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)" />
 			<FUNCTION Id="RDK:292" Name="OnEditor2DMoved" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)" />
 			<FUNCTION Id="RDK:293" Name="OnEditor2DStretched" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)" />
@@ -15789,7 +16005,7 @@ me.x
 						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:18827051">
 							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Strecke"]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Foerderer"]]></EXP>
@@ -15811,7 +16027,7 @@ me.x
 						</IFTHENELSE>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18732456" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<IFTHENELSE Id="RDK:18740516">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Foerderer"]]></EXP>
@@ -15962,7 +16178,7 @@ me.x
 						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:18895451">
 							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Strecke"]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:18895450" SubType="Then">
 								<CALLFUNCTION Id="RDK:18895449">
@@ -16222,7 +16438,7 @@ me.x
 				</SELECTCASE>
 				<IFTHENELSE Id="RDK:20819453">
 					<VALUECONDITION Value="true" Oper="OR">
-						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Strecke"]]></EXP>
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Kurve"]]></EXP>
 					</VALUECONDITION>
 					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Foerderer"]]></EXP>
@@ -16233,7 +16449,7 @@ me.x
 					<GROUP Id="RDK:20819491" SubType="Then">
 						<IFTHENELSE Id="RDK:20819415">
 							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Strecke"]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Kurve"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Foerderer"]]></EXP>
@@ -16260,7 +16476,7 @@ me.x
 				</IFTHENELSE>
 			</FUNCTION>
 			<FUNCTION Id="RDK:19960886" Name="OnEditor2DUnlinked" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)">
-				<GROUP Id="RDK:20833997" SubType="VarSet" IncludeDate="0">
+				<GROUP Id="RDK:20833997" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:20834001" Name="id0" Type="string">
 						<SET Id="RDK:20834000" VarRef="Me">
 							<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
@@ -16310,7 +16526,7 @@ me.x
 						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19961131" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<SET Id="RDK:19961202" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].isDefined" DesignTimeRemark="Wenn die Höhen nicht definiert sind, wird der Flag isDefined auf false gesetzt.">
 							<EXP><![CDATA[$=$False]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -16335,7 +16551,7 @@ me.x
 				</SELECTCASE>
 				<IFTHENELSE Id="RDK:20833972">
 					<VALUECONDITION Value="true" Oper="OR">
-						<EXP><![CDATA[$=$ShapeList["id="+id0].family = "Strecke"]]></EXP>
+						<EXP><![CDATA[$=$ShapeList["id="+id0].family = "Kurve"]]></EXP>
 					</VALUECONDITION>
 					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$ShapeList["id="+id0].family = "Foerderer"]]></EXP>
@@ -17715,7 +17931,7 @@ me.x
 						<VAR Id="RDK:1516845" Name="GefaellestreckeMerkmale" Type="GefaellestreckeMerkmaleType" />
 						<VAR Id="RDK:18131115" Name="FoerdererMerkmale" Type="FoerdererMerkmaleType" />
 						<VAR Id="RDK:1516846" Name="WeicheMerkmale" Type="WeicheMerkmaleType" />
-						<VAR Id="RDK:19253126" Name="StreckeMerkmale" Type="StreckeMerkmaleType" />
+						<VAR Id="RDK:19253126" Name="KurveMerkmale" Type="KurveMerkmaleType" />
 						<VAR Id="RDK:1666873" Name="EckradMerkmale" Type="EckradMerkmaleType" />
 						<VAR Id="RDK:1668589" Name="BTMTBeladungMerkmale" Type="BTMTBeladungMerkmaleType" />
 						<VAR Id="RDK:1668589" Name="BTMTEntladungMerkmale" Type="BTMTEntladungMerkmaleType" />
@@ -17983,7 +18199,7 @@ me.x
 								</LIST_ADD>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:19257150" CaseType="0" Suppressed="True">
-								<EXP><![CDATA[$C$Strecke]]></EXP>
+								<EXP><![CDATA[$C$Kurve]]></EXP>
 								<GROUP Id="RDK:19257141" Name="TeileArt" SubType="Generic">
 									<SET Id="RDK:19257140" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("Kurve_90")]]></EXP>
@@ -17992,7 +18208,7 @@ me.x
 								</GROUP>
 								<GROUP Id="RDK:19257143" Name="Bezeichnung" SubType="Generic">
 									<SET Id="RDK:19257142" VarRef="CSV_Item.Bezeichnung">
-										<EXP><![CDATA[$=$ToJSON(ShapeItem.StreckeDefinition.Beschreibung)]]></EXP>
+										<EXP><![CDATA[$=$ToJSON(ShapeItem.KurveDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
@@ -18009,11 +18225,11 @@ me.x
 									</CALLFUNCTION>
 								</GROUP>
 								<GROUP Id="RDK:19257148" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:19257146" VarRef="StreckeMerkmale" ClearAll="True">
+									<SET_STRUCT Id="RDK:19257146" VarRef="KurveMerkmale" ClearAll="True">
 										<PAR Name="Höhe in m" />
 									</SET_STRUCT>
 									<SET Id="RDK:19257147" VarRef="CSV_Item.Merkmale">
-										<EXP><![CDATA[$=$ToJSON(StreckeMerkmale)]]></EXP>
+										<EXP><![CDATA[$=$ToJSON(KurveMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
@@ -18025,16 +18241,16 @@ me.x
 								</LIST_ADD>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:19251786" CaseType="0">
-								<EXP><![CDATA[$C$Strecke]]></EXP>
+								<EXP><![CDATA[$C$Kurve]]></EXP>
 								<GROUP Id="RDK:19251777" Name="TeileArt" SubType="Generic">
 									<SET Id="RDK:19251776" VarRef="CSV_Item.TeileArt">
-										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Strecke")]]></EXP>
+										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Kurve")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
 								<GROUP Id="RDK:19251779" Name="Bezeichnung" SubType="Generic">
 									<SET Id="RDK:19251778" VarRef="CSV_Item.Bezeichnung">
-										<EXP><![CDATA[$=$ToJSON(ShapeItem.StreckeDefinition.Beschreibung)]]></EXP>
+										<EXP><![CDATA[$=$ToJSON(ShapeItem.KurveDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
@@ -18051,7 +18267,7 @@ me.x
 									</CALLFUNCTION>
 								</GROUP>
 								<GROUP Id="RDK:19251784" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:19251782" VarRef="StreckeMerkmale" ClearAll="True">
+									<SET_STRUCT Id="RDK:19251782" VarRef="KurveMerkmale" ClearAll="True">
 										<PAR Name="Anzahl Zusatzseparatoren">
 											<EXP><![CDATA[$=$0]]></EXP>
 										</PAR>
@@ -18059,14 +18275,14 @@ me.x
 											<EXP><![CDATA[$=$0]]></EXP>
 										</PAR>
 										<PAR Name="Länge in Meter">
-											<EXP><![CDATA[$=$StreckeData_defaults.L1]]></EXP>
+											<EXP><![CDATA[$=$KurveData_defaults.L1]]></EXP>
 										</PAR>
 										<PAR Name="Anzahl der Scanner">
 											<EXP><![CDATA[$=$0]]></EXP>
 										</PAR>
 									</SET_STRUCT>
 									<SET Id="RDK:19251783" VarRef="CSV_Item.Merkmale">
-										<EXP><![CDATA[$=$ToJSON(StreckeMerkmale)]]></EXP>
+										<EXP><![CDATA[$=$ToJSON(KurveMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
@@ -19155,13 +19371,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</IFTHENELSE>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19265781" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<IFTHENELSE Id="RDK:19265780">
 							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$IsEmpty(shape_item.StreckeDefinition.HoeheOben)]]></EXP>
+								<EXP><![CDATA[$=$IsEmpty(shape_item.KurveDefinition.H_0)]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$IsEmpty(shape_item.StreckeDefinition.HoeheUnten)]]></EXP>
+								<EXP><![CDATA[$=$IsEmpty(shape_item.KurveDefinition.H_1)]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:19265779" SubType="Then">
 								<SET Id="RDK:19265778" VarRef="Param.Result">
@@ -19563,10 +19779,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</CALLFUNCTION>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:20700303" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<CALLFUNCTION Id="RDK:20700309">
 							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$CreatePrototype_Strecke]]></EXP>
+								<EXP><![CDATA[$C$CreatePrototype_Kurve]]></EXP>
 							</PAR>
 							<PAR Name="InputExp">
 								<EXP><![CDATA[$=$shapeId]]></EXP>
@@ -20765,7 +20981,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19435281" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<SET Id="RDK:19435280" VarRef="color">
 							<EXP><![CDATA[$C$#6C6E70]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -20981,8 +21197,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</IFTHENELSE>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18827084" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
-						<COMMENTS Id="RDK:18827100" DesignTimeRemark="//Strecke hat Index == 0" />
+						<EXP><![CDATA[$C$Kurve]]></EXP>
+						<COMMENTS Id="RDK:18827100" DesignTimeRemark="//Kurve hat Index == 0" />
 						<SET Id="RDK:18827094" VarRef="cpId">
 							<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -21054,7 +21270,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:18827230" SubType="Then">
-								<SET Id="RDK:19223114" VarRef="item_0.StreckeDefinition.HoeheUnten">
+								<SET Id="RDK:19223114" VarRef="item_0.KurveDefinition.H_1">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -21063,21 +21279,21 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										<EXP><![CDATA[$=$Richtung=1]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:20622285" SubType="Then">
-										<SET Id="RDK:19223116" VarRef="item_0.StreckeDefinition.HoeheOben">
-											<EXP><![CDATA[$=$hoehe+StreckeData_defaults.Delta_h]]></EXP>
+										<SET Id="RDK:19223116" VarRef="item_0.KurveDefinition.H_0">
+											<EXP><![CDATA[$=$hoehe+KurveData_defaults.Delta_h]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
 									<GROUP Id="RDK:20622286" SubType="Else">
-										<SET Id="RDK:20622290" VarRef="item_0.StreckeDefinition.HoeheOben">
-											<EXP><![CDATA[$=$hoehe-StreckeData_defaults.Delta_h]]></EXP>
+										<SET Id="RDK:20622290" VarRef="item_0.KurveDefinition.H_0">
+											<EXP><![CDATA[$=$hoehe-KurveData_defaults.Delta_h]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
 								</IFTHENELSE>
 							</GROUP>
 							<GROUP Id="RDK:18827232" SubType="Else">
-								<SET Id="RDK:18827241" VarRef="item_0.StreckeDefinition.HoeheOben">
+								<SET Id="RDK:18827241" VarRef="item_0.KurveDefinition.H0">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -21086,14 +21302,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										<EXP><![CDATA[$=$Richtung=1]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:20622304" SubType="Then">
-										<SET Id="RDK:18827246" VarRef="item_0.StreckeDefinition.HoeheUnten">
-											<EXP><![CDATA[$=$hoehe+StreckeData_defaults.Delta_h]]></EXP>
+										<SET Id="RDK:18827246" VarRef="item_0.KurveDefinition.H_1">
+											<EXP><![CDATA[$=$hoehe+KurveData_defaults.Delta_h]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
 									<GROUP Id="RDK:20622305" SubType="Else">
-										<SET Id="RDK:20622315" VarRef="item_0.StreckeDefinition.HoeheUnten">
-											<EXP><![CDATA[$=$hoehe-StreckeData_defaults.Delta_h]]></EXP>
+										<SET Id="RDK:20622315" VarRef="item_0.KurveDefinition.H_1">
+											<EXP><![CDATA[$=$hoehe-KurveData_defaults.Delta_h]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
@@ -21258,13 +21474,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				<SELECTCASE Id="RDK:18741918">
 					<EXP><![CDATA[$=$item.family]]></EXP>
 					<CASEGROUP Id="RDK:18741919" CaseType="0">
-						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<SET Id="RDK:18827171" VarRef="h1">
-							<EXP><![CDATA[$=$item.StreckeDefinition.HoeheOben]]></EXP>
+							<EXP><![CDATA[$=$item.KurveDefinition.H_0]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18827173" VarRef="h0">
-							<EXP><![CDATA[$=$item.StreckeDefinition.HoeheUnten]]></EXP>
+							<EXP><![CDATA[$=$item.KurveDefinition.H_1]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<IFTHENELSE Id="RDK:18895307">
@@ -25545,6 +25761,414 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</GROUP>
 					</GROUP>
 				</GROUP>
+				<GROUP Id="RDK:20934642" Name="KurveUI" SubType="Generic">
+					<GROUP Id="RDK:20934648" Name="Kurve UI panels" SubType="Generic">
+						<GROUP Id="RDK:20936806" Name="KurvenAntriebsart" SubType="Generic">
+							<SET_STRUCT Id="RDK:20936816" VarRef="AntriebartItem" ClearAll="True" ListRef="AntriebsartList">
+								<PAR Name="Value">
+									<EXP><![CDATA[$C$1]]></EXP>
+								</PAR>
+								<PAR Name="Prompt">
+									<EXP><![CDATA[$C$Förderer]]></EXP>
+								</PAR>
+								<PAR Name="Image" />
+								<PAR Name="Tooltip" />
+								<PAR Name="Tags" />
+							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:20936818" VarRef="AntriebartItem" ClearAll="True" ListRef="AntriebsartList">
+								<PAR Name="Value">
+									<EXP><![CDATA[$C$0]]></EXP>
+								</PAR>
+								<PAR Name="Prompt">
+									<EXP><![CDATA[$C$Gefällestrecke]]></EXP>
+								</PAR>
+								<PAR Name="Image" />
+								<PAR Name="Tooltip" />
+								<PAR Name="Tags" />
+							</SET_STRUCT>
+						</GROUP>
+						<ACTION_CALL Id="RDK:20934652" Name="RDEngineering_ModernUIPanel" DesignTimeRemark="{PanelName} {BindingType}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Kurve]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ProfileName" />
+							<PAR Name="ToolbarDef" />
+							<PAR Name="ButtonList" />
+							<PAR Name="ButtonImgs" />
+							<PAR Name="ButtonAction" />
+							<PAR Name="ButtonOptions" />
+							<PAR Name="RulePageDef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="BindingType">
+								<EXP><![CDATA[$C$KurveType]]></EXP>
+							</PAR>
+							<PAR Name="RenderStatus" />
+							<PAR Name="Options" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:20934654" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Kurve]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$H_0]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$H0]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$H_0]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-3]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$textbox]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required" />
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
+							<PAR Name="Options" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:20934656" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 top point">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Kurve]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$H_1]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$H1]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$H_1]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-3]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$textbox]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required" />
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
+							<PAR Name="Options" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:20934658" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Kurve]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$Richtung]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Wechsel der Kurvenrichtung]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$Richtung]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-3]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$dropdownwithimages]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly" />
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource">
+								<EXP><![CDATA[$=$RichtungList]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:20934671" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Kurve]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$Art]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Wechsel der Antriebsart]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$Art]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-3]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$dropdownwithimages]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly" />
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource">
+								<EXP><![CDATA[$=$AntriebsartList]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</ACTION_CALL>
+					</GROUP>
+					<GROUP Id="RDK:20934662" Name="Buttons" SubType="Generic">
+						<ACTION_CALL Id="RDK:20934665" Name="RDEngineering_ModernUIPanel" DesignTimeRemark="{PanelName} {BindingType}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Kurve]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$2]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ProfileName" />
+							<PAR Name="ToolbarDef" />
+							<PAR Name="ButtonList" />
+							<PAR Name="ButtonImgs" />
+							<PAR Name="ButtonAction" />
+							<PAR Name="ButtonOptions" />
+							<PAR Name="RulePageDef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="BindingType">
+								<EXP><![CDATA[$C$KurveType]]></EXP>
+							</PAR>
+							<PAR Name="RenderStatus" />
+							<PAR Name="Options" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:20934667" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Kurve]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$2]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$OK_Button]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$OK]]></EXP>
+							</PAR>
+							<PAR Name="Field" />
+							<PAR Name="Value">
+								<EXP><![CDATA[$C$OK]]></EXP>
+							</PAR>
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes" />
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$button]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType">
+								<EXP><![CDATA[$C$SIMPLE]]></EXP>
+							</PAR>
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required" />
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly" />
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit" />
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
+							<PAR Name="Options" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:20934669" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Kurve]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$2]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$Abbrechen_Button]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Abbrechen]]></EXP>
+							</PAR>
+							<PAR Name="Field" />
+							<PAR Name="Value">
+								<EXP><![CDATA[$C$CLOSEPOPUP]]></EXP>
+							</PAR>
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes" />
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$button]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType">
+								<EXP><![CDATA[$C$SIMPLE]]></EXP>
+							</PAR>
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required" />
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly" />
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit" />
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
+							<PAR Name="Options" />
+						</ACTION_CALL>
+					</GROUP>
+				</GROUP>
 				<GROUP Id="RDK:973758" Name="WeicheUI" SubType="Generic">
 					<GROUP Id="RDK:975314" Name="Weichentyp" SubType="Generic">
 						<SET_STRUCT Id="RDK:975326" VarRef="WeicheTyp" ClearAll="True" ListRef="WeicheTypList">
@@ -25978,8 +26602,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="winkel">
 						<EXP><![CDATA[$C$2]]></EXP>
 					</PAR>
+					<PAR Name="FesteL1" />
 					<PAR Name="HoeheOben" />
 					<PAR Name="HoeheUnten" />
+					<PAR Name="winkel_th" />
 					<PAR Name="H_th" />
 					<PAR Name="n_Sep">
 						<EXP><![CDATA[$C$1]]></EXP>
@@ -25987,21 +26613,25 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="n_Scan">
 						<EXP><![CDATA[$C$0]]></EXP>
 					</PAR>
-					<PAR Name="FesteL1" />
-					<PAR Name="winkel_th" />
 				</SET_STRUCT>
 			</GROUP>
-			<GROUP Id="RDK:18732243" Name="Strecke" SubType="Generic">
-				<SET_STRUCT Id="RDK:18732242" VarRef="StreckeData_defaults" ClearAll="True">
+			<GROUP Id="RDK:18732243" Name="Kurve" SubType="Generic">
+				<SET_STRUCT Id="RDK:18732242" VarRef="KurveData_defaults" ClearAll="True">
 					<PAR Name="Beschreibung" />
 					<PAR Name="L1">
 						<EXP><![CDATA[$C$628]]></EXP>
 					</PAR>
-					<PAR Name="HoeheOben" />
-					<PAR Name="HoeheUnten" />
+					<PAR Name="H_0" />
+					<PAR Name="H_1" />
 					<PAR Name="Delta_h">
 						<EXP><![CDATA[$C$22]]></EXP>
 					</PAR>
+					<PAR Name="Richtung">
+						<EXP><![CDATA[$C$Ab]]></EXP>
+					</PAR>
+					<PAR Name="Art">
+						<EXP><![CDATA[$C$Gefällestrecke]]></EXP>
+					</PAR>
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:18118499" Name="Foerderer" SubType="Generic">