Comment out some unused references and left over debugging output.

diff --git a/src/Autopilot/auto_gui.cxx b/src/Autopilot/auto_gui.cxx
index 4e3c19a8492b8c7444110a1025e640458966b4ef..aa2c224e5b67478bdbea5b4eac0976c9f26428b8 100644 (file)
--- a/src/Autopilot/auto_gui.cxx
+++ b/src/Autopilot/auto_gui.cxx
@@ -62,56 +62,56 @@ SG_USING_STD(string);
 #define mySlider puSlider
 
 // Climb speed constants
-const double min_climb = 70.0; // kts
-const double best_climb = 75.0;        // kts
-const double ideal_climb_rate = 500.0; // fpm
+// const double min_climb = 70.0;      // kts
+// const double best_climb = 75.0;     // kts
+// const double ideal_climb_rate = 500.0; // fpm
 
 /// These statics will eventually go into the class
 /// they are just here while I am experimenting -- NHV :-)
 // AutoPilot Gain Adjuster members
-static double MaxRollAdjust;        // MaxRollAdjust       = 2 * APData->MaxRoll;
-static double RollOutAdjust;        // RollOutAdjust       = 2 * APData->RollOut;
-static double MaxAileronAdjust;     // MaxAileronAdjust    = 2 * APData->MaxAileron;
-static double RollOutSmoothAdjust;  // RollOutSmoothAdjust = 2 * APData->RollOutSmooth;
-
-static float MaxRollValue;          // 0.1 -> 1.0
-static float RollOutValue;
-static float MaxAileronValue;
-static float RollOutSmoothValue;
-
-static float TmpMaxRollValue;       // for cancel operation
-static float TmpRollOutValue;
-static float TmpMaxAileronValue;
-static float TmpRollOutSmoothValue;
-
-static puDialogBox *APAdjustDialog;
-static puFrame     *APAdjustFrame;
-static puText      *APAdjustDialogMessage;
-static puFont      APAdjustLegendFont;
-static puFont      APAdjustLabelFont;
-
-static puOneShot *APAdjustOkButton;
-static puOneShot *APAdjustResetButton;
-static puOneShot *APAdjustCancelButton;
-
-//static puButton        *APAdjustDragButton;
-
-static puText *APAdjustMaxRollTitle;
-static puText *APAdjustRollOutTitle;
-static puText *APAdjustMaxAileronTitle;
-static puText *APAdjustRollOutSmoothTitle;
-
-static puText *APAdjustMaxAileronText;
-static puText *APAdjustMaxRollText;
-static puText *APAdjustRollOutText;
-static puText *APAdjustRollOutSmoothText;
-
-static mySlider *APAdjustHS0;
-static mySlider *APAdjustHS1;
-static mySlider *APAdjustHS2;
-static mySlider *APAdjustHS3;
-
-static char SliderText[ 4 ][ 8 ];
+// static double MaxRollAdjust;        // MaxRollAdjust       = 2 * APData->MaxRoll;
+// static double RollOutAdjust;        // RollOutAdjust       = 2 * APData->RollOut;
+// static double MaxAileronAdjust;     // MaxAileronAdjust    = 2 * APData->MaxAileron;
+// static double RollOutSmoothAdjust;  // RollOutSmoothAdjust = 2 * APData->RollOutSmooth;
+
+// static float MaxRollValue;          // 0.1 -> 1.0
+// static float RollOutValue;
+// static float MaxAileronValue;
+// static float RollOutSmoothValue;
+
+// static float TmpMaxRollValue;       // for cancel operation
+// static float TmpRollOutValue;
+// static float TmpMaxAileronValue;
+// static float TmpRollOutSmoothValue;
+
+// static puDialogBox *APAdjustDialog;
+// static puFrame     *APAdjustFrame;
+// static puText      *APAdjustDialogMessage;
+// static puFont      APAdjustLegendFont;
+// static puFont      APAdjustLabelFont;
+
+// static puOneShot *APAdjustOkButton;
+// static puOneShot *APAdjustResetButton;
+// static puOneShot *APAdjustCancelButton;
+
+// static puButton        *APAdjustDragButton;
+
+// static puText *APAdjustMaxRollTitle;
+// static puText *APAdjustRollOutTitle;
+// static puText *APAdjustMaxAileronTitle;
+// static puText *APAdjustRollOutSmoothTitle;
+
+// static puText *APAdjustMaxAileronText;
+// static puText *APAdjustMaxRollText;
+// static puText *APAdjustRollOutText;
+// static puText *APAdjustRollOutSmoothText;
+
+// static mySlider *APAdjustHS0;
+// static mySlider *APAdjustHS1;
+// static mySlider *APAdjustHS2;
+// static mySlider *APAdjustHS3;
+
+// static char SliderText[ 4 ][ 8 ];
 
 ///////// AutoPilot New Heading Dialog
 
@@ -139,7 +139,7 @@ static puOneShot       *ApAltitudeDialogCancelButton = 0;
 //  These statics should disapear when this is a class
 static puDialogBox     *TgtAptDialog = 0;
 static puFrame         *TgtAptDialogFrame = 0;
-static puText          *TgtAptDialogMessage = 0;
+// static puText          *TgtAptDialogMessage = 0;
 static puInput         *TgtAptDialogInput = 0;
 static puListBox       *TgtAptDialogWPList = 0;
 static puSlider        *TgtAptDialogSlider = 0;
@@ -350,6 +350,7 @@ void NewAltitudeInit()
 }
 
 
+#if 0
 static void maxroll_adj( puObject *hs ) {
     float val ;
     
@@ -597,6 +598,7 @@ void fgAPAdjustInit() {
 
 #undef HORIZONTAL
 }
+#endif
 
 // Simple Dialog to input Target Airport
 void TgtAptDialog_Cancel(puObject *)

diff --git a/src/Autopilot/auto_gui.hxx b/src/Autopilot/auto_gui.hxx
index 40a892a10d36d555e346682b230754e65496319b..f4226ac0e3b64666901b41f1dc4a4120eecb943b 100644 (file)
--- a/src/Autopilot/auto_gui.hxx
+++ b/src/Autopilot/auto_gui.hxx
@@ -37,7 +37,7 @@ SG_USING_STD( string );
 // prototypes
 
 class puObject;
-void fgAPAdjust( puObject * );
+// void fgAPAdjust( puObject * );
 void NewHeading(puObject *cb);
 void NewAltitude(puObject *cb);
 void AddWayPoint(puObject *cb);

diff --git a/src/Autopilot/xmlauto.cxx b/src/Autopilot/xmlauto.cxx
index 2002ceb7622bb3d984c864467c098512be12edde..24cb8a772f1aeb072ac3f389af1fc10948e273c2 100644 (file)
--- a/src/Autopilot/xmlauto.cxx
+++ b/src/Autopilot/xmlauto.cxx
@@ -64,13 +64,13 @@ FGPIDController::FGPIDController( SGPropertyNode *node, bool old ):
         if ( cname == "name" ) {
             name = cval;
         } else if ( cname == "enable" ) {
-            cout << "parsing enable" << endl;
+            // cout << "parsing enable" << endl;
             SGPropertyNode *prop = child->getChild( "prop" );
             if ( prop != NULL ) {
-                cout << "prop = " << prop->getStringValue() << endl;
+                // cout << "prop = " << prop->getStringValue() << endl;
                 enable_prop = fgGetNode( prop->getStringValue(), true );
             } else {
-                cout << "no prop child" << endl;
+                // cout << "no prop child" << endl;
             }
             SGPropertyNode *val = child->getChild( "value" );
             if ( val != NULL ) {
@@ -110,13 +110,13 @@ FGPIDController::FGPIDController( SGPropertyNode *node, bool old ):
                 tmp = prop->getChild( "min" );
                 if ( tmp != NULL ) {
                     u_min = tmp->getDoubleValue();
-                    cout << "min = " << u_min << endl;
+                    // cout << "min = " << u_min << endl;
                 }
 
                 tmp = prop->getChild( "max" );
                 if ( tmp != NULL ) {
                     u_max = tmp->getDoubleValue();
-                    cout << "max = " << u_max << endl;
+                    // cout << "max = " << u_max << endl;
                 }
             }
         } else if ( cname == "proportional" ) {
@@ -142,12 +142,12 @@ FGPIDController::FGPIDController( SGPropertyNode *node, bool old ):
                 SGPropertyNode *sub = prop->getChild( "prop" );
                 if ( sub != NULL ) {
                     offset_prop = fgGetNode( sub->getStringValue(), true );
-                    cout << "offset prop = " << sub->getStringValue() << endl;
+                    // cout << "offset prop = " << sub->getStringValue() << endl;
                 } else {
                     sub = prop->getChild( "value" );
                     if ( sub != NULL ) {
                         offset_value = sub->getDoubleValue();
-                        cout << "offset value = " << offset_value << endl;
+                        // cout << "offset value = " << offset_value << endl;
                     }
                 }
             }
@@ -202,13 +202,13 @@ FGPIDController::FGPIDController( SGPropertyNode *node ):
         } else if ( cname == "debug" ) {
             debug = child->getBoolValue();
         } else if ( cname == "enable" ) {
-            cout << "parsing enable" << endl;
+            // cout << "parsing enable" << endl;
             SGPropertyNode *prop = child->getChild( "prop" );
             if ( prop != NULL ) {
-                cout << "prop = " << prop->getStringValue() << endl;
+                // cout << "prop = " << prop->getStringValue() << endl;
                 enable_prop = fgGetNode( prop->getStringValue(), true );
             } else {
-                cout << "no prop child" << endl;
+                // cout << "no prop child" << endl;
             }
             SGPropertyNode *val = child->getChild( "value" );
             if ( val != NULL ) {
@@ -281,6 +281,9 @@ FGPIDController::FGPIDController( SGPropertyNode *node ):
             }
         } else {
             SG_LOG( SG_AUTOPILOT, SG_WARN, "Error in autopilot config logic" );
+            if ( name.length() ) {
+                SG_LOG( SG_AUTOPILOT, SG_WARN, "Section = " << name );
+            }
         }
     }   
 }

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 9882e84c3c06cefbf7acc51d208992c04d8eb15a..a4a30ee62e8ecb8619907c07976b4a347c98eec4 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -166,7 +166,6 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
         {"AddWayPoint", AddWayPoint},
         {"PopWayPoint", PopWayPoint},
         {"ClearRoute", ClearRoute},
-        {"fgAPAdjust", fgAPAdjust},
         {"fgLatLonFormatToggle", fgLatLonFormatToggle},
 
         // Help

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index 8be70c1a2a6d9d83a394907fba81144dbb8aef64..f613ec325fb762a460f7d9c67fd3051ec4064684 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -116,6 +116,7 @@ do_ap_clear_route_dialog (const SGPropertyNode * arg)
     return true;
 }
 
+#if 0
 extern void fgAPAdjust (puObject *);
 static bool
 do_ap_adjust_dialog (const SGPropertyNode * arg)
@@ -123,6 +124,7 @@ do_ap_adjust_dialog (const SGPropertyNode * arg)
     fgAPAdjust(0);
     return true;
 }
+#endif
 
 extern void fgLatLonFormatToggle (puObject *);
 static bool
@@ -159,7 +161,6 @@ static struct {
     { "old-ap-add-waypoint-dialog", do_ap_add_waypoint_dialog },
     { "old-ap-pop-waypoint-dialog", do_ap_pop_waypoint_dialog },
     { "old-ap-clear-route-dialog", do_ap_clear_route_dialog },
-    { "old-ap-adjust-dialog", do_ap_adjust_dialog },
     { "old-lat-lon-format-dialog", do_lat_lon_format_dialog },
     { "old-help-dialog", do_help_dialog },
     { 0, 0 }