feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ModelEditor: Avoid crash if an illegal relation is placed on a diagram.

Browse Source 
Change-Id: I0e62f4665c8530095d1beedc2c263d6212aa53e7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jochen Becher
2016-04-30 17:05:22 +02:00
parent 9b9215afe0
commit 3d6e5fff0c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
View File

@@ -62,10 +62,12 @@ void AssociationItem::update(const Style *style)
QMT_CHECK(m_arrow); QMT_CHECK(m_arrow);
QGraphicsItem *endAItem = m_diagramSceneModel->graphicsItem(m_association->endAUid()); QGraphicsItem *endAItem = m_diagramSceneModel->graphicsItem(m_association->endAUid());
QMT_CHECK(endAItem); if (!endAItem)
return;
placeEndLabels(m_arrow->firstLineSegment(), m_endAName, m_endACardinality, endAItem, m_arrow->startHeadLength()); placeEndLabels(m_arrow->firstLineSegment(), m_endAName, m_endACardinality, endAItem, m_arrow->startHeadLength());
QGraphicsItem *endBItem = m_diagramSceneModel->graphicsItem(m_association->endBUid()); QGraphicsItem *endBItem = m_diagramSceneModel->graphicsItem(m_association->endBUid());
QMT_CHECK(endBItem); if (!endBItem)
return;
placeEndLabels(m_arrow->lastLineSegment(), m_endBName, m_endBCardinality, endBItem, m_arrow->endHeadLength()); placeEndLabels(m_arrow->lastLineSegment(), m_endBName, m_endBCardinality, endBItem, m_arrow->endHeadLength());
} }

3
src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
View File

@@ -492,7 +492,8 @@ QPointF RelationItem::calcEndPoint(const Uid &end, const Uid &otherEnd, int near
QPointF RelationItem::calcEndPoint(const Uid &end, const QPointF &otherEndPos, int nearestIntermediatePointIndex) QPointF RelationItem::calcEndPoint(const Uid &end, const QPointF &otherEndPos, int nearestIntermediatePointIndex)
{ {
QGraphicsItem *endItem = m_diagramSceneModel->graphicsItem(end); QGraphicsItem *endItem = m_diagramSceneModel->graphicsItem(end);
QMT_CHECK(endItem); if (!endItem)
return QPointF(0, 0);
auto endObjectItem = dynamic_cast<IIntersectionable *>(endItem); auto endObjectItem = dynamic_cast<IIntersectionable *>(endItem);
QPointF endPos; QPointF endPos;
if (endObjectItem) { if (endObjectItem) {