OMEdit: drawing-related optimizations

QGraphicsScene::items() sorts its items on each invocation, so avoid
using it in cases such as scene()->items().contains(...).

Drop unused mpResizerRectangle.

Author: atrosinenko

OMEdit/OMEdit/OMEditGUI/Component/Component.cpp

@@ -452,14 +452,6 @@ Component::Component(QString name, LibraryTreeItem *pLibraryTreeItem, QString an
   mIsInheritedComponent = false;
   mComponentType = Component::Root;
   mTransformationString = StringHandler::getPlacementAnnotation(annotation);
-  // Construct the temporary polygon that is used when scaling
-  mpResizerRectangle = new QGraphicsRectItem;
-  mpResizerRectangle->setZValue(-5000);  // set to a very low value
-  mpGraphicsView->addItem(mpResizerRectangle);
-  QPen pen;
-  pen.setStyle(Qt::DotLine);
-  pen.setColor(Qt::transparent);
-  mpResizerRectangle->setPen(pen);
   setOldScenePosition(QPointF(0, 0));
   setOldPosition(QPointF(0, 0));
   setComponentFlags(true);
@@ -534,7 +526,6 @@ Component::Component(LibraryTreeItem *pLibraryTreeItem, Component *pParentCompon
   mIsInheritedComponent = mpParentComponent->isInheritedComponent();
   mComponentType = Component::Extend;
   mTransformationString = "";
-  mpResizerRectangle = 0;
   createNonExistingComponent();
   mpDefaultComponentRectangle = 0;
   mpDefaultComponentText = 0;
@@ -570,7 +561,6 @@ Component::Component(Component *pComponent, Component *pParentComponent, Compone
   mTransformationString = mpReferenceComponent->getTransformationString();
   mDialogAnnotation = mpReferenceComponent->getDialogAnnotation();
   mChoicesAnnotation = mpReferenceComponent->getChoicesAnnotation();
-  mpResizerRectangle = 0;
   createNonExistingComponent();
   mpDefaultComponentRectangle = 0;
   mpDefaultComponentText = 0;
@@ -613,14 +603,6 @@ Component::Component(Component *pComponent, GraphicsView *pGraphicsView)
   mTransformationString = mpReferenceComponent->getTransformationString();
   mDialogAnnotation = mpReferenceComponent->getDialogAnnotation();
   mChoicesAnnotation = mpReferenceComponent->getChoicesAnnotation();
-  //Construct the temporary polygon that is used when scaling
-  mpResizerRectangle = new QGraphicsRectItem;
-  mpResizerRectangle->setZValue(5000);  // set to a very high value
-  mpGraphicsView->addItem(mpResizerRectangle);
-  QPen pen;
-  pen.setStyle(Qt::DotLine);
-  pen.setColor(Qt::transparent);
-  mpResizerRectangle->setPen(pen);
   setOldScenePosition(QPointF(0, 0));
   setOldPosition(QPointF(0, 0));
   setComponentFlags(true);
@@ -669,7 +651,6 @@ Component::Component(ComponentInfo *pComponentInfo, Component *pParentComponent)
   mTransformationString = "";
   mDialogAnnotation.clear();
   mChoicesAnnotation.clear();
-  mpResizerRectangle = 0;
   createNonExistingComponent();
   createDefaultComponent();
   mpStateComponentRectangle = 0;
@@ -2561,9 +2542,6 @@ void Component::prepareResizeComponent(ResizerItem *pResizerItem)
     mTransformationStartPosition = topRight;
     mPivotPoint = bottomLeft;
   }
-  mpResizerRectangle->setRect(boundingRect()); //Sets the current item to the temporary rect
-  mpResizerRectangle->setTransform(transform()); //Set the same matrix of this item to the temporary item
-  mpResizerRectangle->setPos(pos());
 }
 
 /*!
@@ -2607,7 +2585,6 @@ void Component::resizeComponent(QPointF newPosition)
   QTransform tmpTransform = QTransform().translate(pivot.x(), pivot.y()).rotate(0)
       .scale(mXFactor, mYFactor)
       .translate(-pivot.x(), -pivot.y());
-  mpResizerRectangle->setTransform(mTransform * tmpTransform); //Multiplies the previous transform * the temporary
   setTransform(mTransform * tmpTransform);
   // set the final resize on component.
   QPointF extent1, extent2;

OMEdit/OMEdit/OMEditGUI/Component/Component.h

@@ -270,7 +270,6 @@ class Component : public QObject, public QGraphicsItem
   QStringList mDialogAnnotation;
   QStringList mChoicesAnnotation;
   QString mParameterValue;
-  QGraphicsRectItem *mpResizerRectangle;
   LineAnnotation *mpNonExistingComponentLine;
   RectangleAnnotation *mpDefaultComponentRectangle;
   TextAnnotation *mpDefaultComponentText;

OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

@@ -1492,7 +1492,8 @@ bool GraphicsView::hasAnnotation()
  */
 void GraphicsView::addItem(QGraphicsItem *pGraphicsItem)
 {
-  if (!scene()->items().contains(pGraphicsItem)) {
+  if (!mAllItems.contains(pGraphicsItem)) {
+    mAllItems.insert(pGraphicsItem);
     scene()->addItem(pGraphicsItem);
   }
 }
@@ -1504,7 +1505,8 @@ void GraphicsView::addItem(QGraphicsItem *pGraphicsItem)
  */
 void GraphicsView::removeItem(QGraphicsItem *pGraphicsItem)
 {
-  if (scene()->items().contains(pGraphicsItem)) {
+  if (mAllItems.contains(pGraphicsItem)) {
+    mAllItems.remove(pGraphicsItem);
     scene()->removeItem(pGraphicsItem);
   }
 }

OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h

@@ -138,6 +138,8 @@ class GraphicsView : public QGraphicsView
   QAction *mpFlipVerticalAction;
   QAction *mpSetInitialStateAction;
   QAction *mpCancelTransitionAction;
+  // scene->items().contains(...) involves sorting on each items() call, avoid it
+  QSet<QGraphicsItem*> mAllItems;
 public:
   GraphicsView(StringHandler::ViewType viewType, ModelWidget *pModelWidget, bool visualizationView = false);
   CoOrdinateSystem mCoOrdinateSystem;