ui: fixed some ui related bugs

* aggregation edges only connect toplevel nodes
* fixed aggregation click for undo and redo
* don't show edge name in search field, because they are not searchable
* clear search field when clicking aggregation
* leave active nodes active when clicking edges
This commit is contained in:
Eberhard Graether
2015-08-03 16:33:29 +02:00
parent 165f32f6a6
commit f823d0ddb4
8 changed files with 59 additions and 36 deletions
@@ -76,6 +76,7 @@ private:
void layoutToGrid(DummyNode& node) const;
DummyNode* findDummyNodeRecursive(std::vector<DummyNode>& nodes, Id tokenId) const;
DummyNode* findTopLevelDummyNodeRecursive(std::vector<DummyNode>& nodes, Id tokenId) const;
DummyNode* findDummyNodeAccessRecursive(std::vector<DummyNode>& nodes, Id parentId, TokenComponentAccess::AccessType type) const;
void buildGraph(MessageBase* message);
@@ -85,7 +86,8 @@ private:
std::vector<DummyNode> m_dummyNodes;
std::vector<DummyEdge> m_dummyEdges;
std::vector<Id> m_activeTokenIds;
std::vector<Id> m_activeNodeIds;
std::vector<Id> m_activeEdgeIds;
std::shared_ptr<Graph> m_graph;
};