- Do not allow selecting or moving the shapes when user is making a c…

…onnection. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21076 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 12, 2014 · 5f52cbd · 5f52cbd
1 parent 0e62f93
commit 5f52cbd
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 1 deletion.
diff --git a/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp
@@ -38,7 +38,6 @@
 
 #include "EllipseAnnotation.h"
 
-
 EllipseAnnotation::EllipseAnnotation(QString annotation, Component *pParent)
   : ShapeAnnotation(pParent)
 {

diff --git a/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp
@@ -684,6 +684,32 @@ void LineAnnotation::duplicate()
   mpGraphicsView->setCanAddClassAnnotation(true);
 }
 
+/*!
+  Reimplementation of mousePressEvent.\n
+  Checks if user is making a connection then makes the Line unselectable.\n
+  \param event - QGraphicsSceneMouseEvent
+  \see ShapeAnnotation::mousePressEvent
+  */
+void LineAnnotation::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+  if ((mLineType == LineAnnotation::ConnectionType || mLineType == LineAnnotation::ShapeType) && mpGraphicsView)
+  {
+    if (mpGraphicsView->isCreatingConnection())
+    {
+      setFlag(QGraphicsItem::ItemIsSelectable, false);
+      setFlag(QGraphicsItem::ItemIsMovable, false);
+    }
+    else
+    {
+      setFlag(QGraphicsItem::ItemIsSelectable, true);
+      /* Only set the ItemIsMovable flag on shape if the class is not a system library class OR shape is not an inherited shape. */
+      if (!mpGraphicsView->getModelWidget()->getLibraryTreeNode()->isSystemLibrary() && !isInheritedShape())
+        setFlag(QGraphicsItem::ItemIsMovable, true);
+    }
+  }
+  QGraphicsItem::mousePressEvent(event);
+}
+
 ConnectionArray::ConnectionArray(GraphicsView *pGraphicsView, LineAnnotation *pConnectionLineAnnotation, QWidget *pParent)
   : QDialog(pParent, Qt::WindowTitleHint), mpGraphicsView(pGraphicsView), mpConnectionLineAnnotation(pConnectionLineAnnotation)
 {

diff --git a/OMEdit/OMEditGUI/Annotations/LineAnnotation.h b/OMEdit/OMEditGUI/Annotations/LineAnnotation.h
@@ -91,6 +91,8 @@ public slots:
   void handleComponentRotation();
   void updateConnectionAnnotation();
   void duplicate();
+protected:
+  virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
 };
 
 class ConnectionArray : public QDialog

diff --git a/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp
@@ -1625,3 +1625,30 @@ QVariant ShapeAnnotation::itemChange(GraphicsItemChange change, const QVariant &
   }
   return value;
 }
+
+/*!
+  Reimplementation of mousePressEvent.\n
+  Checks if user is making a connection then makes all the shapes unselectable except Line.\n
+  Line shape is bit different so it is handled in its own class LineAnnotation.
+  \param event - QGraphicsSceneMouseEvent
+  \see LineAnnotation::mousePressEvent
+  */
+void ShapeAnnotation::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+  if (mpGraphicsView)
+  {
+    if (mpGraphicsView->isCreatingConnection())
+    {
+      setFlag(QGraphicsItem::ItemIsSelectable, false);
+      setFlag(QGraphicsItem::ItemIsMovable, false);
+    }
+    else
+    {
+      setFlag(QGraphicsItem::ItemIsSelectable, true);
+      /* Only set the ItemIsMovable flag on shape if the class is not a system library class OR shape is not an inherited shape. */
+      if (!mpGraphicsView->getModelWidget()->getLibraryTreeNode()->isSystemLibrary() && !isInheritedShape())
+        setFlag(QGraphicsItem::ItemIsMovable, true);
+    }
+  }
+  QGraphicsItem::mousePressEvent(event);
+}
diff --git a/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.h b/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.h
@@ -222,6 +222,7 @@ public slots:
   QList<CornerItem*> mCornerItemsList;
   virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *pEvent);
   virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+  virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
 };
 
 #endif // SHAPEANNOTATION_H