X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2FNavDisplay.hxx;h=8a24eece7ba7bf3f24dc145d51e413a3511abcc6;hb=239a0007631da53c68ca9c8e7989957c567acac9;hp=870c3cc3051a58089dd83a13cd143a221253ef3e;hpb=4994973ef4d5a079acf76267b525313c15376478;p=flightgear.git diff --git a/src/Cockpit/NavDisplay.hxx b/src/Cockpit/NavDisplay.hxx index 870c3cc30..8a24eece7 100644 --- a/src/Cockpit/NavDisplay.hxx +++ b/src/Cockpit/NavDisplay.hxx @@ -90,7 +90,8 @@ protected: SGPropertyNode_ptr _radar_mode_control_node; SGPropertyNode_ptr _user_heading_node; SGPropertyNode_ptr _testModeNode; - + SGPropertyNode_ptr _userLatNode, _userLonNode, _userPositionEnable; + FGODGauge *_odg; // Convenience function for creating a property node with a @@ -120,6 +121,9 @@ private: void processAI(); void computeAIStates(const SGPropertyNode* ai, string_set& states); + void computeCustomSymbolStates(const SGPropertyNode* sym, string_set& states); + void processCustomSymbols(); + void findRules(const std::string& type, const string_set& states, SymbolRuleVector& rules); SymbolInstance* addSymbolInstance(const osg::Vec2& proj, double heading, SymbolDef* def, SGPropertyNode* vars); @@ -188,10 +192,11 @@ private: bool _cachedItemsValid; SGVec3d _cachedPos; - FGPositioned::List _itemsInRange; + FGPositionedList _itemsInRange; SGPropertyNode_ptr _excessDataNode; int _maxSymbols; - + SGPropertyNode_ptr _customSymbols; + class CacheListener; std::auto_ptr _cacheListener;