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

ui: Fixed order of bundle nodes in graph overview

Browse Source
This commit is contained in:
Eberhard Graether
2017-12-11 00:05:43 +01:00
parent 0d30132cc4
commit f9fb08e490
4 changed files with 81 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+10 -9
View File
@@ -1205,8 +1205,8 @@ std::shared_ptr<DummyNode> GraphController::bundleNodesMatching(
}
std::shared_ptr<DummyNode> GraphController::bundleByType(
std::list<std::shared_ptr<DummyNode>>& nodes,
const NodeType& type,
std::list<std::shared_ptr<DummyNode>>& nodes,
const NodeType& type,
const Tree<NodeType::BundleInfo>& bundleInfoTree,
const bool considerInvisibleNodes)
{
@@ -1214,10 +1214,10 @@ std::shared_ptr<DummyNode> GraphController::bundleByType(
nodes,
[&](const DummyNode* node)
{
return
(considerInvisibleNodes || node->visible) &&
node->isGraphNode() &&
node->data->getType() == type &&
return
(considerInvisibleNodes || node->visible) &&
node->isGraphNode() &&
node->data->getType() == type &&
bundleInfoTree.data.nameMatcher(node->name);
},
bundleInfoTree.data.bundleName
@@ -1272,11 +1272,12 @@ void GraphController::bundleNodesByType()
nodes.push_back(oldNodes[i]);
}
for (const NodeType& nodeType : NodeTypeSet::all().getNodeTypes())
for (const NodeType& nodeType : NodeType::getOverviewBundleNodeTypesOrdered())
{
if (nodeType.hasOverviewBundle())
Tree<NodeType::BundleInfo> bundleInfoTree = nodeType.getOverviewBundleTree();
if (bundleInfoTree.data.isValid())
{
std::shared_ptr<DummyNode> bundleNode = bundleByType(nodes, nodeType, nodeType.getOverviewBundleTree());
std::shared_ptr<DummyNode> bundleNode = bundleByType(nodes, nodeType, bundleInfoTree);
if (bundleNode)
{
m_dummyNodes.push_back(bundleNode);
src/lib/component/controller/GraphController.h
+2 -2
View File
@@ -98,8 +98,8 @@ private:
std::shared_ptr<DummyNode> bundleNodesMatching(
std::list<std::shared_ptr<DummyNode>>& nodes, std::function<bool(const DummyNode*)> matcher, const std::string& name);
std::shared_ptr<DummyNode> bundleByType(
std::list<std::shared_ptr<DummyNode>>& nodes,
const NodeType& type,
std::list<std::shared_ptr<DummyNode>>& nodes,
const NodeType& type,
const Tree<NodeType::BundleInfo>& bundleInfoTree,
const bool considerInvisibleNodes = false);
void bundleNodesByType();
src/lib/data/NodeType.cpp
+54 -29
View File
@@ -3,6 +3,25 @@
#include "utility/ResourcePaths.h"
#include "utility/utilityString.h"
std::vector<NodeType> NodeType::getOverviewBundleNodeTypesOrdered()
{
return {
NodeType(NodeType::NODE_FILE),
NodeType(NodeType::NODE_MACRO),
NodeType(NodeType::NODE_NAMESPACE),
NodeType(NodeType::NODE_PACKAGE),
NodeType(NodeType::NODE_CLASS),
NodeType(NodeType::NODE_INTERFACE),
NodeType(NodeType::NODE_STRUCT),
NodeType(NodeType::NODE_FUNCTION),
NodeType(NodeType::NODE_GLOBAL_VARIABLE),
NodeType(NodeType::NODE_TYPE),
NodeType(NodeType::NODE_TYPEDEF),
NodeType(NodeType::NODE_ENUM),
NodeType(NodeType::NODE_UNION),
};
}
NodeType::NodeType(Type type)
: m_type(type)
{
@@ -161,36 +180,42 @@ Tree<NodeType::BundleInfo> NodeType::getOverviewBundleTree() const
{
switch (m_type)
{
case NodeType::NODE_FILE:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Files"));
case NodeType::NODE_MACRO:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Macros"));
case NodeType::NODE_NAMESPACE:
case NodeType::NODE_FILE:
return Tree<BundleInfo>(BundleInfo("Files"));
case NodeType::NODE_MACRO:
return Tree<BundleInfo>(BundleInfo("Macros"));
case NodeType::NODE_NAMESPACE:
{
Tree<BundleInfo> tree(BundleInfo([](const std::string&) { return true; }, "Namespaces"));
tree.children.push_back(Tree<BundleInfo>(BundleInfo([](const std::string& nodeName) { return nodeName.find("anonymous namespace") != std::string::npos; }, "Anonymous Namespaces")));
Tree<BundleInfo> tree(BundleInfo("Namespaces"));
tree.children.push_back(Tree<BundleInfo>(BundleInfo(
[](const std::string& nodeName)
{
return nodeName.find("anonymous namespace") != std::string::npos;
},
"Anonymous Namespaces")
));
return tree;
}
case NodeType::NODE_PACKAGE:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Packages"));
case NodeType::NODE_CLASS:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Classes"));
case NodeType::NODE_INTERFACE:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Interfaces"));
case NodeType::NODE_STRUCT:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Structs"));
case NodeType::NODE_FUNCTION:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Functions"));
case NodeType::NODE_GLOBAL_VARIABLE:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Global Variables"));
case NodeType::NODE_TYPE:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Types"));
case NodeType::NODE_TYPEDEF:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Typedefs"));
case NodeType::NODE_ENUM:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Enums"));
case NodeType::NODE_UNION:
return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Unions"));
case NodeType::NODE_PACKAGE:
return Tree<BundleInfo>(BundleInfo("Packages"));
case NodeType::NODE_CLASS:
return Tree<BundleInfo>(BundleInfo("Classes"));
case NodeType::NODE_INTERFACE:
return Tree<BundleInfo>(BundleInfo("Interfaces"));
case NodeType::NODE_STRUCT:
return Tree<BundleInfo>(BundleInfo("Structs"));
case NodeType::NODE_FUNCTION:
return Tree<BundleInfo>(BundleInfo("Functions"));
case NodeType::NODE_GLOBAL_VARIABLE:
return Tree<BundleInfo>(BundleInfo("Global Variables"));
case NodeType::NODE_TYPE:
return Tree<BundleInfo>(BundleInfo("Types"));
case NodeType::NODE_TYPEDEF:
return Tree<BundleInfo>(BundleInfo("Typedefs"));
case NodeType::NODE_ENUM:
return Tree<BundleInfo>(BundleInfo("Enums"));
case NodeType::NODE_UNION:
return Tree<BundleInfo>(BundleInfo("Unions"));
default:
break;
}
@@ -268,7 +293,7 @@ NodeType::StyleType NodeType::getNodeStyle() const
bool NodeType::hasOverviewBundle() const
{
return !getOverviewBundleTree().data.bundleName.empty();
return !getOverviewBundleTree().data.isValid();
}
std::string NodeType::getUnderscoredTypeString() const
@@ -394,4 +419,4 @@ NodeType::Type utility::getTypeForReadableTypeString(const std::string str)
}
return NodeType::NODE_SYMBOL;
}
}
src/lib/data/NodeType.h
+15 -3
View File
@@ -53,17 +53,29 @@ public:
struct BundleInfo
{
BundleInfo()
: nameMatcher(nullptr)
, bundleName("")
{}
BundleInfo(std::string bundleName)
: nameMatcher([](const std::string&) { return true; })
, bundleName(bundleName)
{}
BundleInfo(std::function<bool(std::string)> nameMatcher, std::string bundleName)
: nameMatcher(nameMatcher)
, bundleName(bundleName)
{}
std::function<bool(const std::string&)> nameMatcher;
bool isValid() const
{
return bundleName.size() > 0;
}
std::function<bool(const std::string&)> nameMatcher = nullptr;
std::string bundleName;
};
static std::vector<NodeType> getOverviewBundleNodeTypesOrdered();
NodeType(Type type);
bool operator==(const NodeType& o) const;