X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fwxradar.hxx;h=8f3e5122a7ba1e61cbf297e1d728178135951ab8;hb=43b300fe46d8013a90009ec8e1a923ec53a396b5;hp=287ea7e779b35fbddbba564dbbe2866c45104ed3;hpb=c2040f30a26451a9bc445843094117f63f3998a1;p=flightgear.git

diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx
index 287ea7e77..8f3e5122a 100644
--- a/src/Instrumentation/wxradar.hxx
+++ b/src/Instrumentation/wxradar.hxx
@@ -19,8 +19,6 @@
 // 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-//
 
 #ifndef _INST_WXRADAR_HXX
 #define _INST_WXRADAR_HXX
@@ -38,33 +36,30 @@
 #include <AIModel/AIManager.hxx>
 #include <vector>
 #include <string>
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 class FGAIBase;
-
 class FGODGauge;
 
 class wxRadarBg : public SGSubsystem, public SGPropertyChangeListener {
 public:
 
-    wxRadarBg ( SGPropertyNode *node );
-    wxRadarBg ();
-    virtual ~wxRadarBg ();
+    wxRadarBg(SGPropertyNode *node);
+    wxRadarBg();
+    virtual ~wxRadarBg();
 
-    virtual void init ();
-    virtual void update (double dt);
-    virtual void valueChanged(SGPropertyNode*);
+    virtual void init();
+    virtual void update(double dt);
+    virtual void valueChanged(SGPropertyNode *);
 
+protected:
+    string _name;
+    int _num;
     double _interval;
     double _time;
-
     bool _sim_init_done;
 
-    string _name;
-
-    int _num; 
-
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _Instrument;
     SGPropertyNode_ptr _radar_mode_control_node;
@@ -76,8 +71,12 @@ public:
 
     FGODGauge *_odg;
 
-private:
+    // Convenience function for creating a property node with a
+    // default value
+    template<typename DefaultType>
+    SGPropertyNode *getInstrumentNode(const char *name, DefaultType value);
 
+private:
     string _texture_path;
 
     typedef enum { ARC, MAP, PLAN, ROSE } DisplayMode;
@@ -110,14 +109,14 @@ private:
     SGPropertyNode_ptr _radar_position_node;
     SGPropertyNode_ptr _radar_data_node;
     SGPropertyNode_ptr _radar_symbol_node;
-    
+
     SGPropertyNode_ptr _radar_centre_node;
     SGPropertyNode_ptr _radar_coverage_node;
     SGPropertyNode_ptr _radar_ref_rng_node;
     SGPropertyNode_ptr _radar_hdg_marker_node;
     SGPropertyNode_ptr _radar_rotate_node;
-    SGPropertyNode_ptr _radar_font_node;
 
+    SGPropertyNode_ptr _font_node;
     SGPropertyNode_ptr _ai_enabled_node;
 
     osg::ref_ptr<osg::Texture2D> _resultTexture;
@@ -129,10 +128,13 @@ private:
     osg::Vec2Array *_texCoords;
     osg::Matrixf _centerTrans;
     osg::ref_ptr<osgText::Font> _font;
+    osg::Vec4 _font_color;
+    float _font_size;
+    float _font_spacing;
 
     list_of_SGWxRadarEcho _radarEchoBuffer;
 
-    FGAIManager* _ai;
+    FGAIManager *_ai;
 
     void update_weather();
     void update_aircraft();
@@ -149,7 +151,37 @@ private:
     bool inRadarRange(int type, double range);
 
     float calcRelBearing(float bearing, float heading);
-    
 };
 
+
+template<> inline
+SGPropertyNode *wxRadarBg::getInstrumentNode(const char *name, bool value)
+{
+    SGPropertyNode *result = _Instrument->getNode(name, true);
+    if (!result->hasValue())
+        result->setBoolValue(value);
+    return result;
+}
+
+
+template<> inline
+SGPropertyNode *wxRadarBg::getInstrumentNode(const char *name, double value)
+{
+    SGPropertyNode *result = _Instrument->getNode(name, true);
+    if (!result->hasValue())
+        result->setDoubleValue(value);
+    return result;
+}
+
+
+template<> inline
+SGPropertyNode *wxRadarBg::getInstrumentNode(const char *name, const char *value)
+{
+    SGPropertyNode *result = _Instrument->getNode(name, true);
+    if (result->hasValue())
+        result->setStringValue(value);
+    return result;
+}
+
+
 #endif // _INST_WXRADAR_HXX