- Fixed few graphical glitches.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18986 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 5, 2014 · 547770c · 547770c
1 parent cc6abef
commit 547770c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 31 deletions.
diff --git a/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp b/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp
@@ -102,6 +102,15 @@ LineAnnotation::LineAnnotation(QString annotation, bool inheritedShape, Componen
   // set the end component
   setEndComponent(pEndComponent);
   parseShapeAnnotation(annotation);
+  /* make the points relative to origin */
+  QList<QPointF> points;
+  for (int i = 0 ; i < mPoints.size() ; i++)
+  {
+    QPointF point = mOrigin + mPoints[i];
+    points.append(point);
+  }
+  mPoints = points;
+  mOrigin = QPointF(0, 0);
   // set the graphics view
   mpGraphicsView->scene()->addItem(this);
 }

diff --git a/OMEdit/OMEditGUI/Component/Transformation.cpp b/OMEdit/OMEditGUI/Component/Transformation.cpp
@@ -364,18 +364,9 @@ bool Transformation::getFlipVertical()
 
 QTransform Transformation::getTransformationMatrixDiagram()
 {
-  QPoint extent1 = mExtent1Diagram.toPoint();
-  QPoint extent2 = mExtent2Diagram.toPoint();
-  if ((extent1.x() == -extent2.x()) and (extent1.y() == -extent2.y()))
-  {
-    mPositionXDiagram = mOriginDiagram.x();
-    mPositionYDiagram = mOriginDiagram.y();
-  }
-  else
-  {
-    mPositionXDiagram = (mExtent1Diagram.x() + mExtent2Diagram.x()) / 2;
-    mPositionYDiagram = (mExtent1Diagram.y() + mExtent2Diagram.y()) / 2;
-  }
+  mPositionXDiagram = mOriginDiagram.x() + ((mExtent1Diagram.x() + mExtent2Diagram.x()) / 2);
+  mPositionYDiagram = mOriginDiagram.y() + ((mExtent1Diagram.y() + mExtent2Diagram.y()) / 2);
+
   qreal tempwidth = fabs(mExtent1Diagram.x() - mExtent2Diagram.x());
   qreal tempHeight = fabs(mExtent1Diagram.y() - mExtent2Diagram.y());
   // get scale
@@ -410,18 +401,9 @@ QTransform Transformation::getTransformationMatrixDiagram()
 
 QTransform Transformation::getTransformationMatrixIcon()
 {
-  QPoint extent1 = mExtent1Icon.toPoint();
-  QPoint extent2 = mExtent2Icon.toPoint();
-  if ((extent1.x() == -extent2.x()) and (extent1.y() == -extent2.y()))
-  {
-    mPositionXIcon = mOriginIcon.x();
-    mPositionYIcon = mOriginIcon.y();
-  }
-  else
-  {
-    mPositionXIcon = (mExtent1Icon.x() + mExtent2Icon.x()) / 2;
-    mPositionYIcon = (mExtent1Icon.y() + mExtent2Icon.y()) / 2;
-  }
+  mPositionXIcon = mOriginIcon.x() + ((mExtent1Icon.x() + mExtent2Icon.x()) / 2);
+  mPositionYIcon = mOriginIcon.y() + ((mExtent1Icon.y() + mExtent2Icon.y()) / 2);
+
   qreal tempwidthIcon = fabs(mExtent1Icon.x() - mExtent2Icon.x());
   qreal tempHeightIcon = fabs(mExtent1Icon.y() - mExtent2Icon.y());
   // get scale

diff --git a/OMEdit/OMEditGUI/GUI/Containers/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/GUI/Containers/ModelWidgetContainer.cpp
@@ -1163,7 +1163,7 @@ void GraphicsView::drawBackground(QPainter *painter, const QRectF &rect)
   if (mSkipBackground)
     return;
   // draw scene rectangle white background
-  painter->setPen(Qt::NoPen);
+  painter->setPen(Qt::darkGray);
   painter->setBrush(QBrush(Qt::white, Qt::SolidPattern));
   painter->drawRect(sceneRect());
   if (mpModelWidget->getModelWidgetContainer()->isShowGridLines())
@@ -1172,7 +1172,7 @@ void GraphicsView::drawBackground(QPainter *painter, const QRectF &rect)
     painter->setPen(Qt::lightGray);
     /* Draw left half vertical lines */
     int horizontalGridStep = mpCoOrdinateSystem->getHorizontalGridStep();
-    qreal xAxisStep = rect.center().x();
+    qreal xAxisStep = 0;
     qreal yAxisStep = rect.y();
     xAxisStep -= horizontalGridStep;
     while (xAxisStep > rect.left())
@@ -1181,7 +1181,7 @@ void GraphicsView::drawBackground(QPainter *painter, const QRectF &rect)
       xAxisStep -= horizontalGridStep;
     }
     /* Draw right half vertical lines */
-    xAxisStep = rect.center().x();
+    xAxisStep = 0;
     while (xAxisStep < rect.right())
     {
       painter->drawLine(QPointF(xAxisStep, yAxisStep), QPointF(xAxisStep, rect.bottom()));
@@ -1190,24 +1190,24 @@ void GraphicsView::drawBackground(QPainter *painter, const QRectF &rect)
     /* Draw left half horizontal lines */
     int verticalGridStep = mpCoOrdinateSystem->getVerticalGridStep();
     xAxisStep = rect.x();
-    yAxisStep = rect.center().y();
+    yAxisStep = 0;
     yAxisStep += verticalGridStep;
     while (yAxisStep < rect.bottom())
     {
       painter->drawLine(QPointF(xAxisStep, yAxisStep), QPointF(rect.right(), yAxisStep));
       yAxisStep += verticalGridStep;
     }
     /* Draw right half horizontal lines */
-    yAxisStep = rect.center().y();
+    yAxisStep = 0;
     while (yAxisStep > rect.top())
     {
       painter->drawLine(QPointF(xAxisStep, yAxisStep), QPointF(rect.right(), yAxisStep));
       yAxisStep -= verticalGridStep;
     }
     /* set the middle horizontal and vertical line gray */
     painter->setPen(Qt::darkGray);
-    painter->drawLine(QPointF(rect.left(), rect.center().y()), QPointF(rect.right(), rect.center().y()));
-    painter->drawLine(QPointF(rect.center().x(), rect.top()), QPointF(rect.center().x(), rect.bottom()));
+    painter->drawLine(QPointF(rect.left(), 0), QPointF(rect.right(), 0));
+    painter->drawLine(QPointF(0, rect.top()), QPointF(0, rect.bottom()));
   }
   else
   {