fly/flightgear
1
0
Fork 0
Code Activity

indentation, trailing spaces, alignment, ... (to make further work easier)

Browse source
This commit is contained in:
mfranz 2006-06-13 14:48:19 +00:00
parent b674037a3c
commit 0b0c681775
1 changed files with 98 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/Cockpit/hud_lat.cxx
View file

@ -3,14 +3,13 @@
#ifdef USE_HUD_TextList #ifdef USE_HUD_TextList
#define textString( x , y, text, digit ) TextString( text, x , y,digit ) //suma #define textString( x , y, text, digit ) TextString( text, x , y,digit )
#else #else
#define textString( x , y, text, digit ) puDrawString ( guiFnt, text, x, y ); //suma #define textString( x , y, text, digit ) puDrawString ( guiFnt, text, x, y )
#endif #endif
//======================= Top of instr_label class ========================= //======================= Top of instr_label class =========================
lat_label :: lat_label::lat_label(int x,
lat_label( int x,
int y, int y,
UINT width, UINT width,
UINT height, UINT height,
@ -24,9 +23,9 @@ lat_label ::
int font_size, int font_size,
int blinking, int blinking,
bool working , bool working ,
int digit): //suma int digit) :
instr_item( x, y, width, height, instr_item( x, y, width, height,
data_source, scale_data,options, working,digit), //suma data_source, scale_data,options, working,digit),
pformat ( label_format ), pformat ( label_format ),
pre_str ( pre_label_string ), pre_str ( pre_label_string ),
post_str ( post_label_string ), post_str ( post_label_string ),
@ -35,17 +34,13 @@ lat_label ::
blink ( blinking ) blink ( blinking )
{ {
if (pre_str != NULL) { if (pre_str != NULL) {
if( post_str != NULL ) { if (post_str != NULL)
sprintf( format_buffer, "%s%s%s", pre_str, pformat, post_str ); sprintf( format_buffer, "%s%s%s", pre_str, pformat, post_str );
} else
else {
sprintf( format_buffer, "%s%s", pre_str, pformat ); sprintf( format_buffer, "%s%s", pre_str, pformat );
}
} } else if (post_str != NULL) {
else {
if( post_str != NULL ) {
sprintf( format_buffer, "%s%s", pformat, post_str ); sprintf( format_buffer, "%s%s", pformat, post_str );
}
} // else do nothing if both pre and post strings are nulls. Interesting. } // else do nothing if both pre and post strings are nulls. Interesting.
} }
@ -58,6 +53,7 @@ lat_label :: ~lat_label()
{ {
} }
// Copy constructor // Copy constructor
lat_label::lat_label( const lat_label & image) : lat_label::lat_label( const lat_label & image) :
instr_item((const instr_item &)image), instr_item((const instr_item &)image),
@ -67,21 +63,18 @@ lat_label :: lat_label( const lat_label & image) :
blink ( image.blink ) blink ( image.blink )
{ {
if (pre_str != NULL) { if (pre_str != NULL) {
if( post_str != NULL ) { if (post_str != NULL)
sprintf( format_buffer, "%s%s%s", pre_str, pformat, post_str ); sprintf( format_buffer, "%s%s%s", pre_str, pformat, post_str );
} else
else {
sprintf( format_buffer, "%s%s", pre_str, pformat ); sprintf( format_buffer, "%s%s", pre_str, pformat );
}
} } else if (post_str != NULL) {
else {
if( post_str != NULL ) {
sprintf( format_buffer, "%s%s", pformat, post_str ); sprintf( format_buffer, "%s%s", pformat, post_str );
}
} // else do nothing if both pre and post strings are nulls. Interesting. } // else do nothing if both pre and post strings are nulls. Interesting.
} }
lat_label& lat_label::operator=(const lat_label & rhs) lat_label& lat_label::operator=(const lat_label & rhs)
{ {
if (!(this == &rhs)) { if (!(this == &rhs)) {
@ -97,12 +90,12 @@ lat_label & lat_label ::operator = (const lat_label & rhs )
return *this; return *this;
} }
// //
// draw Draws a label anywhere in the HUD // draw Draws a label anywhere in the HUD
// //
// //
void lat_label :: void lat_label::draw( void ) // Required method in base class
draw( void ) // Required method in base class
{ {
char label_buffer[80]; char label_buffer[80];
int posincr; int posincr;
@ -111,11 +104,11 @@ draw( void ) // Required method in base class
// float lat = get_value(); // float lat = get_value();
if (data_available()) { if (data_available()) {
// sprintf( label_buffer, format_buffer, coord_format_lat(lat) ); // // sprintf( label_buffer, format_buffer, coord_format_lat(lat) );
sprintf( label_buffer, format_buffer, sprintf( label_buffer, format_buffer,
coord_format_lat( get_value()) ); coord_format_lat( get_value()) );
}
else { } else {
sprintf( label_buffer, format_buffer ); sprintf( label_buffer, format_buffer );
} }
@ -128,23 +121,21 @@ draw( void ) // Required method in base class
lenstr = getStringWidth(label_buffer); lenstr = getStringWidth(label_buffer);
if( justify == RIGHT_JUST ) { if (justify == RIGHT_JUST)
posincr = scrn_rect.right - lenstr; posincr = scrn_rect.right - lenstr;
}else if( justify == CENTER_JUST ) { else if (justify == CENTER_JUST)
posincr = get_span() - (lenstr/2); posincr = get_span() - (lenstr/2);
} else { // justify == LEFT_JUST else // justify == LEFT_JUST
posincr = 0; // 0; posincr = 0;
}
if (fontSize == HUD_FONT_SMALL) { if (fontSize == HUD_FONT_SMALL) {
textString( scrn_rect.left + posincr, scrn_rect.top, textString( scrn_rect.left + posincr, scrn_rect.top,
label_buffer, get_digits()); //suma label_buffer, get_digits());
}
else { } else if (fontSize == HUD_FONT_LARGE) {
if( fontSize == HUD_FONT_LARGE ) {
textString( scrn_rect.left + posincr, scrn_rect.top, textString( scrn_rect.left + posincr, scrn_rect.top,
label_buffer, get_digits()); //suma label_buffer, get_digits());
}
} }
} }