Skip to content

Commit bf51fad

Browse files
Sskw: update column K (#1861)
* Sskw: update column K * Update table reference --------- Co-authored-by: eclipse-set-bot <[email protected]>
1 parent 857f57a commit bf51fad

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator {
277277
transformMultiColorContent(
278278
elementKomponenten,
279279
[zungenpaar?.elektrischerAntriebAnzahl?.wert],
280-
[zungenpaar?.elektrischerAntriebLage]
280+
[zungenpaar?.elektrischerAntriebLage],
281+
[true]
281282
)
282283
],
283284
"+"
@@ -680,7 +681,8 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator {
680681
transformMultiColorContent(
681682
WKrGspKomponenten,
682683
actuatorCount,
683-
actuatorPosition
684+
actuatorPosition,
685+
[kreuzung !== null]
684686
)
685687
],
686688
"+"
@@ -794,18 +796,19 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator {
794796
private def List<MultiColorContent> transformMultiColorContent(
795797
Iterable<W_Kr_Gsp_Komponente> components,
796798
(W_Kr_Gsp_Komponente)=>BigInteger actuatorNumberSelector,
797-
(W_Kr_Gsp_Komponente)=>Elektrischer_Antrieb_Lage_TypeClass actuatorPositionSelector
799+
(W_Kr_Gsp_Komponente)=>Elektrischer_Antrieb_Lage_TypeClass actuatorPositionSelector,
800+
(W_Kr_Gsp_Komponente)=>Boolean fillPositionSupplementCondition
798801
) {
799802
return components.map [
800-
801803
val multiColorContent = TablemodelFactory.eINSTANCE.
802804
createMultiColorContent
803805
// Only rendered multicolor by DIFF state
804806
multiColorContent.disableMultiColor = true
805807
val actuator = actuatorNumberSelector.apply(it)
806808
val noOfActuators = actuator !== null ? actuator.intValue : 0
807809
val position = it.getPosition(actuator, actuatorPositionSelector)
808-
val fillPositionCondition = noOfActuators > 0 && position !== null && kreuzung !== null
810+
val fillPositionCondition = noOfActuators > 0 &&
811+
position !== null && fillPositionSupplementCondition.apply(it)
809812
if (austauschAntriebe?.wert === true &&
810813
container.containerType == ContainerType.FINAL) {
811814
multiColorContent.multiColorValue = noOfActuators.toString

0 commit comments

Comments
 (0)