fly/flightgear
1
0
Fork 0
Code Activity

- add direction letter to numeric mode, too

Browse source 
- avoid negative sign on 0.00
This commit is contained in:
mfranz 2006-06-17 18:08:53 +00:00
parent fb1b1d98d3
commit b0271d17db
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Main/fg_props.cxx
View file

@ -441,9 +441,10 @@ getLongitudeString ()
static char buf[32]; static char buf[32];
double d = n->getDoubleValue(); double d = n->getDoubleValue();
int format = f->getIntValue(); int format = f->getIntValue();
char c = d < 0.0 ? 'W' : 'E';
if (format == 0) { if (format == 0) {
snprintf(buf, 32, "%3.6f", d); snprintf(buf, 32, "%3.6f%c", d, c);
} else if (format == 1) { } else if (format == 1) {
// dd mm.mmm' (DMM-Format) -- uses a round-off factor tailored to the // dd mm.mmm' (DMM-Format) -- uses a round-off factor tailored to the
@ -451,8 +452,7 @@ getLongitudeString ()
// preventing minute values of 60. // preventing minute values of 60.
double deg = fabs(d) + 5.0E-4 / 60.0; double deg = fabs(d) + 5.0E-4 / 60.0;
double min = fabs(deg - int(deg)) * 60.0 - 4.999E-4; double min = fabs(deg - int(deg)) * 60.0 - 4.999E-4;
snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min, snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min, c);
d < 0.0 ? 'W' : 'E');
} else { } else {
// mm'ss.s'' (DMS-Format) -- uses a round-off factor tailored to the // mm'ss.s'' (DMS-Format) -- uses a round-off factor tailored to the
@ -462,7 +462,7 @@ getLongitudeString ()
double min = (deg - int(deg)) * 60.0; double min = (deg - int(deg)) * 60.0;
double sec = (min - int(min)) * 60.0 - 0.049; double sec = (min - int(min)) * 60.0 - 0.049;
snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg), snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg),
int(min), sec, d < 0.0 ? 'W' : 'E'); int(min), fabs(sec), c);
} }
return buf; return buf;
} }
@ -475,22 +475,22 @@ getLatitudeString ()
static char buf[32]; static char buf[32];
double d = n->getDoubleValue(); double d = n->getDoubleValue();
int format = f->getIntValue(); int format = f->getIntValue();
char c = d < 0.0 ? 'S' : 'N';
if (format == 0) { if (format == 0) {
snprintf(buf, 32, "%3.6f", d); snprintf(buf, 32, "%3.6f%c", d, c);
} else if (format == 1) { } else if (format == 1) {
double deg = fabs(d) + 5.0E-4 / 60.0; double deg = fabs(d) + 5.0E-4 / 60.0;
double min = fabs(deg - int(deg)) * 60.0 - 4.999E-4; double min = fabs(deg - int(deg)) * 60.0 - 4.999E-4;
snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min, snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min, c);
d < 0.0 ? 'S' : 'N');
} else { } else {
double deg = fabs(d) + 0.05 / 3600.0; double deg = fabs(d) + 0.05 / 3600.0;
double min = (deg - int(deg)) * 60.0; double min = (deg - int(deg)) * 60.0;
double sec = (min - int(min)) * 60.0 - 0.049; double sec = (min - int(min)) * 60.0 - 0.049;
snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg), snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg),
int(min), sec, d < 0.0 ? 'S' : 'N'); int(min), fabs(sec), c);
} }
return buf; return buf;
} }