LogClassMapping(SG_CLIPPER, "clipper"),
LogClassMapping(SG_NETWORK, "network"),
LogClassMapping(SG_INSTR, "instrumentation"),
+ LogClassMapping(SG_ATC, "atc"),
+ LogClassMapping(SG_NASAL, "nasal"),
LogClassMapping(SG_SYSTEMS, "systems"),
+ LogClassMapping(SG_AI, "ai"),
+ LogClassMapping(SG_ENVIRONMENT, "environment"),
+ LogClassMapping(SG_SOUND, "sound"),
LogClassMapping(SG_UNDEFD, "")
};
/**
* Set the logging classes.
*/
-static void
+void
setLoggingClasses (const char * c)
{
string classes = c;
string rest = classes;
string name = "";
- int sep = rest.find('|');
- while (sep > 0) {
+ string::size_type sep = rest.find('|');
+ if (sep == string::npos)
+ sep = rest.find(',');
+ while (sep != string::npos) {
name = rest.substr(0, sep);
rest = rest.substr(sep+1);
addLoggingClass(name);
sep = rest.find('|');
+ if (sep == string::npos)
+ sep = rest.find(',');
}
addLoggingClass(rest);
SG_LOG(SG_GENERAL, SG_INFO, "Set logging classes to "
/**
* Set the logging priority.
*/
-static void
+void
setLoggingPriority (const char * p)
{
if (p == 0)
static double
getHeadingMag ()
{
- double magheading;
- magheading = fgGetDouble("/orientation/heading-deg") - getMagVar();
- if (magheading < 0) magheading += 360;
- return magheading;
+ double magheading = fgGetDouble("/orientation/heading-deg") - getMagVar();
+ return SGMiscd::normalizePeriodic(0, 360, magheading );
}
/**
static double
getTrackMag ()
{
- double magtrack;
- magtrack = fgGetDouble("/orientation/track-deg") - getMagVar();
- if (magtrack < 0) magtrack += 360;
- return magtrack;
+ double magtrack = fgGetDouble("/orientation/track-deg") - getMagVar();
+ return SGMiscd::normalizePeriodic(0, 360, magtrack );
}
static bool
void
FGProperties::bind ()
{
- // Simulation
- fgTie("/sim/logging/priority", getLoggingPriority, setLoggingPriority);
- fgTie("/sim/logging/classes", getLoggingClasses, setLoggingClasses);
- fgTie("/sim/freeze/master", getFreeze, setFreeze);
+ _tiedProperties.setRoot(globals->get_props());
+
+ // Simulation
+ _tiedProperties.Tie("/sim/logging/priority", getLoggingPriority, setLoggingPriority);
+ _tiedProperties.Tie("/sim/logging/classes", getLoggingClasses, setLoggingClasses);
+ _tiedProperties.Tie("/sim/freeze/master", getFreeze, setFreeze);
- fgTie("/sim/time/elapsed-sec", getElapsedTime_sec);
- fgTie("/sim/time/gmt", getDateString, setDateString);
+ _tiedProperties.Tie("/sim/time/elapsed-sec", getElapsedTime_sec);
+ _tiedProperties.Tie("/sim/time/gmt", getDateString, setDateString);
fgSetArchivable("/sim/time/gmt");
- fgTie("/sim/time/gmt-string", getGMTString);
+ _tiedProperties.Tie("/sim/time/gmt-string", getGMTString);
- // Position
- fgTie("/position/latitude-string", getLatitudeString);
- fgTie("/position/longitude-string", getLongitudeString);
+ // Position
+ _tiedProperties.Tie("/position/latitude-string", getLatitudeString);
+ _tiedProperties.Tie("/position/longitude-string", getLongitudeString);
- // Orientation
- fgTie("/orientation/heading-magnetic-deg", getHeadingMag);
- fgTie("/orientation/track-magnetic-deg", getTrackMag);
+ // Orientation
+ _tiedProperties.Tie("/orientation/heading-magnetic-deg", getHeadingMag);
+ _tiedProperties.Tie("/orientation/track-magnetic-deg", getTrackMag);
- fgTie("/environment/magnetic-variation-deg", getMagVar);
- fgTie("/environment/magnetic-dip-deg", getMagDip);
+ _tiedProperties.Tie("/environment/magnetic-variation-deg", getMagVar);
+ _tiedProperties.Tie("/environment/magnetic-dip-deg", getMagDip);
- // Misc. Temporary junk.
- fgTie("/sim/temp/winding-ccw", getWindingCCW, setWindingCCW, false);
+ // Misc. Temporary junk.
+ _tiedProperties.Tie("/sim/temp/winding-ccw", getWindingCCW, setWindingCCW, false);
}
void
FGProperties::unbind ()
{
- // Simulation
- fgUntie("/sim/logging/priority");
- fgUntie("/sim/logging/classes");
- fgUntie("/sim/freeze/master");
-
- 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");
- fgUntie("/orientation/track-magnetic-deg");
-
- // Environment
- fgUntie("/environment/magnetic-variation-deg");
- fgUntie("/environment/magnetic-dip-deg");
-
- // Misc. Temporary junk.
- fgUntie("/sim/temp/winding-ccw");
-// fgUntie("/sim/temp/full-screen");
-// fgUntie("/sim/temp/fdm-data-logging");
+ _tiedProperties.Untie();
}
void
static SGPropertyNode_ptr offset = fgGetNode("/sim/time/local-offset", true);
offset->setIntValue(globals->get_time_params()->get_local_offset());
-
// utc date/time
static SGPropertyNode_ptr uyear = fgGetNode("/sim/time/utc/year", true);
static SGPropertyNode_ptr umonth = fgGetNode("/sim/time/utc/month", true);