indentation, trailing spaces, alignment, ... (to make further work easier)
This commit is contained in:
mfranz
parent
b674037a3c
commit
0b0c681775
1 changed files with 98 additions and 107 deletions
|
|
@ -3,49 +3,44 @@
|
|||
|
||||
|
||||
#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
|
||||
#define textString( x , y, text, digit ) puDrawString ( guiFnt, text, x, y ); //suma
|
||||
#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): //suma
|
||||
instr_item( x, y, width, height,
|
||||
data_source, scale_data,options, working,digit), //suma
|
||||
pformat ( label_format ),
|
||||
pre_str ( pre_label_string ),
|
||||
post_str ( post_label_string ),
|
||||
justify ( justification ),
|
||||
fontSize ( font_size ),
|
||||
blink ( blinking )
|
||||
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 );
|
||||
}
|
||||
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 do nothing if both pre and post strings are nulls. Interesting.
|
||||
|
||||
}
|
||||
|
|
@ -54,97 +49,93 @@ lat_label ::
|
|||
// C code.
|
||||
|
||||
|
||||
lat_label :: ~lat_label()
|
||||
lat_label::~lat_label()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
// Copy constructor
|
||||
lat_label :: lat_label( const lat_label & image) :
|
||||
instr_item((const instr_item &)image),
|
||||
pformat ( image.pformat ),
|
||||
pre_str ( image.pre_str ),
|
||||
post_str ( image.post_str ),
|
||||
blink ( image.blink )
|
||||
lat_label::lat_label( const lat_label & image) :
|
||||
instr_item((const instr_item &)image),
|
||||
pformat ( image.pformat ),
|
||||
pre_str ( image.pre_str ),
|
||||
post_str ( image.post_str ),
|
||||
blink ( image.blink )
|
||||
{
|
||||
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 );
|
||||
}
|
||||
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 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)) {
|
||||
instr_item::operator = (rhs);
|
||||
pformat = rhs.pformat;
|
||||
fontSize = rhs.fontSize;
|
||||
blink = rhs.blink;
|
||||
justify = rhs.justify;
|
||||
pre_str = rhs.pre_str;
|
||||
post_str = rhs.post_str;
|
||||
strcpy(format_buffer,rhs.format_buffer);
|
||||
if (!(this == &rhs)) {
|
||||
instr_item::operator = (rhs);
|
||||
pformat = rhs.pformat;
|
||||
fontSize = rhs.fontSize;
|
||||
blink = rhs.blink;
|
||||
justify = rhs.justify;
|
||||
pre_str = rhs.pre_str;
|
||||
post_str = rhs.post_str;
|
||||
strcpy(format_buffer,rhs.format_buffer);
|
||||
}
|
||||
return *this;
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// draw Draws a label anywhere in the HUD
|
||||
//
|
||||
//
|
||||
void lat_label ::
|
||||
draw( void ) // Required method in base class
|
||||
void lat_label::draw( void ) // Required method in base class
|
||||
{
|
||||
char label_buffer[80];
|
||||
int posincr;
|
||||
int lenstr;
|
||||
RECT scrn_rect = get_location();
|
||||
// float lat = get_value();
|
||||
|
||||
if( data_available() ) {
|
||||
// sprintf( label_buffer, format_buffer, coord_format_lat(lat) );
|
||||
sprintf( label_buffer, format_buffer,
|
||||
coord_format_lat( get_value()) );
|
||||
char label_buffer[80];
|
||||
int posincr;
|
||||
int lenstr;
|
||||
RECT scrn_rect = get_location();
|
||||
// float lat = get_value();
|
||||
|
||||
if (data_available()) {
|
||||
// // sprintf( label_buffer, format_buffer, coord_format_lat(lat) );
|
||||
sprintf( label_buffer, format_buffer,
|
||||
coord_format_lat( get_value()) );
|
||||
|
||||
} else {
|
||||
sprintf( label_buffer, format_buffer );
|
||||
}
|
||||
else {
|
||||
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" );
|
||||
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; // 0;
|
||||
}
|
||||
|
||||
if( fontSize == HUD_FONT_SMALL ) {
|
||||
textString( scrn_rect.left + posincr, scrn_rect.top,
|
||||
label_buffer, get_digits()); //suma
|
||||
}
|
||||
else {
|
||||
if( fontSize == HUD_FONT_LARGE ) {
|
||||
textString( scrn_rect.left + posincr, scrn_rect.top,
|
||||
label_buffer, get_digits()); //suma
|
||||
}
|
||||
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());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue