fly/flightgear
1
0
Fork 0
Code Activity

HUD: make vertical gauges look the same as horizontal ones (ticket 2374).

Browse source
This commit is contained in:
Michael Danilov 2021-08-18 22:52:39 +02:00
parent abbfa6578c
commit 732548bcb1
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Instrumentation/HUD/HUD_gauge.cxx
View file

@ -54,6 +54,7 @@ void HUD::Gauge::draw(void)
float right = _x + _w; float right = _x + _w;
float top = _y + _h; float top = _y + _h;
float bottom_4 = _h / 4.0; // FIXME float bottom_4 = _h / 4.0; // FIXME
float right_4 = _w / 4.0;
// Draw the basic markings for the scale... // Draw the basic markings for the scale...
if (option_vert()) { // Vertical scale if (option_vert()) { // Vertical scale
@ -68,12 +69,12 @@ void HUD::Gauge::draw(void)
if (option_left()) { // Read left, so line down right side if (option_left()) { // Read left, so line down right side
draw_line(right, _y, right, top); draw_line(right, _y, right, top);
marker_xs = marker_xe - _w / 3.0; // Adjust tick marker_xs = marker_xe - _w / 2.0; // Adjust tick
} }
if (option_right()) { // Read right, so down left sides if (option_right()) { // Read right, so down left sides
draw_line(_x, _y, _x, top); draw_line(_x, _y, _x, top);
marker_xe = _x + _w / 3.0; // Adjust tick marker_xe = _x + _w / 2.0; // Adjust tick
} }
// At this point marker x_start and x_end values are transposed. // At this point marker x_start and x_end values are transposed.
@ -102,13 +103,13 @@ void HUD::Gauge::draw(void)
if (_minor_divs) { // Minor tick marks if (_minor_divs) { // Minor tick marks
if (!(i % (int)_minor_divs)) { if (!(i % (int)_minor_divs)) {
if (option_left() && option_right()) { if (option_left() && option_right()) {
draw_line(_x, marker_ys, marker_xs - 3, marker_ys); draw_line(_x, marker_ys, marker_xs - 4, marker_ys);
draw_line(marker_xe + 3, marker_ys, right, marker_ys); draw_line(marker_xe + 4, marker_ys, right, marker_ys);
} else if (option_left()) { } else if (option_left()) {
draw_line(marker_xs + 3, marker_ys, marker_xe, marker_ys); draw_line(marker_xs + 4, marker_ys, marker_xe, marker_ys);
} else { } else {
draw_line(marker_xs, marker_ys, marker_xe - 3, marker_ys); draw_line(marker_xs, marker_ys, marker_xe - 4, marker_ys);
} }
} }
} }
@ -147,12 +148,12 @@ void HUD::Gauge::draw(void)
text_y = _y + ((cur_value - vmin) * factor() /*+.5f*/); text_y = _y + ((cur_value - vmin) * factor() /*+.5f*/);
if (option_right()) { if (option_right()) {
_hud->_line_list.add(LineSegment(_x, text_y + 5, marker_xe, text_y)); _hud->_line_list.add(LineSegment(_x, text_y + right_4, marker_xe, text_y));
_hud->_line_list.add(LineSegment(marker_xe, text_y, _x, text_y - 5)); _hud->_line_list.add(LineSegment(marker_xe, text_y, _x, text_y - right_4));
} }
if (option_left()) { if (option_left()) {
_hud->_line_list.add(LineSegment(right, text_y + 5, marker_xs, text_y)); _hud->_line_list.add(LineSegment(right, text_y + right_4, marker_xs, text_y));
_hud->_line_list.add(LineSegment(marker_xs, text_y, right, text_y - 5)); _hud->_line_list.add(LineSegment(marker_xs, text_y, right, text_y - right_4));
} }
// End if VERTICAL SCALE TYPE // End if VERTICAL SCALE TYPE