Skip to content

Commit f8b5b15

Browse files
committed
Use colspan=2 for the per-axle cells.
1 parent 1c55709 commit f8b5b15

File tree

1 file changed

+9
-2
lines changed
  • Source/RunActivity/Viewer3D/WebServices/Web/HUD

1 file changed

+9
-2
lines changed

Source/RunActivity/Viewer3D/WebServices/Web/HUD/index.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ function ApiHeadUpDisplay() {
8686
DebugWidthTofix = ['primitives','Camera'],
8787
// Force information
8888
ForceColSpanTo15 = ['Wind Speed'],
89-
ForceColSpanTo4 = ['(Simple adhesion model)','Dynamic brake'],
90-
ForceColSpanTo3 = ['Axle out force','Loco Adhesion','Wagon Adhesion'],
89+
ForceColSpanTo4 = ['(Advanced adhesion model)', '(Simple adhesion model)'],
90+
ForceColSpanTo3 = ['Wheel slip (Thres)', 'Conditions', 'Axle drive force', 'Axle brake force', 'Number of substeps', 'Wheel Adh. (Max)',
91+
'Axle out force', 'Comp Axle out force', 'Wheel speed (Slip)', 'Wheel ang. pos.', 'Loco Adhesion', 'Wagon Adhesion'],
9192
// Brake information
9293
BrakeColSpanTo2 = ['PlayerLoco','Brake Sys Vol'];
9394

@@ -96,6 +97,7 @@ function ApiHeadUpDisplay() {
9697
var colspanmax = false,
9798
colspan10 = false,
9899
colspan3 = false,
100+
colspan2 = false,
99101
fixwidth = false,
100102
locomotivetype = false;
101103

@@ -126,6 +128,10 @@ function ApiHeadUpDisplay() {
126128
locomotivetype = true;
127129
Str += "<td colspan='2' >" + obj.extraTable.values[next] + "</td>";
128130
}
131+
else if (colspan2)
132+
{
133+
Str += "<td class='td_nowrap' colspan='2' >" + obj.extraTable.values[next] + "</td>";
134+
}
129135
else if (colspan3 || BrakeColSpanTo2.indexOf(obj.extraTable.values[next]) !== -1){
130136
Str += "<td colspan='3' >" + obj.extraTable.values[next] + "</td>";
131137
}
@@ -144,6 +150,7 @@ function ApiHeadUpDisplay() {
144150
}
145151
else if (ForceColSpanTo3.indexOf(obj.extraTable.values[next]) !== -1 ){
146152
Str += "<td colspan='3' >" + obj.extraTable.values[next] + "</td>";
153+
colspan2 = true; // data cells in these row span two columns
147154
}
148155
else {
149156
// Apply colspan if required after first col

0 commit comments

Comments
 (0)