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

logic: save template parameters as child nodes with member access 'template parameter'

Browse Source 
* added access node to graph for template parameters, no icon so far
* don't reexpand function nodes with children when active before
* removed console warnings for edges
This commit is contained in:
Eberhard Graether
2016-01-26 14:38:41 +01:00
parent 91d655f397
commit e0d7f1d613
10 changed files with 51 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/view/QtGraphView.cpp
+2 -5
View File
@@ -393,11 +393,8 @@ std::shared_ptr<QtGraphEdge> QtGraphView::createEdge(QGraphicsView* view, const
return qtEdge;
}
else
{
LOG_WARNING_STREAM(<< "Couldn't find owner or target node for edge: " << (edge.data ? edge.data->getName() : "<no data>"));
return NULL;
}
return NULL;
}
QRectF QtGraphView::itemsBoundingRect(const std::list<std::shared_ptr<QtGraphNode>>& items) const
src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp
+33 -6
View File
@@ -12,16 +12,36 @@
QtGraphNodeAccess::QtGraphNodeAccess(TokenComponentAccess::AccessType accessType)
: QtGraphNode()
, m_access(accessType)
, m_accessIcon(nullptr)
, m_accessIconSize(20)
{
std::string accessString = TokenComponentAccess::getAccessString(accessType);
this->setName(accessString);
m_text->hide();
QtDeviceScaledPixmap pixmap(QString::fromStdString("data/gui/graph_view/images/" + accessString + ".png"));
pixmap.scaleToHeight(m_accessIconSize);
std::string fileName;
switch (accessType)
{
case TokenComponentAccess::ACCESS_PUBLIC:
fileName = "public";
break;
case TokenComponentAccess::ACCESS_PROTECTED:
fileName = "protected";
break;
case TokenComponentAccess::ACCESS_PRIVATE:
fileName = "private";
break;
default:
break;
}
m_accessIcon = new QGraphicsPixmapItem(pixmap.pixmap(), this);
if (fileName.size() > 0)
{
QtDeviceScaledPixmap pixmap(QString::fromStdString("data/gui/graph_view/images/" + fileName + ".png"));
pixmap.scaleToHeight(m_accessIconSize);
m_accessIcon = new QGraphicsPixmapItem(pixmap.pixmap(), this);
}
}
QtGraphNodeAccess::~QtGraphNodeAccess()
@@ -53,10 +73,17 @@ void QtGraphNodeAccess::updateStyle()
font.setCapitalization(QFont::AllUppercase);
m_text->setFont(font);
m_text->setPos(style.textOffset.x + m_accessIconSize + 3, style.textOffset.x + m_accessIconSize + 2 - style.fontSize);
m_accessIcon->setPos(style.textOffset.x, style.textOffset.y);
if (m_accessIcon)
{
m_text->setPos(style.textOffset.x + m_accessIconSize + 3, style.textOffset.y + m_accessIconSize + 2 - style.fontSize);
m_accessIcon->setPos(style.textOffset.x, style.textOffset.y);
m_accessIcon->setPixmap(utility::colorizePixmap(m_accessIcon->pixmap(), style.color.icon.c_str()));
m_accessIcon->setPixmap(utility::colorizePixmap(m_accessIcon->pixmap(), style.color.icon.c_str()));
}
else
{
m_text->setPos(style.textOffset.x, style.textOffset.y + m_accessIconSize + 2 - style.fontSize);
}
}
void QtGraphNodeAccess::hideLabel()