Ssks, Sskp: update controlarea condition

java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/PZBElementExtensions.xtend

@@ -86,12 +86,16 @@ class PZBElementExtensions extends BasisObjektExtensions {
 
 	def static boolean isBelongToControlArea(PZB_Element pzb,
 		Stell_Bereich controlArea) {
+		val relevantStellelement = pzb?.stellelements?.filterNull?.filter [
+			IDInformation?.value.isBelongToControlArea(controlArea)
+		]
+		if (!relevantStellelement.isNullOrEmpty) {
+			return true
+		}
 		val signals = pzb?.PZBElementBezugspunkt?.filter(Signal)?.filter [
 			signalReal !== null && signalReal.signalRealAktiv === null
 		]
-		return !signals.nullOrEmpty && !pzb?.stellelements?.filterNull?.filter [
-			IDInformation?.value.isBelongToControlArea(controlArea)
-		].nullOrEmpty && signals.exists[controlArea.contains(it)]
+		return !signals.nullOrEmpty && signals.exists[controlArea.contains(it)]
 	}
 
 	def static Iterable<Stellelement> getStellelements(PZB_Element pzb) {

java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/SignalExtensions.xtend

@@ -445,11 +445,13 @@ class SignalExtensions extends PunktObjektExtensions {
 				isBelongToControlArea(controlArea)) {
 			return true
 		}
+
 		val existsFiktivesSignalFAPStart = signal.signalFiktiv !== null &&
 			signal.signalFiktiv.fiktivesSignalFunktion.exists [
 				wert === ENUM_FIKTIVES_SIGNAL_FUNKTION_FAP_START ||
 					wert === ENUM_FIKTIVES_SIGNAL_FUNKTION_ZENTRALBLOCK_START
 			]
+
 		if (existsFiktivesSignalFAPStart) {
 			val fstrFahrwegs = signal.container.fstrZugRangier.map [
 				IDFstrFahrweg.value
@@ -472,12 +474,15 @@ class SignalExtensions extends PunktObjektExtensions {
 				exists[controlArea.contains(it)]
 		}
 
-		if (signal.signalReal !== null ||
-			(!existsFiktivesSignalFAPStart && !existsFiktivesSignalFAPZiel)) {
+		if ((signal.signalReal !== null &&
+			signal.signalReal.signalRealAktiv === null) ||
+			(signal.signalFiktiv !== null && !existsFiktivesSignalFAPStart &&
+				!existsFiktivesSignalFAPZiel)) {
 			return signal.punktObjektTOPKante.exists [
 				controlArea.contains(it, tolerantDistance)
 			]
 		}
+
 		return false
 	}
 

java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A Linksdorf/sskp_dm_reference.csv

@@ -0,0 +1,49 @@
+Row;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z
+;Bezug;Bezug;PZB-Schutzstrecke​​;PZB-Schutzstrecke​​;PZB-Schutzstrecke​​;PZB-Schutzstrecke​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​
+;Bezug;Bezug;"PZB-
+Schutzpunkt​​";"Geschw.-
+klasse​​​";"PZB-
+Schutzstrecke​​​​";"PZB-
+Schutzstrecke​​​​";Gleismagnete​​​​​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;"maßgeb.
+Gefahrstelle​​​​​​​​​​";"Abstand zu
+maßgeb.
+Gefahrstelle​​​​​​​​​​​";"Abstand
+Bahnsteig
+zu GM 2000​​​​​​​​​​​​";"Abstand
+Bahnsteig
+zu GM 2000​​​​​​​​​​​​";"Abstand
+H-Tafel zu
+GM 2000
+[bis zu 4]​​​​​​​​​​​​​​";"Abstand Vorsignal-
+wdh. zu 
+GM 2000​​​​​​​​​​​​​​​";"Prüfdatum
+Wirkbereichs-
+bogen​​​​​​​​​​​​​​​​";Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​
+;"Bezugs-
+element";"Wirk-
+frequenz​";"PZB-
+Schutzpunkt​​";"Geschw.-
+klasse​​​";Soll​​​​;Ist​​​​​;"Wirk-
+samkeit​​​​​​";ggf. besondere Bedingungen für Wirksamkeit​​​​​​​;"Abstand zu 
+Bezugselement/
+Zielsignal​​​​​​​​";"Abstand 
+zu GM 
+2000​​​​​​​​​";"maßgeb.
+Gefahrstelle​​​​​​​​​​";"Abstand zu
+maßgeb.
+Gefahrstelle​​​​​​​​​​​";Anfang​​​​​​​​​​​​;Ende​​​​​​​​​​​​​;"Abstand
+H-Tafel zu
+GM 2000
+[bis zu 4]​​​​​​​​​​​​​​";"Abstand Vorsignal-
+wdh. zu 
+GM 2000​​​​​​​​​​​​​​​";"Prüfdatum
+Wirkbereichs-
+bogen​​​​​​​​​​​​​​​​";v Prüf​​​​​​​​​​​​​​​​​;t Prüf​​​​​​​​​​​​​​​​​​;"Mess-
+fehler​​​​​​​​​​​​​​​​​​​";"Mess-
+strecke​​​​​​​​​​​​​​​​​​​​";"Montage-
+variante​​​​​​​​​​​​​​​​​​​​​";Bauform​​​​​​​​​​​​​​​​​​​​​​;"ggf. Montage-
+ort des
+Schaltkastens​​​​​​​​​​​​​​​​​​​​​​​";"Energie-
+versorgung​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​
+;;Hz;;km/h;m;m;;;m;m;;m;m;m;m;m;;km/h;s;%;m;;;;;
+1;"<p style=""text-align:left""><span>Lf ​7 ​&#39;12&#39; ​km: ​117,100</span></p>";"<p style=""text-align:center""><span>2000 ​(GÜ)​</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:center""><span>stä. ​akt.</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:right""><span>-​355</span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:right""><span>135</span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:right""><span>45.00</span></p>";"<p style=""text-align:center""><span>1</span></p>";"<p style=""text-align:center""><span>PZ ​80</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>n</span></p>";"<p style=""text-align:left""></p>"

java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A Linksdorf/sskp_reference.csv

@@ -0,0 +1,49 @@
+Row;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z
+;Bezug;Bezug;PZB-Schutzstrecke​​;PZB-Schutzstrecke​​;PZB-Schutzstrecke​​;PZB-Schutzstrecke​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;INA​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​
+;Bezug;Bezug;"PZB-
+Schutzpunkt​​";"Geschw.-
+klasse​​​";"PZB-
+Schutzstrecke​​​​";"PZB-
+Schutzstrecke​​​​";Gleismagnete​​​​​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;Gleismagnete​​​​​​;"maßgeb.
+Gefahrstelle​​​​​​​​​​";"Abstand zu
+maßgeb.
+Gefahrstelle​​​​​​​​​​​";"Abstand
+Bahnsteig
+zu GM 2000​​​​​​​​​​​​";"Abstand
+Bahnsteig
+zu GM 2000​​​​​​​​​​​​";"Abstand
+H-Tafel zu
+GM 2000
+[bis zu 4]​​​​​​​​​​​​​​";"Abstand Vorsignal-
+wdh. zu 
+GM 2000​​​​​​​​​​​​​​​";"Prüfdatum
+Wirkbereichs-
+bogen​​​​​​​​​​​​​​​​";Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Geschwindigkeitsüberwachung​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​
+;"Bezugs-
+element";"Wirk-
+frequenz​";"PZB-
+Schutzpunkt​​";"Geschw.-
+klasse​​​";Soll​​​​;Ist​​​​​;"Wirk-
+samkeit​​​​​​";ggf. besondere Bedingungen für Wirksamkeit​​​​​​​;"Abstand zu 
+Bezugselement/
+Zielsignal​​​​​​​​";"Abstand 
+zu GM 
+2000​​​​​​​​​";"maßgeb.
+Gefahrstelle​​​​​​​​​​";"Abstand zu
+maßgeb.
+Gefahrstelle​​​​​​​​​​​";Anfang​​​​​​​​​​​​;Ende​​​​​​​​​​​​​;"Abstand
+H-Tafel zu
+GM 2000
+[bis zu 4]​​​​​​​​​​​​​​";"Abstand Vorsignal-
+wdh. zu 
+GM 2000​​​​​​​​​​​​​​​";"Prüfdatum
+Wirkbereichs-
+bogen​​​​​​​​​​​​​​​​";v Prüf​​​​​​​​​​​​​​​​​;t Prüf​​​​​​​​​​​​​​​​​​;"Mess-
+fehler​​​​​​​​​​​​​​​​​​​";"Mess-
+strecke​​​​​​​​​​​​​​​​​​​​";"Montage-
+variante​​​​​​​​​​​​​​​​​​​​​";Bauform​​​​​​​​​​​​​​​​​​​​​​;"ggf. Montage-
+ort des
+Schaltkastens​​​​​​​​​​​​​​​​​​​​​​​";"Energie-
+versorgung​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​
+;;Hz;;km/h;m;m;;;m;m;;m;m;m;m;m;;km/h;s;%;m;;;;;
+1;"<p style=""text-align:left""><span>Lf ​7 ​&#39;12&#39; ​km: ​117,100</span></p>";"<p style=""text-align:center""><span>2000 ​(GÜ)​</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:center""><span>stä. ​akt.</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:right""><span>-​355</span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:right""><span>135</span></p>";"<p style=""text-align:right""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:right""><span>45.00</span></p>";"<p style=""text-align:center""><span>1</span></p>";"<p style=""text-align:center""><span>PZ ​80</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>n</span></p>";"<p style=""text-align:left""></p>"