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

src: Fixes for release

Browse Source 
* Fixed annotations in code view when showing errors
* Fixed context menu hatched for non-indexed/incomplete file button
* Fixed file minimize button losing hover style when leaving to file bar
* Fixed only change bookmark button state when active node is bookmarked
* Fixed use bezier edges when expanding node on aggregation graph
* Fixed manually expanded nodes stay expanded
This commit is contained in:
Eberhard Graether
2017-06-07 17:46:16 +02:00
parent 2b1098fe1d
commit 610dbf5bfb
12 changed files with 79 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/PersistentStorage.cpp
+41 -3
View File
@@ -987,7 +987,7 @@ std::shared_ptr<Graph> PersistentStorage::getGraphForAll() const
}
std::shared_ptr<Graph> PersistentStorage::getGraphForActiveTokenIds(
const std::vector<Id>& tokenIds, bool* isActiveNamespace) const
const std::vector<Id>& tokenIds, const std::vector<Id>& expandedNodeIds, bool* isActiveNamespace) const
{
TRACE();
@@ -1103,6 +1103,26 @@ std::shared_ptr<Graph> PersistentStorage::getGraphForActiveTokenIds(
addAggregationEdgesToGraph(tokenIds[0], edgesToAggregate, graph);
}
if (!isNamespace)
{
std::vector<Id> expandedChildIds;
std::vector<Id> expandedChildEdgeIds;
for (Id nodeId : expandedNodeIds)
{
if (graph->getNodeById(nodeId))
{
m_hierarchyCache.addFirstNonImplicitChildIdsForNodeId(nodeId, &expandedChildIds, &expandedChildEdgeIds);
}
}
if (expandedChildIds.size())
{
addNodesToGraph(expandedChildIds, graph);
addEdgesToGraph(expandedChildEdgeIds, graph);
}
}
addComponentAccessToGraph(graph);
if (isActiveNamespace)
@@ -1778,10 +1798,19 @@ std::vector<Id> PersistentStorage::getAllChildNodeIds(const Id nodeId) const
return utility::toVector(childNodeIds);
}
void PersistentStorage::addNodesToGraph(const std::vector<Id>& nodeIds, Graph* graph) const
void PersistentStorage::addNodesToGraph(const std::vector<Id>& newNodeIds, Graph* graph) const
{
TRACE();
std::vector<Id> nodeIds;
for (Id id : newNodeIds)
{
if (!graph->getNodeById(id))
{
nodeIds.push_back(id);
}
}
if (nodeIds.size() == 0)
{
return;
@@ -1865,10 +1894,19 @@ void PersistentStorage::addNodesToGraph(const std::vector<Id>& nodeIds, Graph* g
}
}
void PersistentStorage::addEdgesToGraph(const std::vector<Id>& edgeIds, Graph* graph) const
void PersistentStorage::addEdgesToGraph(const std::vector<Id>& newEdgeIds, Graph* graph) const
{
TRACE();
std::vector<Id> edgeIds;
for (Id id : newEdgeIds)
{
if (!graph->getEdgeById(id))
{
edgeIds.push_back(id);
}
}
if (edgeIds.size() == 0)
{
return;