fly/flightgear
1
0
Fork 0
Code Activity

MirrorPropertyTree websocket fixes

Browse source 
- deal with ‘NONE’ properties correctly
- use a better method to send the initial tree on connection.
This commit is contained in:
James Turner 2016-12-05 21:27:27 +00:00
parent d9cd65305a
commit b767a33f84
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Network/http/MirrorPropertyTreeWebsocket.cxx
View file

@ -44,7 +44,7 @@ using std::string;
struct PropertyValue
{
PropertyValue(SGPropertyNode* cur = nullptr) :
type(simgear::props::UNSPECIFIED)
type(simgear::props::NONE)
{
if (!cur) {
return;
@ -70,8 +70,11 @@ using std::string;
stringValue = cur->getStringValue();
break;
case simgear::props::NONE:
break;
default:
SG_LOG(SG_NETWORK, SG_INFO, "implement me!");
SG_LOG(SG_NETWORK, SG_INFO, "implement me!" << type);
break;
}
}
@ -92,6 +95,9 @@ using std::string;
case simgear::props::UNSPECIFIED:
return stringValue == other.stringValue;
case simgear::props::NONE:
return true;
default:
break;
}
@ -146,6 +152,19 @@ using std::string;
removedNodes.insert(idForProperty(child));
}
void registerSubtree(SGPropertyNode* node)
{
if (node->getType() != simgear::props::NONE) {
valueChanged(node);
}
// and recurse
int child = 0;
for (; child < node->nChildren(); ++child) {
registerSubtree(node->getChild(child));
}
}
std::set<SGPropertyNode*> newNodes;
std::set<SGPropertyNode*> changedNodes;
std::set<PropertyId> removedNodes;
@ -281,7 +300,7 @@ MirrorPropertyTreeWebsocket::MirrorPropertyTreeWebsocket(const std::string& path
{
_subtreeRoot = globals->get_props()->getNode(path, true);
_subtreeRoot->addChangeListener(_listener.get());
_subtreeRoot->fireCreatedRecursive();
_listener->registerSubtree(_subtreeRoot);
}
MirrorPropertyTreeWebsocket::~MirrorPropertyTreeWebsocket()