Fix positional ordering of remote-canvas elements.
The mirror protocol now sends the position for internal as well as leaf nodes, and the group uses this data to sort when no explicit Z-indices exist. This gets the extra-500 much closer to working!
This commit is contained in:
parent
c9f922ce1b
commit
8472f8c6d0
6 changed files with 52 additions and 15 deletions
src/Network/http
utils/fgqcanvas
|
@ -165,7 +165,7 @@ using std::string;
|
||||||
|
|
||||||
virtual void childAdded(SGPropertyNode* parent, SGPropertyNode* child) override
|
virtual void childAdded(SGPropertyNode* parent, SGPropertyNode* child) override
|
||||||
{
|
{
|
||||||
// this works becuase customer operator== overload on RecentlyRemovedNode
|
// this works becuase custom operator== overload on RecentlyRemovedNode
|
||||||
// ignores the ID value.
|
// ignores the ID value.
|
||||||
RecentlyRemovedNode m(child, 0);
|
RecentlyRemovedNode m(child, 0);
|
||||||
auto rrIt = std::find(recentlyRemoved.begin(), recentlyRemoved.end(), m);
|
auto rrIt = std::find(recentlyRemoved.begin(), recentlyRemoved.end(), m);
|
||||||
|
@ -201,9 +201,7 @@ using std::string;
|
||||||
|
|
||||||
void registerSubtree(SGPropertyNode* node)
|
void registerSubtree(SGPropertyNode* node)
|
||||||
{
|
{
|
||||||
if (node->getType() != simgear::props::NONE) {
|
valueChanged(node);
|
||||||
valueChanged(node);
|
|
||||||
}
|
|
||||||
|
|
||||||
// and recurse
|
// and recurse
|
||||||
int child = 0;
|
int child = 0;
|
||||||
|
@ -248,8 +246,9 @@ using std::string;
|
||||||
cJSON_AddItemToObject(newPropData, "index", cJSON_CreateNumber(prop->getIndex()));
|
cJSON_AddItemToObject(newPropData, "index", cJSON_CreateNumber(prop->getIndex()));
|
||||||
cJSON_AddItemToObject(newPropData, "position", cJSON_CreateNumber(prop->getPosition()));
|
cJSON_AddItemToObject(newPropData, "position", cJSON_CreateNumber(prop->getPosition()));
|
||||||
cJSON_AddItemToObject(newPropData, "id", cJSON_CreateNumber(idForProperty(prop)));
|
cJSON_AddItemToObject(newPropData, "id", cJSON_CreateNumber(idForProperty(prop)));
|
||||||
cJSON_AddItemToObject(newPropData, "value", JSON::valueToJson(prop));
|
if (prop->getType() != simgear::props::NONE) {
|
||||||
|
cJSON_AddItemToObject(newPropData, "value", JSON::valueToJson(prop));
|
||||||
|
}
|
||||||
cJSON_AddItemToArray(newNodesArray, newPropData);
|
cJSON_AddItemToArray(newNodesArray, newPropData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,10 @@ QVariant ElementDataModel::data(const QModelIndex &index, int role) const
|
||||||
return key;
|
return key;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (key == "position") {
|
||||||
|
return m_element->property()->position();
|
||||||
|
}
|
||||||
|
|
||||||
return m_element->property()->value(key.constData(), QVariant());
|
return m_element->property()->value(key.constData(), QVariant());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,4 +71,6 @@ void ElementDataModel::computeKeys()
|
||||||
m_keys.append(b);
|
m_keys.append(b);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_keys.append("position");
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,20 @@
|
||||||
#include "fgqcanvasmap.h"
|
#include "fgqcanvasmap.h"
|
||||||
#include "fgqcanvasimage.h"
|
#include "fgqcanvasimage.h"
|
||||||
|
|
||||||
|
class ChildOrderingFunction
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
bool operator()(const FGCanvasElement* a, FGCanvasElement* b)
|
||||||
|
{
|
||||||
|
if (a->zIndex() == b->zIndex()) {
|
||||||
|
// use prop node positions in the parent
|
||||||
|
return a->property()->position() < b->property()->position();
|
||||||
|
}
|
||||||
|
|
||||||
|
return a->zIndex() < b->zIndex();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
FGCanvasGroup::FGCanvasGroup(FGCanvasGroup* pr, LocalProp* prop) :
|
FGCanvasGroup::FGCanvasGroup(FGCanvasGroup* pr, LocalProp* prop) :
|
||||||
FGCanvasElement(pr, prop)
|
FGCanvasElement(pr, prop)
|
||||||
{
|
{
|
||||||
|
@ -54,8 +68,7 @@ unsigned int FGCanvasGroup::indexOfChild(const FGCanvasElement *e) const
|
||||||
void FGCanvasGroup::doPaint(FGCanvasPaintContext *context) const
|
void FGCanvasGroup::doPaint(FGCanvasPaintContext *context) const
|
||||||
{
|
{
|
||||||
if (_zIndicesDirty) {
|
if (_zIndicesDirty) {
|
||||||
std::sort(_children.begin(), _children.end(), [](const FGCanvasElement* a, FGCanvasElement* b)
|
std::sort(_children.begin(), _children.end(), ChildOrderingFunction());
|
||||||
{ return a->zIndex() < b->zIndex(); });
|
|
||||||
_zIndicesDirty = false;
|
_zIndicesDirty = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,23 +95,18 @@ bool FGCanvasGroup::onChildAdded(LocalProp *prop)
|
||||||
if (nm == "group") {
|
if (nm == "group") {
|
||||||
_children.push_back(new FGCanvasGroup(this, prop));
|
_children.push_back(new FGCanvasGroup(this, prop));
|
||||||
newChildCount++;
|
newChildCount++;
|
||||||
return true;
|
|
||||||
} else if (nm == "path") {
|
} else if (nm == "path") {
|
||||||
_children.push_back(new FGCanvasPath(this, prop));
|
_children.push_back(new FGCanvasPath(this, prop));
|
||||||
newChildCount++;
|
newChildCount++;
|
||||||
return true;
|
|
||||||
} else if (nm == "text") {
|
} else if (nm == "text") {
|
||||||
_children.push_back(new FGCanvasText(this, prop));
|
_children.push_back(new FGCanvasText(this, prop));
|
||||||
newChildCount++;
|
newChildCount++;
|
||||||
return true;
|
|
||||||
} else if (nm == "image") {
|
} else if (nm == "image") {
|
||||||
_children.push_back(new FGQCanvasImage(this, prop));
|
_children.push_back(new FGQCanvasImage(this, prop));
|
||||||
newChildCount++;
|
newChildCount++;
|
||||||
return true;
|
|
||||||
} else if (nm == "map") {
|
} else if (nm == "map") {
|
||||||
_children.push_back(new FGQCanvasMap(this, prop));
|
_children.push_back(new FGQCanvasMap(this, prop));
|
||||||
newChildCount++;
|
newChildCount++;
|
||||||
return true;
|
|
||||||
} else if (nm == "symbol-type") {
|
} else if (nm == "symbol-type") {
|
||||||
connect(prop, &LocalProp::valueChanged, this, &FGCanvasGroup::markCachedSymbolDirty);
|
connect(prop, &LocalProp::valueChanged, this, &FGCanvasGroup::markCachedSymbolDirty);
|
||||||
return true;
|
return true;
|
||||||
|
@ -112,7 +120,9 @@ bool FGCanvasGroup::onChildAdded(LocalProp *prop)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newChildCount > 0) {
|
if (newChildCount > 0) {
|
||||||
|
markChildZIndicesDirty();
|
||||||
emit childAdded();
|
emit childAdded();
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << "saw unknown group child" << prop->name();
|
qDebug() << "saw unknown group child" << prop->name();
|
||||||
|
|
|
@ -53,6 +53,10 @@ LocalProp::LocalProp(LocalProp *pr, const NameIndexTuple& ni) :
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LocalProp::~LocalProp()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void LocalProp::processChange(QJsonValue json)
|
void LocalProp::processChange(QJsonValue json)
|
||||||
{
|
{
|
||||||
QVariant newValue = json.toVariant();
|
QVariant newValue = json.toVariant();
|
||||||
|
@ -132,6 +136,11 @@ unsigned int LocalProp::index() const
|
||||||
return _id.index;
|
return _id.index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LocalProp::setPosition(unsigned int pos)
|
||||||
|
{
|
||||||
|
_position = pos;
|
||||||
|
}
|
||||||
|
|
||||||
LocalProp *LocalProp::parent() const
|
LocalProp *LocalProp::parent() const
|
||||||
{
|
{
|
||||||
return const_cast<LocalProp*>(_parent);
|
return const_cast<LocalProp*>(_parent);
|
||||||
|
|
|
@ -57,6 +57,8 @@ class LocalProp : public QObject
|
||||||
public:
|
public:
|
||||||
LocalProp(LocalProp* parent, const NameIndexTuple& ni);
|
LocalProp(LocalProp* parent, const NameIndexTuple& ni);
|
||||||
|
|
||||||
|
virtual ~LocalProp();
|
||||||
|
|
||||||
void processChange(QJsonValue newValue);
|
void processChange(QJsonValue newValue);
|
||||||
|
|
||||||
const NameIndexTuple& id() const;
|
const NameIndexTuple& id() const;
|
||||||
|
@ -79,6 +81,16 @@ public:
|
||||||
|
|
||||||
unsigned int index() const;
|
unsigned int index() const;
|
||||||
|
|
||||||
|
/// position in the main FG propery tree. Normally
|
||||||
|
/// irrelevant but unfortunately necessary for correct
|
||||||
|
/// z-ordering of Canvas elements
|
||||||
|
unsigned int position() const
|
||||||
|
{
|
||||||
|
return _position;
|
||||||
|
}
|
||||||
|
|
||||||
|
void setPosition(unsigned int pos);
|
||||||
|
|
||||||
LocalProp* parent() const;
|
LocalProp* parent() const;
|
||||||
|
|
||||||
std::vector<LocalProp*> children() const
|
std::vector<LocalProp*> children() const
|
||||||
|
@ -108,6 +120,7 @@ private:
|
||||||
const LocalProp* _parent;
|
const LocalProp* _parent;
|
||||||
std::vector<LocalProp*> _children;
|
std::vector<LocalProp*> _children;
|
||||||
QVariant _value;
|
QVariant _value;
|
||||||
|
unsigned int _position = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // LOCALPROP_H
|
#endif // LOCALPROP_H
|
||||||
|
|
|
@ -105,7 +105,7 @@ void TemporaryWidget::onTextMessageReceived(QString message)
|
||||||
|
|
||||||
QByteArray localPath = nodePath.mid(rootPropertyPath.size() + 1);
|
QByteArray localPath = nodePath.mid(rootPropertyPath.size() + 1);
|
||||||
LocalProp* newNode = propertyFromPath(localPath);
|
LocalProp* newNode = propertyFromPath(localPath);
|
||||||
|
newNode->setPosition(newProp.value("position").toInt());
|
||||||
// store in the global dict
|
// store in the global dict
|
||||||
unsigned int propId = newProp.value("id").toInt();
|
unsigned int propId = newProp.value("id").toInt();
|
||||||
if (idPropertyDict.contains(propId)) {
|
if (idPropertyDict.contains(propId)) {
|
||||||
|
@ -119,7 +119,7 @@ void TemporaryWidget::onTextMessageReceived(QString message)
|
||||||
}
|
}
|
||||||
|
|
||||||
// process removes
|
// process removes
|
||||||
QJsonArray removed = json.object().value("remvoed").toArray();
|
QJsonArray removed = json.object().value("removed").toArray();
|
||||||
Q_FOREACH (QJsonValue v, removed) {
|
Q_FOREACH (QJsonValue v, removed) {
|
||||||
unsigned int propId = v.toInt();
|
unsigned int propId = v.toInt();
|
||||||
if (idPropertyDict.contains(propId)) {
|
if (idPropertyDict.contains(propId)) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue