Clear the selection when doing undo/redo.

OpenModelica · Oct 19, 2015 · a13a6c9 · a13a6c9
1 parent b9ed433
commit a13a6c9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 11 deletions.
diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -1456,6 +1456,7 @@ void MainWindow::undo()
   if (pModelWidget &&
       ((pModelWidget->getIconGraphicsView() && pModelWidget->getIconGraphicsView()->isVisible()) ||
        (pModelWidget->getDiagramGraphicsView() && pModelWidget->getDiagramGraphicsView()->isVisible()))) {
+    pModelWidget->clearSelection();
     pModelWidget->getUndoStack()->undo();
     pModelWidget->updateClassAnnotationIfNeeded();
     pModelWidget->updateModelicaText();
@@ -1472,6 +1473,7 @@ void MainWindow::redo()
   if (pModelWidget &&
       ((pModelWidget->getIconGraphicsView() && pModelWidget->getIconGraphicsView()->isVisible()) ||
        (pModelWidget->getDiagramGraphicsView() && pModelWidget->getDiagramGraphicsView()->isVisible()))) {
+    pModelWidget->clearSelection();
     pModelWidget->getUndoStack()->redo();
     pModelWidget->updateClassAnnotationIfNeeded();
     pModelWidget->updateModelicaText();

diff --git a/OMEdit/OMEditGUI/Modeling/Commands.cpp b/OMEdit/OMEditGUI/Modeling/Commands.cpp
@@ -72,7 +72,6 @@ void AddShapeCommand::redo()
 void AddShapeCommand::undo()
 {
   mpGraphicsView->deleteShapeFromList(mpShapeAnnotation);
-  mpShapeAnnotation->setSelected(false);
   mpGraphicsView->removeItem(mpShapeAnnotation);
   mpShapeAnnotation->emitDeleted();
   mpGraphicsView->addClassAnnotation();
@@ -201,7 +200,6 @@ void RotateShapeCommand::undo()
     qreal angle = oldRotation + rotateIncrement;
     mpShapeAnnotation->applyRotation(angle);
   }
-  mpShapeAnnotation->setSelected(false);
 }
 
 DeleteShapeCommand::DeleteShapeCommand(ShapeAnnotation *pShapeAnnotation, GraphicsView *pGraphicsView, QUndoCommand *pParent)
@@ -218,7 +216,6 @@ DeleteShapeCommand::DeleteShapeCommand(ShapeAnnotation *pShapeAnnotation, Graphi
 void DeleteShapeCommand::redo()
 {
   mpGraphicsView->deleteShapeFromList(mpShapeAnnotation);
-  mpShapeAnnotation->setSelected(false);
   mpGraphicsView->removeItem(mpShapeAnnotation);
   mpShapeAnnotation->emitDeleted();
   mpGraphicsView->setAddClassAnnotationNeeded(true);
@@ -323,20 +320,17 @@ void AddComponentCommand::undo()
       pModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::Modelica) {
     // first create the component for Icon View only if connector is not protected
     if (!mpComponentInfo->getProtected()) {
-      mpIconComponent->setSelected(false);
       mpIconGraphicsView->removeItem(mpIconComponent);
       mpIconGraphicsView->removeItem(mpIconComponent->getOriginItem());
       mpIconGraphicsView->deleteComponentFromList(mpIconComponent);
       mpIconComponent->emitDeleted();
     }
     // now remove the component from Diagram View
-    mpDiagramComponent->setSelected(false);
     mpDiagramGraphicsView->removeItem(mpDiagramComponent);
     mpDiagramGraphicsView->removeItem(mpDiagramComponent->getOriginItem());
     mpDiagramGraphicsView->deleteComponentFromList(mpDiagramComponent);
     mpDiagramComponent->emitDeleted();
   } else {
-    mpDiagramComponent->setSelected(false);
     mpDiagramGraphicsView->removeItem(mpDiagramComponent);
     mpDiagramGraphicsView->removeItem(mpDiagramComponent->getOriginItem());
     mpDiagramGraphicsView->deleteComponentFromList(mpDiagramComponent);
@@ -468,7 +462,6 @@ void RotateComponentCommand::undo()
     qreal angle = oldRotation + rotateIncrement;
     mpComponent->applyRotation(angle);
   }
-  mpComponent->setSelected(false);
 }
 
 DeleteComponentCommand::DeleteComponentCommand(Component *pComponent, GraphicsView *pGraphicsView, QUndoCommand *pParent)
@@ -495,7 +488,6 @@ void DeleteComponentCommand::redo()
     // first remove the component from Icon View
     mpIconComponent = mpIconGraphicsView->getComponentObject(mpComponent->getName());
     if (mpIconComponent) {
-      mpIconComponent->setSelected(false);
       mpIconGraphicsView->removeItem(mpIconComponent);
       mpIconGraphicsView->removeItem(mpIconComponent->getOriginItem());
       mpIconGraphicsView->deleteComponentFromList(mpIconComponent);
@@ -504,14 +496,12 @@ void DeleteComponentCommand::redo()
     // now remove the component from Diagram View
     mpDiagramComponent = mpDiagramGraphicsView->getComponentObject(mpComponent->getName());
     if (mpDiagramComponent) {
-      mpDiagramComponent->setSelected(false);
       mpDiagramGraphicsView->removeItem(mpDiagramComponent);
       mpDiagramGraphicsView->removeItem(mpDiagramComponent->getOriginItem());
       mpDiagramGraphicsView->deleteComponentFromList(mpDiagramComponent);
       mpDiagramComponent->emitDeleted();
     }
   } else {
-    mpComponent->setSelected(false);
     mpDiagramGraphicsView->removeItem(mpComponent);
     mpDiagramGraphicsView->removeItem(mpComponent->getOriginItem());
     mpDiagramGraphicsView->deleteComponentFromList(mpComponent);

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -1196,14 +1196,28 @@ void GraphicsView::zoomOut()
   }
 }
 
-//! Selects all objects and connectors.
+/*!
+ * \brief GraphicsView::selectAll
+ * Selects all shapes, components and connectors.
+ */
 void GraphicsView::selectAll()
 {
   foreach (QGraphicsItem *pItem, items()) {
     pItem->setSelected(true);
   }
 }
 
+/*!
+ * \brief GraphicsView::clearSelection
+ * Clears the selection of all shapes, components and connectors.
+ */
+void GraphicsView::clearSelection()
+{
+  foreach (QGraphicsItem *pItem, items()) {
+    pItem->setSelected(false);
+  }
+}
+
 //! Adds the annotation string of Icon and Diagram layer to the model. Also creates the model icon in the tree.
 //! If some custom models are cross referenced then update them accordingly.
 void GraphicsView::addClassAnnotation(bool updateModelicaText)
@@ -2737,6 +2751,20 @@ bool ModelWidget::modelicaEditorTextChanged()
   return true;
 }
 
+/*!
+ * \brief ModelWidget::clearSelection
+ * Clears the selection Icon and Diagram layers.
+ */
+void ModelWidget::clearSelection()
+{
+  if (mpIconGraphicsView) {
+    mpIconGraphicsView->clearSelection();
+  }
+  if (mpDiagramGraphicsView) {
+    mpDiagramGraphicsView->clearSelection();
+  }
+}
+
 /*!
  * \brief ModelWidget::updateClassAnnotationIfNeeded
  * Updates the class annotation for both icon and diagram views if needed.

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h
@@ -254,6 +254,7 @@ public slots:
   void zoomIn();
   void zoomOut();
   void selectAll();
+  void clearSelection();
   void addClassAnnotation(bool updateModelicaText = true);
   void showGraphicsViewProperties();
   void deleteItems();
@@ -380,6 +381,7 @@ class ModelWidget : public QWidget
   void refresh();
   bool validateText();
   bool modelicaEditorTextChanged();
+  void clearSelection();
   void updateClassAnnotationIfNeeded();
   void updateModelicaText();
   void updateUndoRedoActions();