From 66b5057348b09c983487701477cafaff1efc958b Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 9 Jul 2024 17:17:18 +0200 Subject: [PATCH 01/10] =?UTF-8?q?Ctrl-c=20und=20Ctrl-v=20ging=20nicht=20f?= =?UTF-8?q?=C3=BCr=20F=C3=B6rderer=20und=20Gef=C3=A4llestrecke.=20Aufruf?= =?UTF-8?q?=20von=20CreatePrototype=20war=20vergessen=20worden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MAIN_SSG.rdx | 71 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index a049f83..ed667cd 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -6220,6 +6220,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + @@ -13058,6 +13059,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + + + + + + + + + + + + "OnPasted"]]> @@ -13229,6 +13242,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + + + + + + + + + + + + "OnPasted"]]> @@ -14294,10 +14319,38 @@ me.x + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -14307,18 +14360,6 @@ me.x - - - - - - - - - - - - @@ -24858,4 +24899,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - + \ No newline at end of file From 19434cc74eac1a3c418f19bea3641b39b5cb5107 Mon Sep 17 00:00:00 2001 From: Simon Schmutzler Date: Wed, 10 Jul 2024 12:10:54 +0200 Subject: [PATCH 02/10] =?UTF-8?q?InheritHeight=20Funktion=20gefixt;=20Bere?= =?UTF-8?q?chnung=20erfolgt=20ohne=20ShapePrototype;=20Einziger=20=C3=9Cbe?= =?UTF-8?q?rgabeparameter=20ist=20die=20ShapeId=20des=20Parent=20Elements,?= =?UTF-8?q?=20dessen=20H=C3=B6he=20an=20alle=20Children=20vererbt=20wird?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MAIN_SSG.rdx | 203 +++++++++++++++++++++++++++++---------------------- 1 file changed, 114 insertions(+), 89 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 510144b..8b79e61 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -465,7 +465,7 @@ - + @@ -827,12 +827,12 @@ - + - + @@ -5715,9 +5715,20 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + - + + + + + + + + + + + + @@ -5730,8 +5741,8 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - - + + @@ -5747,7 +5758,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + @@ -5757,10 +5768,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - Shape_Prototype.GefaelleDefinition.HoeheOben]]> + - Shape_Prototype.GefaelleDefinition.HoeheUnten]]> + @@ -5774,13 +5785,16 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + + + + @@ -5795,7 +5809,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + @@ -5817,7 +5831,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + @@ -5841,15 +5855,15 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + - + - + @@ -5883,7 +5897,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + @@ -9477,28 +9491,51 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + + - + - - + + - + + - + + + + + + + + + + + + + + + + + + + + + + - + @@ -9517,6 +9554,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + + + + @@ -9534,7 +9575,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + @@ -9588,6 +9629,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + + + + @@ -9675,11 +9720,15 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + + + + - + @@ -9688,7 +9737,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + @@ -9973,23 +10022,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - - - - - - - - - - - - + @@ -14673,6 +14711,23 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + + + + + + + + + + + + + + + + + @@ -14831,7 +14886,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + Shape_Prototype.GefaelleDefinition.HoeheOben]]> @@ -14975,7 +15030,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + Shape_Prototype.StreckeDefinition.HoeheOben]]> @@ -15193,7 +15248,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + Shape_Prototype.FoerdererDefinition.H_1]]> @@ -17657,6 +17712,7 @@ me.x + @@ -17688,24 +17744,12 @@ me.x - - - - - - - - - - - - - + @@ -17717,6 +17761,11 @@ me.x + + + + + @@ -17861,7 +17910,7 @@ me.x - + @@ -18089,12 +18138,12 @@ me.x - + - + - + @@ -20551,7 +20600,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -20575,36 +20624,12 @@ ShapeList["id="+Param.Input[1].shapeID].name - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -25177,7 +25202,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -25230,7 +25255,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + From 4495619a4588ff19201d3a04ac9cdf2b5d724124 Mon Sep 17 00:00:00 2001 From: mistangl Date: Wed, 10 Jul 2024 15:47:35 +0200 Subject: [PATCH 03/10] Tippfehler 'CreateFoerder' berichtigt --- MAIN_SSG.rdx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 95d57cf..649157f 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -466,7 +466,7 @@ - + @@ -828,12 +828,12 @@ - + - + @@ -13299,7 +13299,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + @@ -24924,4 +24924,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - + \ No newline at end of file From 7b0eb498793a38e40f51a652ca6237f93ecc980f Mon Sep 17 00:00:00 2001 From: mistangl Date: Wed, 10 Jul 2024 16:40:08 +0200 Subject: [PATCH 04/10] Pattern Funktion begonnen --- MAIN_SSG.rdx | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 649157f..5a94bc6 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -995,6 +995,7 @@ + @@ -10040,15 +10041,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - - - - - - - - - @@ -15639,7 +15631,6 @@ me.x - @@ -15647,7 +15638,6 @@ me.x - @@ -15656,6 +15646,13 @@ me.x + + + + + + + @@ -15672,6 +15669,25 @@ me.x + + + + + + + + + + + + + + + + + + + From 2149b2c2457a819e12337e1aa089fbd2a2181299 Mon Sep 17 00:00:00 2001 From: Simon Schmutzler Date: Tue, 16 Jul 2024 10:29:33 +0200 Subject: [PATCH 05/10] Fix: InheritHeight Aufruf nur durch Kreisel/Eckrad, sonst SetHeightOnConnect --- MAIN_SSG.rdx | 473 ++++++++++++++++++++++----------------------------- 1 file changed, 206 insertions(+), 267 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 95d57cf..54f287f 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -466,7 +466,7 @@ - + @@ -828,12 +828,12 @@ - + - + @@ -9524,6 +9524,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + @@ -13299,7 +13300,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + @@ -14487,18 +14488,42 @@ me.x - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14758,141 +14685,167 @@ me.x - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Shape_Prototype.EckradDefinition.Drehung]]> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Shape_Prototype.EckradDefinition.Drehung]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14964,32 +14917,6 @@ me.x - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15054,6 +14981,18 @@ me.x + + + + + + + + + + + + @@ -17489,7 +17428,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -17501,7 +17440,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -18287,7 +18226,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -24924,4 +24863,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - + \ No newline at end of file From 9de80c35322452f0c72592f39043b77ec9a554b3 Mon Sep 17 00:00:00 2001 From: Simon Schmutzler Date: Tue, 16 Jul 2024 11:11:53 +0200 Subject: [PATCH 06/10] =?UTF-8?q?UpdateShape=20aktualisiert=20f=C3=BCr=20d?= =?UTF-8?q?ie=203D=20Vorschau=20die=20Shapes=20f=C3=BCr=20alle=20aktuellen?= =?UTF-8?q?=20Typen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MAIN_SSG.rdx | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 185 insertions(+), 1 deletion(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 54f287f..3f17862 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -4276,6 +4276,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -4289,6 +4290,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -14881,6 +14883,18 @@ me.x + + + + + + + + + + + + @@ -17355,6 +17369,176 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a730bf9c9832914c119080e5f7609ade6c004d4e Mon Sep 17 00:00:00 2001 From: Simon Schmutzler Date: Tue, 16 Jul 2024 11:18:50 +0200 Subject: [PATCH 07/10] =?UTF-8?q?=C3=9Cberfl=C3=BCssige=20globale=20Variab?= =?UTF-8?q?len=20entfernt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MAIN_SSG.rdx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 4db9009..a273651 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -987,15 +987,6 @@ - - - - - - - - - @@ -25063,4 +25054,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - + \ No newline at end of file From dc9d215496fa06d966055c30f8064c9dc134f0cd Mon Sep 17 00:00:00 2001 From: Simon Schmutzler Date: Tue, 16 Jul 2024 11:43:42 +0200 Subject: [PATCH 08/10] =?UTF-8?q?Aufruf=20der=20Set=5FUndef=20Funktion=20f?= =?UTF-8?q?=C3=BCr=20SetStatus=20allgemein=20gemacht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MAIN_SSG.rdx | 156 +++++++++++++++++---------------------------------- 1 file changed, 50 insertions(+), 106 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index a273651..12bb906 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -3609,7 +3609,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - @@ -3619,18 +3618,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - - - - - - - - - - - - @@ -5056,7 +5043,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -5068,39 +5055,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17106,20 +17060,17 @@ ShapeList["id="+Param.Input[1].shapeID].name - - - - - - - - - - + + + + + + + @@ -17618,30 +17569,10 @@ ShapeList["id="+Param.Input[1].shapeID].name - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -17676,30 +17607,10 @@ ShapeList["id="+Param.Input[1].shapeID].name - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -18383,6 +18294,7 @@ ShapeList["id="+Param.Input[1].shapeID].name + @@ -18396,6 +18308,38 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 25352954bfcc69b9689087a73fa1e65f1d0792c9 Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 16 Jul 2024 11:52:48 +0200 Subject: [PATCH 09/10] Small FIX: Strecke wurde als Gefaellestrecke ins CSV Exportiert --- MAIN_SSG.rdx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 12bb906..4a78447 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -747,7 +747,7 @@ - + @@ -773,7 +773,7 @@ - + @@ -808,13 +808,13 @@ - + - + @@ -15989,7 +15989,7 @@ me.x - + From d65fe9b760f3f428c95f8e20fdfab7fb5c9e34e3 Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 16 Jul 2024 13:25:08 +0200 Subject: [PATCH 10/10] BTMT Beladung benutze noch die Datei BTMTBeladung_Default im svg Ordner --- MAIN_SSG.rdx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 4a78447..70ab5d0 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -747,7 +747,7 @@ - + @@ -773,7 +773,7 @@ - + @@ -808,13 +808,13 @@ - + - + @@ -4574,7 +4574,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -4586,6 +4586,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -4648,7 +4649,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -4721,6 +4722,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -4813,10 +4815,12 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + @@ -4878,8 +4882,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - -