//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
#ifdef HAVE_CONFIG_H
-# include <simgear/compiler.h>
+# include "config.h"
#endif
+#include <simgear/compiler.h>
+
#include <simgear/structure/exception.hxx>
#include <simgear/magvar/magvar.hxx>
#include <simgear/timing/sg_time.hxx>
#include STL_IOSTREAM
-#include <ATC/ATCdisplay.hxx>
#include <Aircraft/aircraft.hxx>
#include <Time/tmp.hxx>
-#include <FDM/UIUCModel/uiuc_aircraftdir.h>
#include <Environment/environment.hxx>
#include <GUI/gui.h>
LogClassMapping(SG_IO, "io"),
LogClassMapping(SG_CLIPPER, "clipper"),
LogClassMapping(SG_NETWORK, "network"),
+ LogClassMapping(SG_INSTR, "instrumentation"),
+ LogClassMapping(SG_SYSTEMS, "systems"),
LogClassMapping(SG_UNDEFD, "")
};
getLoggingClasses ()
{
sgDebugClass classes = logbuf::get_log_classes();
- static string result = ""; // FIXME
+ static string result;
+ result = "";
for (int i = 0; log_class_mappings[i].c != SG_UNDEFD; i++) {
if ((classes&log_class_mappings[i].c) > 0) {
if (!result.empty())
}
-/**
- * Return the current aircraft directory (UIUC) as a string.
- */
-static const char *
-getAircraftDir ()
-{
- return aircraft_dir.c_str();
-}
-
-
-/**
- * Set the current aircraft directory (UIUC).
- */
-static void
-setAircraftDir (const char * dir)
-{
- aircraft_dir = dir;
-}
-
-
/**
* Return the number of milliseconds elapsed since simulation started.
*/
static const char *
getGMTString ()
{
- static char buf[16]; // FIXME
+ static char buf[16];
struct tm *t = globals->get_time_params()->getGmt();
- sprintf(buf, " %.2d:%.2d:%.2d",
- t->tm_hour, t->tm_min, t->tm_sec);
- // cout << t << " " << buf << endl;
+ snprintf(buf, 16, "%.2d:%.2d:%.2d",
+ t->tm_hour, t->tm_min, t->tm_sec);
return buf;
}
}
}
+static const char *
+getLongitudeString ()
+{
+ static SGConstPropertyNode_ptr n = fgGetNode("/position/longitude-deg", true);
+ static SGConstPropertyNode_ptr f = fgGetNode("/sim/lon-lat-format", true);
+ static char buf[32];
+ double d = n->getDoubleValue();
+ int format = f->getIntValue();
+ char c = d < 0.0 ? 'W' : 'E';
+
+ if (format == 0) {
+ snprintf(buf, 32, "%3.6f%c", d, c);
+
+ } else if (format == 1) {
+ // dd mm.mmm' (DMM-Format) -- uses a round-off factor tailored to the
+ // required precision of the minutes field (three decimal places),
+ // preventing minute values of 60.
+ double deg = fabs(d) + 5.0E-4 / 60.0;
+ 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, c);
+
+ } else {
+ // mm'ss.s'' (DMS-Format) -- uses a round-off factor tailored to the
+ // required precision of the seconds field (one decimal place),
+ // preventing second values of 60.
+ double deg = fabs(d) + 0.05 / 3600.0;
+ double min = (deg - int(deg)) * 60.0;
+ double sec = (min - int(min)) * 60.0 - 0.049;
+ snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg),
+ int(min), fabs(sec), c);
+ }
+ return buf;
+}
+
+static const char *
+getLatitudeString ()
+{
+ static SGConstPropertyNode_ptr n = fgGetNode("/position/latitude-deg", true);
+ static SGConstPropertyNode_ptr f = fgGetNode("/sim/lon-lat-format", true);
+ static char buf[32];
+ double d = n->getDoubleValue();
+ int format = f->getIntValue();
+ char c = d < 0.0 ? 'S' : 'N';
+
+ if (format == 0) {
+ snprintf(buf, 32, "%3.6f%c", d, c);
+
+ } else if (format == 1) {
+ double deg = fabs(d) + 5.0E-4 / 60.0;
+ 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, c);
+
+ } else {
+ double deg = fabs(d) + 0.05 / 3600.0;
+ double min = (deg - int(deg)) * 60.0;
+ double sec = (min - int(min)) * 60.0 - 0.049;
+ snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg),
+ int(min), fabs(sec), c);
+ }
+ return buf;
+}
+
+
+
\f
////////////////////////////////////////////////////////////////////////
// Tie the properties.
fgTie("/sim/logging/priority", getLoggingPriority, setLoggingPriority);
fgTie("/sim/logging/classes", getLoggingClasses, setLoggingClasses);
fgTie("/sim/freeze/master", getFreeze, setFreeze);
- fgTie("/sim/aircraft-dir", getAircraftDir, setAircraftDir);
fgTie("/sim/time/elapsed-sec", getElapsedTime_sec);
fgTie("/sim/time/gmt", getDateString, setDateString);
fgSetArchivable("/sim/time/gmt");
fgTie("/sim/time/gmt-string", getGMTString);
+ // Position
+ fgTie("/position/latitude-string", getLatitudeString);
+ fgTie("/position/longitude-string", getLongitudeString);
+
// Orientation
fgTie("/orientation/heading-magnetic-deg", getHeadingMag);
fgUntie("/sim/logging/priority");
fgUntie("/sim/logging/classes");
fgUntie("/sim/freeze/master");
- fgUntie("/sim/aircraft-dir");
fgUntie("/sim/time/elapsed-sec");
fgUntie("/sim/time/gmt");
fgUntie("/sim/time/gmt-string");
+ // Position
+ fgUntie("/position/latitude-string");
+ fgUntie("/position/longitude-string");
// Orientation
fgUntie("/orientation/heading-magnetic-deg");
FGProperties::update (double dt)
{
// Date and time
- struct tm * t = globals->get_time_params()->getGmt();
+ struct tm *t = globals->get_time_params()->getGmt();
fgSetInt("/sim/time/utc/year", t->tm_year + 1900);
fgSetInt("/sim/time/utc/month", t->tm_mon + 1);
t->tm_hour * 3600 +
t->tm_min * 60 +
t->tm_sec);
+
+ fgSetInt("/sim/time/local-offset",
+ globals->get_time_params()->get_local_offset());
}
bool
-fgLoadProps (const char * path, SGPropertyNode * props, bool in_fg_root)
+fgLoadProps (const char * path, SGPropertyNode * props, bool in_fg_root, int default_mode)
{
string fullpath;
if (in_fg_root) {
}
try {
- readProperties(fullpath, props);
+ readProperties(fullpath, props, default_mode);
} catch (const sg_exception &e) {
guiErrorMessage("Error reading properties: ", e);
return false;
projects / flightgear.git / blobdiff