ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Prevent activation of already activated Tokens

Browse Source
This commit is contained in:
Eberhard Graether
2015-05-21 03:32:02 +02:00
parent 5868fe4d39
commit 1e8d8cece0
7 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+10 -17
View File
@@ -23,27 +23,22 @@ GraphController::~GraphController()
void GraphController::handleMessage(MessageActivateTokens* message)
{
m_activeTokenIds = message->tokenIds;
if (message->isEdge && message->tokenIds.size() == 1)
{
m_currentActiveTokenIds = m_activeTokenIds;
m_currentActiveTokenIds.push_back(message->tokenIds[0]);
setActiveAndVisibility(m_currentActiveTokenIds);
setActiveAndVisibility(message->tokenIds);
getView()->rebuildGraph(nullptr, m_dummyNodes, m_dummyEdges);
return;
}
if (message->isAggregation)
{
m_activeTokenIds.clear();
m_currentActiveTokenIds = message->tokenIds;
createDummyGraphForTokenIds(m_currentActiveTokenIds);
createDummyGraphForTokenIds(message->tokenIds);
return;
}
setActiveTokenIds(message->tokenIds);
createDummyGraphForTokenIds(m_activeTokenIds);
createDummyGraphForTokenIds(message->tokenIds);
}
void GraphController::handleMessage(MessageFinishedParsing* message)
@@ -76,7 +71,7 @@ void GraphController::handleMessage(MessageGraphNodeExpand* message)
node->expanded = !node->expanded;
}
setActiveAndVisibility(m_currentActiveTokenIds);
setActiveAndVisibility(m_activeTokenIds);
layoutNesting();
getView()->rebuildGraph(nullptr, m_dummyNodes, m_dummyEdges);
@@ -98,12 +93,6 @@ GraphView* GraphController::getView() const
return Controller::getView<GraphView>();
}
void GraphController::setActiveTokenIds(const std::vector<Id>& activeTokenIds)
{
m_activeTokenIds = activeTokenIds;
m_currentActiveTokenIds = activeTokenIds;
}
void GraphController::createDummyGraphForTokenIds(const std::vector<Id>& tokenIds)
{
GraphView* view = getView();
@@ -337,6 +326,10 @@ void GraphController::setNodeActiveRecursive(DummyNode& node, const std::vector<
{
node.active = find(activeTokenIds.begin(), activeTokenIds.end(), node.data->getId()) != activeTokenIds.end();
}
else if (node.isExpandToggleNode())
{
node.visible = true;
}
for (DummyNode& subNode : node.subNodes)
{