Attempt #1 to sort out confusion between left / right / parking brake

[flightgear.git] / src / Main / fg_commands.cxx

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 6769654f5ed3cf5af8cbd4960caa6049d30e503a..69edb7d0cc3d55f651006806d68d967b285ace92 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -16,6 +16,7 @@
 
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
+#include <Environment/environment.hxx>
 #include <FDM/flight.hxx>
 #include <GUI/gui.h>
 #include <GUI/new_gui.hxx>
@@ -25,23 +26,23 @@
 #if defined(HAVE_PLIB_PSL)
 #  include <Scripting/scriptmgr.hxx>
 #endif
+#include <Scripting/NasalSys.hxx>
 #include <Time/sunsolver.hxx>
 #include <Time/tmp.hxx>
 
 #include "fg_init.hxx"
+#include "fg_io.hxx"
 #include "fg_commands.hxx"
 #include "fg_props.hxx"
+#include "globals.hxx"
+#include "logger.cxx"
+#include "util.hxx"
+#include "viewmgr.hxx"
 
 SG_USING_STD(string);
 SG_USING_STD(ifstream);
 SG_USING_STD(ofstream);
 
-#include "fg_props.hxx"
-#include "fg_io.hxx"
-#include "globals.hxx"
-#include "util.hxx"
-#include "viewmgr.hxx"
-
 
 \f
 ////////////////////////////////////////////////////////////////////////
@@ -170,6 +171,14 @@ do_script (const SGPropertyNode * arg)
 }
 #endif // HAVE_PLIB_PSL
 
+/**
+ * Built-in command: run a Nasal script.
+ */
+static bool
+do_nasal (const SGPropertyNode * arg)
+{
+    return ((FGNasalSys*)globals->get_subsystem("nasal"))->handleCommand(arg);
+}
 
 /**
  * Built-in command: exit FlightGear.
@@ -470,6 +479,55 @@ do_tile_cache_reload (const SGPropertyNode * arg)
 }
 
 
+/**
+ * Set the outside air temperature at the "current" altitude by first
+ * calculating the corresponding sea level temp, and assigning that to
+ * all boundary and aloft environment layers.
+ */
+static bool
+do_set_oat_degc (const SGPropertyNode * arg)
+{
+    const string &temp_str = arg->getStringValue("temp-degc", "15.0");
+
+    static const SGPropertyNode *altitude_ft
+      = fgGetNode("/position/altitude-ft");
+
+    FGEnvironment dummy;       // instantiate a dummy so we can leech a method
+    dummy.set_elevation_ft( altitude_ft->getDoubleValue() );
+    dummy.set_temperature_degc( atof( temp_str.c_str() ) );
+    double temp_sea_level_degc = dummy.get_temperature_sea_level_degc();
+
+    cout << "Altitude = " << altitude_ft->getDoubleValue() << endl;
+    cout << "Temp at alt (C) = " << atof( temp_str.c_str() ) << endl;
+    cout << "Temp sea level (C) = " << temp_sea_level_degc << endl;
+ 
+    SGPropertyNode *node, *child;
+
+    // boundary layers
+    node = fgGetNode( "/environment/config/boundary" );
+    if ( node != NULL ) {
+      int i = 0;
+      while ( ( child = node->getNode( "entry", i ) ) != NULL ) {
+       child->setDoubleValue( "temperature-sea-level-degc",
+                              temp_sea_level_degc );
+       ++i;
+      }
+    }
+
+    // aloft layers
+    node = fgGetNode( "/environment/config/aloft" );
+    if ( node != NULL ) {
+      int i = 0;
+      while ( ( child = node->getNode( "entry", i ) ) != NULL ) {
+       child->setDoubleValue( "temperature-sea-level-degc",
+                              temp_sea_level_degc );
+       ++i;
+      }
+    }
+
+    return true;
+}
+
 /**
  * Update the lighting manually.
  */
@@ -787,6 +845,41 @@ do_property_randomize (const SGPropertyNode * arg)
 }
 
 
+/**
+ * Built-in command: reinit the data logging system based on the
+ * current contents of the /logger tree.
+ */
+static bool
+do_data_logging_commit (const SGPropertyNode * arg)
+{
+    FGLogger *log = (FGLogger *)globals->get_subsystem("logger");
+    log->reinit();
+    return true;
+}
+
+/**
+ * Built-in command: Add a dialog to the GUI system.  Does *not*
+ * display the dialog.  The property node should have the same format
+ * as a dialog XML configuration.  It must include:
+ *
+ * name: the name of the GUI dialog for future reference.
+ */
+static bool
+do_dialog_new (const SGPropertyNode * arg)
+{
+    NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+
+    // Note the casting away of const: this is *real*.  Doing a
+    // "dialog-apply" command later on will mutate this property node.
+    // I'm not convinced that this isn't the Right Thing though; it
+    // allows client to create a node, pass it to dialog-new, and get
+    // the values back from the dialog by reading the same node.
+    // Perhaps command arguments are not as "const" as they would
+    // seem?
+    gui->newDialog((SGPropertyNode*)arg);
+    return true;
+}
+
 /**
  * Built-in command: Show an XML-configured dialog.
  *
@@ -808,6 +901,8 @@ static bool
 do_dialog_close (const SGPropertyNode * arg)
 {
     NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+    if(arg->hasValue("dialog-name"))
+        return gui->closeDialog(arg->getStringValue("dialog-name"));
     return gui->closeActiveDialog();
 }
 
@@ -971,6 +1066,7 @@ static struct {
 #if defined(HAVE_PLIB_PSL)
     { "script", do_script },
 #endif // HAVE_PLIB_PSL
+    { "nasal", do_nasal },
     { "exit", do_exit },
     { "reinit", do_reinit },
     { "suspend", do_reinit },
@@ -983,6 +1079,7 @@ static struct {
     { "view-cycle", do_view_cycle },
     { "screen-capture", do_screen_capture },
     { "tile-cache-reload", do_tile_cache_reload },
+    { "set-outside-air-temp-degc", do_set_oat_degc },
     { "timeofday", do_timeofday },
     { "property-toggle", do_property_toggle },
     { "property-assign", do_property_assign },
@@ -992,6 +1089,8 @@ static struct {
     { "property-scale", do_property_scale },
     { "property-cycle", do_property_cycle },
     { "property-randomize", do_property_randomize },
+    { "data-logging-commit", do_data_logging_commit },
+    { "dialog-new", do_dialog_new },
     { "dialog-show", do_dialog_show },
     { "dialog-close", do_dialog_close },
     { "dialog-show", do_dialog_show },