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

ui: new features for the Graph UI

Browse Source 
* removed node shadows
* made enums collapsible
* added icons to nodes: enum, typedef, macro, bundle
This commit is contained in:
Eberhard Graether
2015-09-29 15:10:44 +02:00
parent 8777c9874b
commit 201e6d24a9
16 changed files with 131 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/qt/view/QtGraphView.cpp
-15
View File
@@ -108,11 +108,6 @@ void QtGraphView::centerScrollBars()
void QtGraphView::finishedTransition()
{
for (const std::shared_ptr<QtGraphNode>& node : m_nodes)
{
node->setShadowEnabledRecursive(true);
}
QGraphicsView* view = getView();
view->setInteractive(true);
@@ -434,16 +429,6 @@ void QtGraphView::createTransition()
}
}
for (const std::shared_ptr<QtGraphNode>& node : m_nodes)
{
node->setShadowEnabledRecursive(false);
}
for (const std::shared_ptr<QtGraphNode>& node : m_oldNodes)
{
node->setShadowEnabledRecursive(false);
}
QGraphicsView* view = getView();
view->setInteractive(false);
src/app/qt/view/graphElements/QtGraphNode.cpp
+24 -36
View File
@@ -199,16 +199,6 @@ void QtGraphNode::addComponent(const std::shared_ptr<QtGraphNodeComponent>& comp
m_components.push_back(component);
}
void QtGraphNode::setShadowEnabledRecursive(bool enabled)
{
m_rect->setShadowEnabled(enabled);
for (const std::shared_ptr<QtGraphNode>& node : m_subNodes)
{
node->setShadowEnabledRecursive(enabled);
}
}
void QtGraphNode::hoverEnter()
{
hoverEnterEvent(nullptr);
@@ -352,30 +342,21 @@ void QtGraphNode::notifyEdgesAfterMove()
void QtGraphNode::setStyle(const GraphViewStyle::NodeStyle& style)
{
QColor color = style.color.c_str();
QPen pen(Qt::transparent);
if (style.borderWidth > 0)
{
pen.setColor(style.borderColor.c_str());
pen.setWidthF(style.borderWidth);
if (style.borderDashed)
{
pen.setStyle(Qt::DashLine);
}
}
m_rect->setPen(pen);
m_rect->setBrush(QBrush(style.color.c_str()));
qreal radius = style.cornerRadius;
QPen p(style.borderColor.c_str());
p.setWidthF(style.borderWidth);
if (style.borderDashed)
{
p.setStyle(Qt::DashLine);
}
QFont font(style.fontName.c_str());
font.setPixelSize(style.fontSize);
if (style.fontBold)
{
font.setWeight(QFont::Bold);
}
if (style.shadowColor.size())
{
m_rect->setShadow(style.shadowColor.c_str(), style.shadowBlurRadius);
}
m_rect->setPen(p);
m_rect->setBrush(QBrush(color));
m_rect->setRadius(radius);
if (style.hatchingColor.size())
@@ -390,10 +371,10 @@ void QtGraphNode::setStyle(const GraphViewStyle::NodeStyle& style)
setSize(getSize());
}
p.setWidth(0);
p.setColor(Qt::transparent);
pen.setWidth(0);
pen.setColor(Qt::transparent);
m_undefinedRect->setPen(p);
m_undefinedRect->setPen(pen);
m_undefinedRect->setBrush(pixmap);
m_undefinedRect->setRadius(radius);
}
@@ -407,6 +388,13 @@ void QtGraphNode::setStyle(const GraphViewStyle::NodeStyle& style)
m_icon->setPos(style.iconOffset.x, style.iconOffset.y);
}
QFont font(style.fontName.c_str());
font.setPixelSize(style.fontSize);
if (style.fontBold)
{
font.setWeight(QFont::Bold);
}
m_text->setFont(font);
m_text->setBrush(QBrush(style.textColor.c_str()));
m_text->setPos(style.iconOffset.x + style.iconSize + style.textOffset.x, style.textOffset.y);
src/app/qt/view/graphElements/QtGraphNode.h
-2
View File
@@ -66,8 +66,6 @@ public:
void addComponent(const std::shared_ptr<QtGraphNodeComponent>& component);
void setShadowEnabledRecursive(bool enabled);
void hoverEnter();
void focusIn();