X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_props.cxx;h=a5726b79b00b7e7ad44d76565dc0acf9e971b9ca;hb=b7eb3bd0e128d39101dfa5846de991681aa5456f;hp=0a78154f99adf7be8b4afb78a5af3f4f20e6303c;hpb=e769f42f3b6bf3275a7724d9ef2e01e2073b5c27;p=flightgear.git

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 0a78154f9..a5726b79b 100644
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -16,35 +16,30 @@
 //
 // 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/props/props_io.hxx>
+
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/scene/material/matlib.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 
-#include STL_IOSTREAM
-
-#include <ATC/ATCdisplay.hxx>
 #include <Aircraft/aircraft.hxx>
-#include <Time/tmp.hxx>
-#include <Environment/environment.hxx>
-
+#include <FDM/flight.hxx>
 #include <GUI/gui.h>
 
 #include "globals.hxx"
 #include "fg_props.hxx"
 
-SG_USING_STD(istream);
-SG_USING_STD(ostream);
 
 static bool winding_ccw = true; // FIXME: temporary
 
@@ -52,7 +47,7 @@ static bool fdm_data_logging = false; // FIXME: temporary
 
 static bool frozen = false;	// FIXME: temporary
 
-
+using std::string;
 
 ////////////////////////////////////////////////////////////////////////
 // Default property bindings (not yet handled by any module).
@@ -90,19 +85,26 @@ LogClassMapping log_class_mappings [] = {
 /**
  * Get the logging classes.
  */
+// XXX Making the result buffer be global is a band-aid that hopefully
+// delays its destruction 'til after its last use.
+namespace
+{
+string loggingResult;
+}
+
 static const char *
 getLoggingClasses ()
 {
   sgDebugClass classes = logbuf::get_log_classes();
-  static string result = "";	// FIXME
+  loggingResult.clear();
   for (int i = 0; log_class_mappings[i].c != SG_UNDEFD; i++) {
     if ((classes&log_class_mappings[i].c) > 0) {
-      if (!result.empty())
-	result += '|';
-      result += log_class_mappings[i].name;
+      if (!loggingResult.empty())
+	loggingResult += '|';
+      loggingResult += log_class_mappings[i].name;
     }
   }
-  return result.c_str();
+  return loggingResult.c_str();
 }
 
 
@@ -226,12 +228,12 @@ setFreeze (bool f)
     frozen = f;
 
     // Stop sound on a pause
-    SGSoundMgr *s = globals->get_soundmgr();
-    if ( s != NULL ) {
+    SGSoundMgr *smgr = globals->get_soundmgr();
+    if ( smgr != NULL ) {
         if ( f ) {
-            s->pause();
-        } else {
-            s->resume();
+            smgr->suspend();
+        } else if (fgGetBool("/sim/sound/working")) {
+            smgr->resume();
         }
     }
 }
@@ -314,11 +316,10 @@ setDateString (const char * date_string)
 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;
 }
 
@@ -354,6 +355,18 @@ getHeadingMag ()
   return magheading;
 }
 
+/**
+ * Return the current track in degrees.
+ */
+static double
+getTrackMag ()
+{
+  double magtrack;
+  magtrack = current_aircraft.fdm_state->get_Track() - getMagVar();
+  if (magtrack < 0) magtrack += 360;
+  return magtrack;
+}
+
 static long
 getWarp ()
 {
@@ -394,27 +407,6 @@ setWindingCCW (bool state)
     glFrontFace ( GL_CW );
 }
 
-static bool
-getFullScreen ()
-{
-#if defined(FX) && !defined(WIN32)
-  return globals->get_fullscreen();
-#else
-  return false;
-#endif
-}
-
-static void
-setFullScreen (bool state)
-{
-#if defined(FX) && !defined(WIN32)
-  globals->set_fullscreen(state);
-#  if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
-  XMesaSetFXmode( state ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW );
-#  endif
-#endif
-}
-
 static bool
 getFDMDataLogging ()
 {
@@ -431,6 +423,72 @@ setFDMDataLogging (bool state)
   }
 }
 
+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);
+  }
+  buf[31] = '\0';
+  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);
+  }
+  buf[31] = '\0';
+  return buf;
+}
+
+
+
 
 ////////////////////////////////////////////////////////////////////////
 // Tie the properties.
@@ -462,8 +520,13 @@ FGProperties::bind ()
   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);
+  fgTie("/orientation/track-magnetic-deg", getTrackMag);
 
   fgTie("/environment/magnetic-variation-deg", getMagVar);
   fgTie("/environment/magnetic-dip-deg", getMagDip);
@@ -473,7 +536,6 @@ FGProperties::bind ()
 
 				// Misc. Temporary junk.
   fgTie("/sim/temp/winding-ccw", getWindingCCW, setWindingCCW, false);
-  fgTie("/sim/temp/full-screen", getFullScreen, setFullScreen);
   fgTie("/sim/temp/fdm-data-logging", getFDMDataLogging, setFDMDataLogging);
 }
 
@@ -488,9 +550,13 @@ FGProperties::unbind ()
   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");
@@ -508,20 +574,50 @@ FGProperties::unbind ()
 void
 FGProperties::update (double dt)
 {
-                                // Date and time
-    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);
-    fgSetInt("/sim/time/utc/day", t->tm_mday);
-    fgSetInt("/sim/time/utc/hour", t->tm_hour);
-    fgSetInt("/sim/time/utc/minute", t->tm_min);
-    fgSetInt("/sim/time/utc/second", t->tm_sec);
-
-    fgSetDouble("/sim/time/utc/day-seconds",
-                t->tm_hour * 3600 +
-                t->tm_min * 60 +
-                t->tm_sec);
+    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);
+    static SGPropertyNode_ptr uday = fgGetNode("/sim/time/utc/day", true);
+    static SGPropertyNode_ptr uhour = fgGetNode("/sim/time/utc/hour", true);
+    static SGPropertyNode_ptr umin = fgGetNode("/sim/time/utc/minute", true);
+    static SGPropertyNode_ptr usec = fgGetNode("/sim/time/utc/second", true);
+    static SGPropertyNode_ptr uwday = fgGetNode("/sim/time/utc/weekday", true);
+    static SGPropertyNode_ptr udsec = fgGetNode("/sim/time/utc/day-seconds", true);
+
+    struct tm *u = globals->get_time_params()->getGmt();
+    uyear->setIntValue(u->tm_year + 1900);
+    umonth->setIntValue(u->tm_mon + 1);
+    uday->setIntValue(u->tm_mday);
+    uhour->setIntValue(u->tm_hour);
+    umin->setIntValue(u->tm_min);
+    usec->setIntValue(u->tm_sec);
+    uwday->setIntValue(u->tm_wday);
+
+    udsec->setIntValue(u->tm_hour * 3600 + u->tm_min * 60 + u->tm_sec);
+
+
+    // real local date/time
+    static SGPropertyNode_ptr ryear = fgGetNode("/sim/time/real/year", true);
+    static SGPropertyNode_ptr rmonth = fgGetNode("/sim/time/real/month", true);
+    static SGPropertyNode_ptr rday = fgGetNode("/sim/time/real/day", true);
+    static SGPropertyNode_ptr rhour = fgGetNode("/sim/time/real/hour", true);
+    static SGPropertyNode_ptr rmin = fgGetNode("/sim/time/real/minute", true);
+    static SGPropertyNode_ptr rsec = fgGetNode("/sim/time/real/second", true);
+    static SGPropertyNode_ptr rwday = fgGetNode("/sim/time/real/weekday", true);
+
+    time_t real = time(0);
+    struct tm *r = localtime(&real);
+    ryear->setIntValue(r->tm_year + 1900);
+    rmonth->setIntValue(r->tm_mon + 1);
+    rday->setIntValue(r->tm_mday);
+    rhour->setIntValue(r->tm_hour);
+    rmin->setIntValue(r->tm_min);
+    rsec->setIntValue(r->tm_sec);
+    rwday->setIntValue(r->tm_wday);
 }
 
 
@@ -535,7 +631,7 @@ FGProperties::update (double dt)
  * Save the current state of the simulator to a stream.
  */
 bool
-fgSaveFlight (ostream &output, bool write_all)
+fgSaveFlight (std::ostream &output, bool write_all)
 {
 
   fgSetBool("/sim/presets/onground", false);
@@ -559,7 +655,7 @@ fgSaveFlight (ostream &output, bool write_all)
  * Restore the current state of the simulator from a stream.
  */
 bool
-fgLoadFlight (istream &input)
+fgLoadFlight (std::istream &input)
 {
   SGPropertyNode props;
   try {
@@ -582,7 +678,7 @@ fgLoadFlight (istream &input)
 
 
 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) {
@@ -594,7 +690,7 @@ fgLoadProps (const char * path, SGPropertyNode * props, bool in_fg_root)
     }
 
     try {
-        readProperties(fullpath, props);
+        readProperties(fullpath, props, default_mode);
     } catch (const sg_exception &e) {
         guiErrorMessage("Error reading properties: ", e);
         return false;