Skip to content

Sskw: render actuator with 0 value #2714

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
mariusheine merged 2 commits into from
Oct 4, 2026
Merged

Sskw: render actuator with 0 value #2714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff1c8c6
Sskw: render actuator with 0 value
TruongQuangSB Sep 30, 2026
b97c326
Update table reference
eclipse-set-bot Oct 4, 2026
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
7 changes: 4 additions & 3 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 @@ -790,16 +790,17 @@ class SskwTransformator extends AbstractPlanPro2TableModelTransformator {
)
} else {
val actuatorCount = components.
map[actuatorNumberSelector.apply(it)].filterNull.map[intValue].
reduce[p1, p2|p1.intValue + p2.intValue]
map[actuatorNumberSelector.apply(it)].filterNull.reduce [ p1, p2 |
p1 + p2
]
val position = components.filter [
fillPositionSupplementCondition.apply(it)
].map [
it -> actuatorNumberSelector.apply(it)
].map[key.getPosition(value, actuatorPositionSelector)].filter [
!nullOrEmpty && !blank
].toSet.join(", ")
if (actuatorCount === null || actuatorCount === 0) {
if (actuatorCount === null) {
return
}
fill(row, column, element, [
Expand Down
4 changes: 2 additions & 2 deletions ...ipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sskw_reference.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ richtung​​​​​​​​​​​​​​​​​​​​";"Schutz-
schiene​​​​​​​​​​​​​​​​​​​​​";"Regelzeichnung
Nr. (Bild)​​​​​​​​​​​​​​​​​​​​​​";DWS​​​​​​​​​​​​​​​​​​​​​​​;Art​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​
;;;;;;;;;;;St;;St;km/h;km/h;km/h;km/h;St;St;;;;;;;
1;"<p style=""text-align:left""><span>W41</span></p>";"<p style=""text-align:left""><span>EW</span></p>";"<p style=""text-align:center""><span>EW ​54-​190-​1:9</span></p>";"<p style=""text-align:center""><span>60B114</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span>120 ​(pmax)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​3101.0001 ​(1)​
1;"<p style=""text-align:left""><span>W41</span></p>";"<p style=""text-align:left""><span>EW</span></p>";"<p style=""text-align:center""><span>EW ​54-​190-​1:9</span></p>";"<p style=""text-align:center""><span>60B114</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>0 ​</span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span>120 ​(pmax)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​3101.0001 ​(1)​
<br></br>WSK_​2018_​W41</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
2;"<p style=""text-align:left""><span>W42</span></p>";"<p style=""text-align:left""><span>EW</span></p>";"<p style=""text-align:center""><span>EW ​54-​190-​1:9</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​3101.0001 ​(1)​
2;"<p style=""text-align:left""><span>W42</span></p>";"<p style=""text-align:left""><span>EW</span></p>";"<p style=""text-align:center""><span>EW ​54-​190-​1:9</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>0 ​</span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​3101.0001 ​(1)​
<br></br>WSK_​2018_​W42</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
3;"<p style=""text-align:left""><span>60W1</span></p>";"<p style=""text-align:left""><span>IBW</span></p>";"<p style=""text-align:center""><span>IBW ​60-​500-​1:12-​fb</span></p>";"<p style=""text-align:center""><span>60W1</span></p>";"<p style=""text-align:center""><span>60W2 ​L</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>R</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span>1 ​</span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>1</span></p>";"<p style=""text-align:center""><span>60 ​</span></p>";"<p style=""text-align:center""><span>120 ​(pmax)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>1 ​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​1262.0501 ​(1)​
<br></br>Sw ​1262.0501 ​(1)​
Expand Down
4 changes: 2 additions & 2 deletions ...rg.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sskw_reference.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ richtung​​​​​​​​​​​​​​​​​​​​";"Schutz-
schiene​​​​​​​​​​​​​​​​​​​​​";"Regelzeichnung
Nr. (Bild)​​​​​​​​​​​​​​​​​​​​​​";DWS​​​​​​​​​​​​​​​​​​​​​​​;Art​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​
;;;;;;;;;;;St;;St;km/h;km/h;km/h;km/h;St;St;;;;;;;
1;"<p style=""text-align:left""><span>W41</span></p>";"<p style=""text-align:left""><span>EW</span></p>";"<p style=""text-align:center""><span>EW ​54-​190-​1:9</span></p>";"<p style=""text-align:center""><span>60B114</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span>120 ​(pmax)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​3101.0001 ​(1)​
1;"<p style=""text-align:left""><span>W41</span></p>";"<p style=""text-align:left""><span>EW</span></p>";"<p style=""text-align:center""><span>EW ​54-​190-​1:9</span></p>";"<p style=""text-align:center""><span>60B114</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>0 ​</span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span>120 ​(pmax)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​3101.0001 ​(1)​
<br></br>WSK_​2018_​W41</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
2;"<p style=""text-align:left""><span>W42</span></p>";"<p style=""text-align:left""><span>EW</span></p>";"<p style=""text-align:center""><span>EW ​54-​190-​1:9</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​3101.0001 ​(1)​
2;"<p style=""text-align:left""><span>W42</span></p>";"<p style=""text-align:left""><span>EW</span></p>";"<p style=""text-align:center""><span>EW ​54-​190-​1:9</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>0 ​</span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span>40 ​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​3101.0001 ​(1)​
<br></br>WSK_​2018_​W42</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
3;"<p style=""text-align:left""><span>60W1</span></p>";"<p style=""text-align:left""><span>IBW</span></p>";"<p style=""text-align:center""><span>IBW ​60-​500-​1:12-​fb</span></p>";"<p style=""text-align:center""><span>60W1</span></p>";"<p style=""text-align:center""><span>60W2 ​L</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>R</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span>1 ​</span></p>";"<p style=""text-align:center""><span>reflekt.</span></p>";"<p style=""text-align:center""><span>1</span></p>";"<p style=""text-align:center""><span>60 ​</span></p>";"<p style=""text-align:center""><span>120 ​(pmax)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>1 ​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Sw ​1262.0501 ​(1)​
<br></br>Sw ​1262.0501 ​(1)​
Expand Down
Loading
Loading