using std::setfill;
using std::cout;
using std::endl;
+using std::map;
+using std::string;
#include <Main/fg_props.hxx>
#include <Main/globals.hxx>
NavDisplay* _nd;
};
+class NavDisplay::ForceUpdateListener : public SGPropertyChangeListener
+{
+public:
+ ForceUpdateListener(NavDisplay *nd) :
+ _nd(nd)
+ {}
+
+ virtual void valueChanged (SGPropertyNode * prop)
+ {
+ SG_LOG(SG_INSTR, SG_INFO, "forcing NavDisplay update");
+ _nd->forceUpdate();
+ }
+private:
+ NavDisplay* _nd;
+};
+
///////////////////////////////////////////////////////////////////
-class SymbolDef
+class SymbolRule
{
public:
- SymbolDef() :
- enable(NULL)
- {}
-
- bool initFromNode(SGPropertyNode* node)
+ SymbolRule()
+ {
+
+ }
+
+ bool initFromNode(SGPropertyNode* node, NavDisplay* owner)
{
+ if (!node->getChild("type")) {
+ return false;
+ }
+
type = node->getStringValue("type");
SGPropertyNode* enableNode = node->getChild("enable");
if (enableNode) {
- enable = sgReadCondition(fgGetNode("/"), enableNode);
+ enable.reset(sgReadCondition(fgGetNode("/"), enableNode));
}
-
+
int n=0;
while (node->hasChild("state", n)) {
string m = node->getChild("state", n++)->getStringValue();
}
} // of matches parsing
- if (node->hasChild("width")) {
- float w = node->getFloatValue("width");
- float h = node->getFloatValue("height", w);
- xy0.x() = -w * 0.5;
- xy0.y() = -h * 0.5;
- xy1.x() = w * 0.5;
- xy1.y() = h * 0.5;
- } else {
- xy0.x() = node->getFloatValue("x0", 0.0);
- xy0.y() = node->getFloatValue("y0", 0.0);
- xy1.x() = node->getFloatValue("x1", 5);
- xy1.y() = node->getFloatValue("y1", 5);
- }
+ return true;
+ }
+
+ void setDefinition(SymbolDef* d)
+ {
+ definition = d;
+ }
+
+ SymbolDef* getDefinition() const
+ { return definition; }
+
+ bool matches(const string_set& states) const
+ {
+ BOOST_FOREACH(const string& s, required_states) {
+ if (states.count(s) == 0) {
+ return false;
+ }
+ }
+
+ BOOST_FOREACH(const string& s, excluded_states) {
+ if (states.count(s) != 0) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ void checkEnabled()
+ {
+ if (enable.get()) {
+ enabled = enable->test();
+ } else {
+ enabled = true;
+ }
+ }
+
+ bool enabled; // cached enabled state
+ std::string type;
+private:
+ SymbolDef* definition;
+
+ std::auto_ptr<SGCondition> enable;
+ string_set required_states;
+ string_set excluded_states;
+
+};
+
+class SymbolDef
+{
+public:
+ bool initFromNode(SGPropertyNode* node, NavDisplay* owner)
+ {
+ if (node->getChild("type")) {
+ SymbolRule* builtinRule = new SymbolRule;
+ builtinRule->initFromNode(node, owner);
+ builtinRule->setDefinition(this);
+ owner->addRule(builtinRule);
+ }
+
+ if (node->hasChild("width")) {
+ float w = node->getFloatValue("width");
+ float h = node->getFloatValue("height", w);
+ xy0.x() = -w * 0.5;
+ xy0.y() = -h * 0.5;
+ xy1.x() = w * 0.5;
+ xy1.y() = h * 0.5;
+ } else {
+ xy0.x() = node->getFloatValue("x0", 0.0);
+ xy0.y() = node->getFloatValue("y0", 0.0);
+ xy1.x() = node->getFloatValue("x1", 5);
+ xy1.y() = node->getFloatValue("y1", 5);
+ }
- double texSize = node->getFloatValue("texture-size", 1.0);
+ double texSize = node->getFloatValue("texture-size", owner->textureSize());
uv0.x() = node->getFloatValue("u0", 0) / texSize;
uv0.y() = node->getFloatValue("v0", 0) / texSize;
return true;
}
- SGCondition* enable;
- bool enabled; // cached enabled state
-
- std::string type;
- string_set required_states;
- string_set excluded_states;
-
osg::Vec2 xy0, xy1;
osg::Vec2 uv0, uv1;
osg::Vec4 color;
bool drawRouteLeg;
- bool matches(const string_set& states) const
- {
- BOOST_FOREACH(const string& s, required_states) {
- if (states.count(s) == 0) {
- return false;
- }
- }
-
- BOOST_FOREACH(const string& s, excluded_states) {
- if (states.count(s) != 0) {
- return false;
- }
- }
-
- return true;
- }
};
class SymbolInstance
_num(node->getIntValue("number", 0)),
_time(0.0),
_updateInterval(node->getDoubleValue("update-interval-sec", 0.1)),
+ _forceUpdate(true),
_odg(0),
_scale(0),
_view_heading(0),
INITFONT("color/alpha", 1, Float);
#undef INITFONT
+ _textureSize = _Instrument->getNode("symbol-texture-size", true)->getIntValue();
SGPropertyNode* symbolsNode = node->getNode("symbols");
SGPropertyNode* symbol;
-
+
+ map<string, SymbolDef*> definitionDict;
for (int i = 0; (symbol = symbolsNode->getChild("symbol", i)) != NULL; ++i) {
SymbolDef* def = new SymbolDef;
- if (!def->initFromNode(symbol)) {
+ if (!def->initFromNode(symbol, this)) {
delete def;
continue;
}
- _rules.push_back(def);
+ const char* id = symbol->getStringValue("id");
+ if (id && strlen(id)) {
+ definitionDict[id] = def;
+ }
+
+ _definitions.push_back(def);
} // of symbol definition parsing
+
+ SGPropertyNode* rulesNode = node->getNode("rules");
+ if (rulesNode) {
+ SGPropertyNode* rule;
+
+ for (int i = 0; (rule = rulesNode->getChild("rule", i)) != NULL; ++i) {
+ SymbolRule* r = new SymbolRule;
+ if (!r->initFromNode(rule, this)) {
+ delete r;
+ continue;
+ }
+
+ const char* id = symbol->getStringValue("symbol");
+ if (id && strlen(id) && (definitionDict.find(id) != definitionDict.end())) {
+ r->setDefinition(definitionDict[id]);
+ } else {
+ SG_LOG(SG_INSTR, SG_WARN, "symbol rule has missing/unknown definition id:" << id);
+ delete r;
+ continue;
+ }
+
+ addRule(r);
+ } // of symbol rule parsing
+ }
+
}
{
_cachedItemsValid = false;
_cacheListener.reset(new CacheListener(this));
-
+ _forceUpdateListener.reset(new ForceUpdateListener(this));
+
_serviceable_node = _Instrument->getNode("serviceable", true);
_rangeNode = _Instrument->getNode("range", true);
_rangeNode->setDoubleValue(40.0);
_rangeNode->addChangeListener(_cacheListener.get());
-
+ _rangeNode->addChangeListener(_forceUpdateListener.get());
+
+ _xCenterNode = _Instrument->getNode("x-center");
+ _xCenterNode->setDoubleValue(0.5);
+ _xCenterNode->addChangeListener(_forceUpdateListener.get());
+ _yCenterNode = _Instrument->getNode("y-center");
+ _yCenterNode->setDoubleValue(0.5);
+ _yCenterNode->addChangeListener(_forceUpdateListener.get());
+
// texture name to use in 2D and 3D instruments
_texture_path = _Instrument->getStringValue("radar-texture-path",
"Aircraft/Instruments/Textures/od_wxradar.rgb");
return;
}
- _time += delta_time_sec;
- if (_time < _updateInterval){
- return;
+ if (_forceUpdate) {
+ _forceUpdate = false;
+ _time = 0.0;
+ } else {
+ _time += delta_time_sec;
+ if (_time < _updateInterval){
+ return;
+ }
+ _time -= _updateInterval;
}
- _time -= _updateInterval;
_rangeNm = _rangeNode->getFloatValue();
if (_testModeNode->getBoolValue()) {
_view_heading = _Instrument->getFloatValue("heading-up-deg", 0.0);
}
- double xCenterFrac = _Instrument->getDoubleValue("x-center", 0.5);
- double yCenterFrac = _Instrument->getDoubleValue("y-center", 0.5);
+ double xCenterFrac = _xCenterNode->getDoubleValue();
+ double yCenterFrac = _yCenterNode->getDoubleValue();
int pixelSize = _odg->size();
int rangePixels = _Instrument->getIntValue("range-pixels", -1);
}
_symbols.clear();
- BOOST_FOREACH(SymbolDef* def, _rules) {
- if (def->enable) {
- def->enabled = def->enable->test();
- } else {
- def->enabled = true;
- }
+ BOOST_FOREACH(SymbolRule* r, _rules) {
+ r->checkEnabled();
}
if (_testModeNode->getBoolValue()) {
state.insert("next-wp");
}
- SymbolDefVector rules;
+ SymbolRuleVector rules;
findRules("waypoint" , state, rules);
if (rules.empty()) {
return; // no rules matched, we can skip this item
computeWayptPropsAndHeading(wpt, g, vars, heading);
osg::Vec2 projected = projectGeod(g);
- BOOST_FOREACH(SymbolDef* r, rules) {
- addSymbolInstance(projected, heading, r, vars);
+ BOOST_FOREACH(SymbolRule* r, rules) {
+ addSymbolInstance(projected, heading, r->getDefinition(), vars);
- if (r->drawRouteLeg) {
+ if (r->getDefinition()->drawRouteLeg) {
SGGeodVec gv(path.pathForIndex(w));
if (!gv.empty()) {
osg::Vec2 pr = projectGeod(gv[0]);
for (unsigned int i=1; i<gv.size(); ++i) {
osg::Vec2 p = projectGeod(gv[i]);
- addLine(pr, p, r->lineColor);
+ addLine(pr, p, r->getDefinition()->lineColor);
pr = p;
}
}
bool NavDisplay::anyRuleForType(const string& type) const
{
- BOOST_FOREACH(SymbolDef* r, _rules) {
+ BOOST_FOREACH(SymbolRule* r, _rules) {
if (!r->enabled) {
continue;
}
bool NavDisplay::anyRuleMatches(const string& type, const string_set& states) const
{
- BOOST_FOREACH(SymbolDef* r, _rules) {
+ BOOST_FOREACH(SymbolRule* r, _rules) {
if (!r->enabled || (r->type != type)) {
continue;
}
return false;
}
-void NavDisplay::findRules(const string& type, const string_set& states, SymbolDefVector& rules)
+void NavDisplay::findRules(const string& type, const string_set& states, SymbolRuleVector& rules)
{
- BOOST_FOREACH(SymbolDef* candidate, _rules) {
+ BOOST_FOREACH(SymbolRule* candidate, _rules) {
if (!candidate->enabled || (candidate->type != type)) {
continue;
}
string_set states;
computePositionedState(pos, states);
- SymbolDefVector rules;
+ SymbolRuleVector rules;
findRules(type, states, rules);
if (rules.empty()) {
return; // no rules matched, we can skip this item
projected = projectGeod(rwy->threshold());
}
- BOOST_FOREACH(SymbolDef* r, rules) {
- SymbolInstance* ins = addSymbolInstance(projected, heading, r, vars);
+ BOOST_FOREACH(SymbolRule* r, rules) {
+ SymbolInstance* ins = addSymbolInstance(projected, heading, r->getDefinition(), vars);
if (pos->type() == FGPositioned::RUNWAY) {
FGRunway* rwy = (FGRunway*) pos;
ins->endPos = projectGeod(rwy->end());
// with fg-positioned.
string_set ss;
computeAIStates(model, ss);
- SymbolDefVector rules;
+ SymbolRuleVector rules;
findRules(mapAINodeToType(model), ss, rules);
if (rules.empty()) {
return; // no rules matched, we can skip this item
model->setIntValue("flight-level", fl * 10);
osg::Vec2 projected = projectGeod(aiModelPos);
- BOOST_FOREACH(SymbolDef* r, rules) {
- addSymbolInstance(projected, heading, r, (SGPropertyNode*) model);
+ BOOST_FOREACH(SymbolRule* r, rules) {
+ addSymbolInstance(projected, heading, r->getDefinition(), (SGPropertyNode*) model);
}
} // of ai models iteration
}
stateSet.insert(s);
}
- SymbolDefVector rules;
+ SymbolRuleVector rules;
findRules(type, stateSet, rules);
if (rules.empty()) {
return; // no rules matched, we can skip this item
}
osg::Vec2 projected = projectGeod(pos);
- BOOST_FOREACH(SymbolDef* r, rules) {
- addSymbolInstance(projected, heading, r, vars);
+ BOOST_FOREACH(SymbolRule* r, rules) {
+ addSymbolInstance(projected, heading, r->getDefinition(), vars);
}
}
addTestSymbol("fix", "", a1, 0.0, NULL);
}
+void NavDisplay::addRule(SymbolRule* r)
+{
+ _rules.push_back(r);
+}
projects / flightgear.git / blobdiff