fly/flightgear
1
0
Fork 0
Code Activity

- "almost zero" is zero

Browse source 
- improve/add <format> warning
This commit is contained in:
mfranz 2006-08-01 21:43:13 +00:00
parent d0f8f8351b
commit 46efbb0801
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Instrumentation/HUD/HUD_label.cxx
View file

@ -69,7 +69,8 @@ HUD::Label::Label(HUD *hud, const SGPropertyNode *n, float x, float y) :
_mode = check_format(_format.c_str());
if (_mode == INVALID) {
SG_LOG(SG_INPUT, SG_ALERT, "HUD: invalid format '" << _format.c_str() << '\'');
SG_LOG(SG_INPUT, SG_ALERT, "HUD: invalid format '" << _format.c_str()
<< "' in <label> '" << _name << '\'');
_format = "INVALID";
_mode = NONE;
}

5
src/Instrumentation/HUD/HUD_tape.cxx
View file

@ -53,6 +53,8 @@ HUD::Tape::Tape(HUD *hud, const SGPropertyNode *n, float x, float y) :
_label_fmt = check_format(_format.c_str());
if (_label_fmt != INT && _label_fmt != LONG
&& _label_fmt != FLOAT && _label_fmt != DOUBLE) {
SG_LOG(SG_INPUT, SG_ALERT, "HUD: invalid <format> '" << _format.c_str()
<< "' in <tape> '" << _name << "' (must be number format)");
_label_fmt = INT;
_format = "%d";
}
@ -546,6 +548,9 @@ void HUD::Tape::draw(void) // (HUD_scale * pscale)
char *HUD::Tape::format_value(float v)
{
if (fabsf(v) < 1e-8)
v = 0.0f;
if (_label_fmt == INT)
snprintf(_buf, BUFSIZE, _format.c_str(), int(v + 0.5f));
else if (_label_fmt == LONG)