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

ModelEditor: Avoid corrupt diagrams after moving end of relation

Browse Source 
Change-Id: If0a2a62d3ef7e59242b244d6892e83bb71315164
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jochen Becher
2016-07-01 17:57:10 +02:00
parent 222f89472f
commit 1bb11c5b83
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
View File

@@ -87,6 +87,7 @@ public:
void setModelController(ModelController *modelController); void setModelController(ModelController *modelController);
UndoController *undoController() const { return m_undoController; } UndoController *undoController() const { return m_undoController; }
void setUndoController(UndoController *undoController); void setUndoController(UndoController *undoController);
QList<MDiagram *> allDiagrams() const { return m_allDiagrams; }
private: private:
MDiagram *findDiagram(const Uid &diagramKey) const; MDiagram *findDiagram(const Uid &diagramKey) const;

10
src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
View File

@@ -724,8 +724,18 @@ bool DiagramSceneController::relocateRelationEnd(DRelation *relation, DObject *t
MObject *currentTargetMObject = m_modelController->findObject((modelRelation->*endUid)()); MObject *currentTargetMObject = m_modelController->findObject((modelRelation->*endUid)());
QMT_CHECK(currentTargetMObject); QMT_CHECK(currentTargetMObject);
m_modelController->undoController()->beginMergeSequence(tr("Relocate Relation")); m_modelController->undoController()->beginMergeSequence(tr("Relocate Relation"));
// move relation into new target if it was a child of the old target
if (currentTargetMObject == modelRelation->owner()) if (currentTargetMObject == modelRelation->owner())
m_modelController->moveRelation(targetMObject, modelRelation); m_modelController->moveRelation(targetMObject, modelRelation);
// remove relation on all diagrams where the new targe element does not exist
foreach (MDiagram *diagram, m_diagramController->allDiagrams()) {
if (DElement *diagramRelation = m_diagramController->findDelegate(modelRelation, diagram)) {
if (!m_diagramController->findDelegate(targetMObject, diagram)) {
m_diagramController->removeElement(diagramRelation, diagram);
}
}
}
// update end of relation
m_modelController->startUpdateRelation(modelRelation); m_modelController->startUpdateRelation(modelRelation);
(modelRelation->*setEndUid)(targetMObject->uid()); (modelRelation->*setEndUid)(targetMObject->uid());
m_modelController->finishUpdateRelation(modelRelation, false); m_modelController->finishUpdateRelation(modelRelation, false);