diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend index 3e290e66e..b62234b1c 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend @@ -277,7 +277,8 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator { transformMultiColorContent( elementKomponenten, [zungenpaar?.elektrischerAntriebAnzahl?.wert], - [zungenpaar?.elektrischerAntriebLage] + [zungenpaar?.elektrischerAntriebLage], + [true] ) ], "+" @@ -680,7 +681,8 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator { transformMultiColorContent( WKrGspKomponenten, actuatorCount, - actuatorPosition + actuatorPosition, + [kreuzung !== null] ) ], "+" @@ -794,10 +796,10 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator { private def List transformMultiColorContent( Iterable components, (W_Kr_Gsp_Komponente)=>BigInteger actuatorNumberSelector, - (W_Kr_Gsp_Komponente)=>Elektrischer_Antrieb_Lage_TypeClass actuatorPositionSelector + (W_Kr_Gsp_Komponente)=>Elektrischer_Antrieb_Lage_TypeClass actuatorPositionSelector, + (W_Kr_Gsp_Komponente)=>Boolean fillPositionSupplementCondition ) { return components.map [ - val multiColorContent = TablemodelFactory.eINSTANCE. createMultiColorContent // Only rendered multicolor by DIFF state @@ -805,7 +807,8 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator { val actuator = actuatorNumberSelector.apply(it) val noOfActuators = actuator !== null ? actuator.intValue : 0 val position = it.getPosition(actuator, actuatorPositionSelector) - val fillPositionCondition = noOfActuators > 0 && position !== null && kreuzung !== null + val fillPositionCondition = noOfActuators > 0 && + position !== null && fillPositionSupplementCondition.apply(it) if (austauschAntriebe?.wert === true && container.containerType == ContainerType.FINAL) { multiColorContent.multiColorValue = noOfActuators.toString diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sskw_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sskw_reference.csv index 2aa11af6f..b00f45367 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sskw_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sskw_reference.csv @@ -22,29 +22,29 @@ Nr. (Bild)​​​​​​​​​​​​​​​​​​​​​​";DW 1;"

W22

";"

EW

";"

54-​190-​1:9

";"

60G123

";"

";"

";"

";"

";"

";"

";"

0

";"

reflekt.

";"

0

";"

0 ​

";"

160 ​

";"

";"

";"

";"

";"

";"

";"

";"

";"

□

";"

";"

" 2;"

W41

";"

EW

";"

54-​190-​1:9

";"

60B114

";"

";"

";"

";"

";"

";"

□

";"

0

";"

reflekt.

";"

0

";"

40 ​

";"

160 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

";"

x

";"

";"

" 3;"

W42

";"

EW

";"

54-​190-​1:9

";"

";"

";"

";"

";"

";"

";"

□

";"

0

";"

reflekt.

";"

0

";"

160 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​3101.0001 ​(1)​

";"

x

";"

";"

" -4;"

60W1

";"

IBW

";"

60-​500-​1:12-​fb

";"

60W1

";"

60W2 ​L

";"

";"

";"

R

";"

x

";"

x

";"

1

";"

reflekt.

";"

1

";"

60 ​

";"

160 ​(pmax)​

";"

";"

";"

1

";"

";"

";"

";"

";"

Sw ​1262.0501 ​(1)​

";"

x

";"

";"

" -5;"

60W2

";"

ABW

";"

60-​500-​1:12-​fb

";"

60W2

";"

60W1 ​L

";"

";"

";"

R

";"

x

";"

x

";"

1

";"

reflekt.

";"

1

";"

60 ​

";"

160 ​

";"

";"

";"

1

";"

";"

";"

";"

";"

Sw ​1262.0501 ​(1)​

";"

x

";"

";"

" -6;"

60W3

";"

ABW

";"

54-​500-​1:12

";"

60W3

";"

60W4 ​L

";"

";"

";"

R

";"

x

";"

□

";"

1

";"

";"

1

";"

60 ​

";"

160 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1151.0501 ​(2)​

";"

x

";"

";"

" -7;"

60W4

";"

EW

";"

54-​500-​1:12

";"

60W4

";"

60W3 ​L

";"

";"

";"

";"

□

";"

□

";"

1

";"

reflekt.

";"

1

";"

60 ​

";"

160 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1151.0501 ​(1)​

";"

x

";"

";"

" -8;"

60W5

";"

EW

";"

49-​190-​1:9

";"

60W5

";"

60W6

";"

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" -9;"

60W6

";"

EW

";"

54-​190-​1:9

";"

60W6

";"

60W7

";"

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

120 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" -10;"

60W7

";"

EW

";"

54-​190-​1:9

";"

60W6

";"

";"

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

120 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" +4;"

60W1

";"

IBW

";"

60-​500-​1:12-​fb

";"

60W1

";"

60W2 ​L

";"

";"

";"

R

";"

x

";"

x

";"

1 ​(keine ​Lage)​

";"

reflekt.

";"

1

";"

60 ​

";"

160 ​(pmax)​

";"

";"

";"

1

";"

";"

";"

";"

";"

Sw ​1262.0501 ​(1)​

";"

x

";"

";"

" +5;"

60W2

";"

ABW

";"

60-​500-​1:12-​fb

";"

60W2

";"

60W1 ​L

";"

";"

";"

R

";"

x

";"

x

";"

1 ​(keine ​Lage)​

";"

reflekt.

";"

1

";"

60 ​

";"

160 ​

";"

";"

";"

1

";"

";"

";"

";"

";"

Sw ​1262.0501 ​(1)​

";"

x

";"

";"

" +6;"

60W3

";"

ABW

";"

54-​500-​1:12

";"

60W3

";"

60W4 ​L

";"

";"

";"

R

";"

x

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

1

";"

60 ​

";"

160 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1151.0501 ​(2)​

";"

x

";"

";"

" +7;"

60W4

";"

EW

";"

54-​500-​1:12

";"

60W4

";"

60W3 ​L

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

reflekt.

";"

1

";"

60 ​

";"

160 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1151.0501 ​(1)​

";"

x

";"

";"

" +8;"

60W5

";"

EW

";"

49-​190-​1:9

";"

60W5

";"

60W6

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" +9;"

60W6

";"

EW

";"

54-​190-​1:9

";"

60W6

";"

60W7

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

120 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" +10;"

60W7

";"

EW

";"

54-​190-​1:9

";"

60W6

";"

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

120 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" 11;"

60W8

";"

";"

";"

60W6

";"

";"

";"

";"

auf

";"

□

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

1

";"

□

";"

R

";"

□

";"

S ​7320.10

";"

";"

";"

" -12;"

60W24

";"

EW

";"

54-​190-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +12;"

60W24

";"

EW

";"

54-​190-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" 13;"

60W25

";"

";"

";"

60W24

";"

";"

";"

";"

auf

";"

□

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

1

";"

□

";"

R

";"

□

";"

S ​7320.7

";"

";"

";"

" -14;"

60W26

";"

EW

";"

54-​190-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +14;"

60W26

";"

EW

";"

54-​190-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" 15;"

60W27

";"

";"

";"

60W24

";"

";"

";"

";"

auf

";"

□

";"

";"

";"

";"

";"

";"

";"

";"

";"

";"

1

";"

□

";"

R

";"

x

";"

S ​7320.7

";"

";"

";"

" -16;"

60W28AB

";"

DKW

";"

54-​190-​1:9

";"

60W28

";"

60W29 ​R

";"

";"

";"

";"

□

";"

□

";"

0+1

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

100 ​

";"

100 ​

";"

";"

";"

";"

";"

";"

Sw ​1451.0121 ​(2)​

";"

x

";"

";"

" -17;"

60W28CD

";"

DKW

";"

54-​190-​1:9

";"

60W28

";"

60W24

";"

";"

";"

";"

□

";"

□

";"

0+1

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

100 ​

";"

100 ​

";"

";"

";"

";"

";"

";"

Sw ​1451.0121 ​(1)​

";"

x

";"

";"

" -18;"

60W29

";"

EW

";"

54-​190-​1:9

";"

60W29

";"

";"

60W28AB ​R

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

120 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" -19;"

60W30

";"

EW

";"

54-​300-​1:9

";"

60W30

";"

";"

60W31 ​R

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

120 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" -20;"

60W31

";"

EW

";"

54-​300-​1:9

";"

60W31

";"

";"

60W30 ​R

";"

";"

L

";"

x

";"

□

";"

1

";"

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" -21;"

60W32

";"

EW

";"

54-​300-​1:9

";"

60W31

";"

";"

60W33 ​R

";"

";"

L

";"

x

";"

□

";"

1

";"

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" -22;"

60W33

";"

EW

";"

54-​300-​1:9

";"

60W33

";"

";"

60W32 ​R

";"

";"

L

";"

x

";"

□

";"

1

";"

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" -23;"

60W34

";"

EW

";"

54-​190-​1:9

";"

60W34

";"

";"

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

160 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" -24;"

60W35

";"

EW

";"

54-​300-​1:9

";"

60W33

";"

";"

";"

";"

L

";"

x

";"

□

";"

1

";"

reflekt.

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" -25;"

60W36

";"

ABW

";"

54-​300-​1:9

";"

60W36

";"

";"

";"

";"

L

";"

x

";"

□

";"

1

";"

reflekt.

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" -26;"

60W51

";"

EW

";"

49-​190-​1:9

";"

60W51

";"

";"

";"

";"

";"

□

";"

□

";"

1

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" -27;"

60W52

";"

EW

";"

54-​300-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1

";"

innenbel.

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" -28;"

60W53

";"

EW

";"

49-​300-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1

";"

innenbel.

";"

0

";"

50 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" -29;"

60W54

";"

ABW

";"

49-​190-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1

";"

";"

0

";"

40 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +16;"

60W28AB

";"

DKW

";"

54-​190-​1:9

";"

60W28

";"

60W29 ​R

";"

";"

";"

";"

□

";"

□

";"

0+1 ​(keine ​Lage)​

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

100 ​

";"

100 ​

";"

";"

";"

";"

";"

";"

Sw ​1451.0121 ​(2)​

";"

x

";"

";"

" +17;"

60W28CD

";"

DKW

";"

54-​190-​1:9

";"

60W28

";"

60W24

";"

";"

";"

";"

□

";"

□

";"

0+1 ​(keine ​Lage)​

";"

reflekt.

";"

0

";"

40 ​

";"

40 ​

";"

100 ​

";"

100 ​

";"

";"

";"

";"

";"

";"

Sw ​1451.0121 ​(1)​

";"

x

";"

";"

" +18;"

60W29

";"

EW

";"

54-​190-​1:9

";"

60W29

";"

";"

60W28AB ​R

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

120 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +19;"

60W30

";"

EW

";"

54-​300-​1:9

";"

60W30

";"

";"

60W31 ​R

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

120 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" +20;"

60W31

";"

EW

";"

54-​300-​1:9

";"

60W31

";"

";"

60W30 ​R

";"

";"

L

";"

x

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +21;"

60W32

";"

EW

";"

54-​300-​1:9

";"

60W31

";"

";"

60W33 ​R

";"

";"

L

";"

x

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" +22;"

60W33

";"

EW

";"

54-​300-​1:9

";"

60W33

";"

";"

60W32 ​R

";"

";"

L

";"

x

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" +23;"

60W34

";"

EW

";"

54-​190-​1:9

";"

60W34

";"

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

160 ​

";"

40 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +24;"

60W35

";"

EW

";"

54-​300-​1:9

";"

60W33

";"

";"

";"

";"

L

";"

x

";"

□

";"

1 ​(keine ​Lage)​

";"

reflekt.

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +25;"

60W36

";"

ABW

";"

54-​300-​1:9

";"

60W36

";"

";"

";"

";"

L

";"

x

";"

□

";"

1 ​(keine ​Lage)​

";"

reflekt.

";"

0

";"

160 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(2)​

";"

x

";"

";"

" +26;"

60W51

";"

EW

";"

49-​190-​1:9

";"

60W51

";"

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

reflekt.

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +27;"

60W52

";"

EW

";"

54-​300-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

innenbel.

";"

0

";"

40 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +28;"

60W53

";"

EW

";"

49-​300-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

innenbel.

";"

0

";"

50 ​

";"

120 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

" +29;"

60W54

";"

ABW

";"

49-​190-​1:9

";"

60W24

";"

";"

";"

";"

";"

□

";"

□

";"

1 ​(keine ​Lage)​

";"

";"

0

";"

40 ​

";"

50 ​

";"

";"

";"

";"

";"

";"

";"

";"

Sw ​1101.0001 ​(1)​

";"

x

";"

";"

"