Skip to content

Sskw: update column K #1861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2025
Merged

Sskw: update column K #1861

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07a5324
Sskw: update column K
TruongQuangSB Sep 12, 2025
c99a026
Update table reference
eclipse-set-bot Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions ....set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskw/SskwTransformator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator {
transformMultiColorContent(
elementKomponenten,
[zungenpaar?.elektrischerAntriebAnzahl?.wert],
[zungenpaar?.elektrischerAntriebLage]
[zungenpaar?.elektrischerAntriebLage],
[true]
)
],
"+"
Expand Down Expand Up @@ -680,7 +681,8 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator {
transformMultiColorContent(
WKrGspKomponenten,
actuatorCount,
actuatorPosition
actuatorPosition,
[kreuzung !== null]
)
],
"+"
Expand Down Expand Up @@ -794,18 +796,19 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator {
private def List<MultiColorContent> transformMultiColorContent(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest renaming this fn to indicate it's intention/purpose. Maybe the bug wouldn't have been introduced, if it were clear this is also used for filling column K.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it isn't used for column K, column R use it also. The different is only the condition to visualation actutorPosition

Iterable<W_Kr_Gsp_Komponente> 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
multiColorContent.disableMultiColor = true
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
Expand Down
Loading