diff --git a/src/Cockpit/Makefile.am b/src/Cockpit/Makefile.am index bc94710e3..9908c36a9 100644 --- a/src/Cockpit/Makefile.am +++ b/src/Cockpit/Makefile.am @@ -5,7 +5,6 @@ libCockpit_a_SOURCES = \ hud.cxx hud.hxx \ hud_card.cxx hud_dnst.cxx hud_gaug.cxx hud_inst.cxx \ hud_labl.cxx hud_ladr.cxx \ - hud_lat.cxx hud_lon.cxx \ hud_rwy.cxx \ hud_scal.cxx hud_tbi.cxx \ panel.cxx panel.hxx \ diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx index da3bf862f..2cc0acc84 100644 --- a/src/Cockpit/hud.hxx +++ b/src/Cockpit/hud.hxx @@ -548,71 +548,6 @@ public: }; -class lat_label : public instr_item { -private: - const char *pformat; - const char *pre_str; - const char *post_str; - fgLabelJust justify; - int fontSize; - int blink; - char format_buffer[80]; - -public: - lat_label( int x, - int y, - UINT width, - UINT height, - FLTFNPTR data_source, - const char *label_format, - const char *pre_label_string, - const char *post_label_string, - float scale_data, - UINT options, - fgLabelJust justification, - int font_size, - int blinking, - bool working, - int digits =0 ); - - lat_label( const lat_label & image); - virtual void draw( void ); // Required method in base class -}; - - -class lon_label : public instr_item { -private: - const char *pformat; - const char *pre_str; - const char *post_str; - fgLabelJust justify; - int fontSize; - int blink; - char format_buffer[80]; - -public: - lon_label( int x, - int y, - UINT width, - UINT height, - FLTFNPTR data_source, - const char *label_format, - const char *pre_label_string, - const char *post_label_string, - float scale_data, - UINT options, - fgLabelJust justification, - int font_size, - int blinking, - bool working, - int digit=0); - - - lon_label( const lon_label & image); - virtual void draw( void ); // Required method in base class -}; - - // // fgRunway_instr This class is responsible for rendering the active runway // in the hud (if visible). diff --git a/src/Cockpit/hud_lat.cxx b/src/Cockpit/hud_lat.cxx deleted file mode 100644 index 6abd38090..000000000 --- a/src/Cockpit/hud_lat.cxx +++ /dev/null @@ -1,91 +0,0 @@ -#include "hud.hxx" - -#ifdef USE_HUD_TextList -#define textString(x, y, text, digit) TextString(text, x , y ,digit) -#else -#define textString(x, y, text, digit) puDrawString(guiFnt, text, x, y) -#endif - -//======================= Top of instr_label class ========================= -lat_label::lat_label(int x, - int y, - UINT width, - UINT height, - FLTFNPTR data_source, - const char *label_format, - const char *pre_label_string, - const char *post_label_string, - float scale_data, - UINT options, - fgLabelJust justification, - int font_size, - int blinking, - bool working , - int digit) : - instr_item( x, y, width, height, - data_source, scale_data,options, working,digit), - pformat ( label_format ), - pre_str ( pre_label_string ), - post_str ( post_label_string ), - justify ( justification ), - fontSize ( font_size ), - blink ( blinking ) -{ - if (pre_str != NULL) { - if (post_str != NULL) - sprintf(format_buffer, "%s%s%s", pre_str, pformat, post_str); - else - sprintf(format_buffer, "%s%s", pre_str, pformat); - - } else if (post_str != NULL) { - sprintf(format_buffer, "%s%s", pformat, post_str); - } else { - strcpy(format_buffer, pformat); - } -} - - -// -// draw Draws a label anywhere in the HUD -// -// -void lat_label::draw(void) -{ - char label_buffer[80]; - int posincr; - int lenstr; - RECT scrn_rect = get_location(); - float lat = get_value(); - - if (data_available()) - lenstr = sprintf(label_buffer, format_buffer, coord_format_lon(lat)); - else - lenstr = sprintf(label_buffer, format_buffer); - -#ifdef DEBUGHUD - fgPrintf(SG_COCKPIT, SG_DEBUG, format_buffer); - fgPrintf(SG_COCKPIT, SG_DEBUG, "\n"); - fgPrintf(SG_COCKPIT, SG_DEBUG, label_buffer); - fgPrintf(SG_COCKPIT, SG_DEBUG, "\n"); -#endif - - lenstr = getStringWidth(label_buffer); - - if (justify == RIGHT_JUST) - posincr = scrn_rect.right - lenstr; - else if (justify == CENTER_JUST) - posincr = get_span() - (lenstr / 2); - else // justify == LEFT_JUST - posincr = 0; - - if (fontSize == HUD_FONT_SMALL) { - textString(scrn_rect.left + posincr, scrn_rect.top, - label_buffer, get_digits()); - - } else if (fontSize == HUD_FONT_LARGE) { - textString(scrn_rect.left + posincr, scrn_rect.top, - label_buffer, get_digits()); - } -} - - diff --git a/src/Cockpit/hud_lon.cxx b/src/Cockpit/hud_lon.cxx deleted file mode 100644 index 06b675ea9..000000000 --- a/src/Cockpit/hud_lon.cxx +++ /dev/null @@ -1,94 +0,0 @@ - -#include "hud.hxx" - - -#ifdef USE_HUD_TextList -#define textString(x, y, text, digit) TextString(text, x , y ,digit) -#else -#define textString(x, y, text, digit) puDrawString(guiFnt, text, x, y) -#endif - -//======================= Top of instr_label class ========================= -lon_label::lon_label( - int x, - int y, - UINT width, - UINT height, - FLTFNPTR data_source, - const char *label_format, - const char *pre_label_string, - const char *post_label_string, - float scale_data, - UINT options, - fgLabelJust justification, - int font_size, - int blinking, - bool working, - int digit) : - instr_item( x, y, width, height, - data_source, scale_data,options, working,digit ), - pformat ( label_format ), - pre_str ( pre_label_string ), - post_str ( post_label_string ), - justify ( justification ), - fontSize ( font_size ), - blink ( blinking ) -{ - if (pre_str != NULL) { - if (post_str != NULL) - sprintf(format_buffer, "%s%s%s", pre_str, pformat, post_str); - else - sprintf(format_buffer, "%s%s", pre_str, pformat); - - } else if (post_str != NULL) { - sprintf(format_buffer, "%s%s", pformat, post_str); - } else { - strcpy(format_buffer, pformat); - } -} - - -// -// draw Draws a label anywhere in the HUD -// -// -void lon_label::draw(void) -{ - char label_buffer[80]; - int posincr; - int lenstr; - RECT scrn_rect = get_location(); - float lon = get_value(); - - if (data_available()) - lenstr = sprintf(label_buffer, format_buffer, coord_format_lon(lon)); - else - lenstr = sprintf(label_buffer, format_buffer); - -#ifdef DEBUGHUD - fgPrintf(SG_COCKPIT, SG_DEBUG, format_buffer); - fgPrintf(SG_COCKPIT, SG_DEBUG, "\n"); - fgPrintf(SG_COCKPIT, SG_DEBUG, label_buffer); - fgPrintf(SG_COCKPIT, SG_DEBUG, "\n"); -#endif - - lenstr = getStringWidth(label_buffer); - - if (justify == RIGHT_JUST) - posincr = scrn_rect.right - lenstr; - else if (justify == CENTER_JUST) - posincr = get_span() - (lenstr / 2); - else // justify == LEFT_JUST - posincr = 0; - - if (fontSize == HUD_FONT_SMALL) { - textString(scrn_rect.left + posincr, scrn_rect.top, - label_buffer, get_digits()); - - } else if (fontSize == HUD_FONT_LARGE) { - textString(scrn_rect.left + posincr, scrn_rect.top, - label_buffer, get_digits()); - } -} - -