Use the correct CoordinateSystem for Component boundingRect.

OpenModelica · Dec 6, 2015 · 8c85596 · 8c85596
1 parent 479c5c9
commit 8c85596
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 20 deletions.
diff --git a/OMEdit/OMEditGUI/Component/Component.cpp b/OMEdit/OMEditGUI/Component/Component.cpp
@@ -582,10 +582,14 @@ CoOrdinateSystem Component::getCoOrdinateSystem() const
 {
   CoOrdinateSystem coOrdinateSystem;
   if (mpLibraryTreeItem && !mpLibraryTreeItem->isNonExisting()) {
-    if (mpGraphicsView->getViewType() == StringHandler::Icon) {
-      coOrdinateSystem = mpLibraryTreeItem->getModelWidget()->getIconGraphicsView()->mCoOrdinateSystem;
+    if (mpLibraryTreeItem->isConnector()) {
+      if (mpGraphicsView->getViewType() == StringHandler::Icon) {
+        coOrdinateSystem = mpLibraryTreeItem->getModelWidget()->getIconGraphicsView()->mCoOrdinateSystem;
+      } else {
+        coOrdinateSystem = mpLibraryTreeItem->getModelWidget()->getDiagramGraphicsView()->mCoOrdinateSystem;
+      }
     } else {
-      coOrdinateSystem = mpLibraryTreeItem->getModelWidget()->getDiagramGraphicsView()->mCoOrdinateSystem;
+      coOrdinateSystem = mpLibraryTreeItem->getModelWidget()->getIconGraphicsView()->mCoOrdinateSystem;
     }
   }
   return coOrdinateSystem;
@@ -849,9 +853,10 @@ QString Component::getParameterDisplayString(QString parameterName)
   /* case 2 */
   if (displayString.isEmpty()) {
     if (mpLibraryTreeItem) {
+      mpLibraryTreeItem->getModelWidget()->loadDiagramView();
       foreach (Component *pComponent, mpLibraryTreeItem->getModelWidget()->getDiagramGraphicsView()->getComponentsList()) {
         if (pComponent->getComponentInfo()->getName().compare(parameterName) == 0) {
-          displayString = pComponent->getComponentInfo()->getParameterValue(pOMCProxy, className);
+          displayString = pComponent->getComponentInfo()->getParameterValue(pOMCProxy, mpLibraryTreeItem->getNameStructure());
           break;
         }
       }
@@ -1063,6 +1068,7 @@ void Component::createClassComponents()
     foreach (Component *pComponent, mpLibraryTreeItem->getModelWidget()->getIconGraphicsView()->getComponentsList()) {
       mComponentsList.append(new Component(pComponent, this));
     }
+    mpLibraryTreeItem->getModelWidget()->loadDiagramView();
     foreach (Component *pComponent, mpLibraryTreeItem->getModelWidget()->getDiagramGraphicsView()->getComponentsList()) {
       if (pComponent->getLibraryTreeItem() && pComponent->getLibraryTreeItem()->isConnector()) {
         continue;
@@ -1340,11 +1346,11 @@ QString Component::getParameterDisplayStringFromExtendsParameters(QString parame
   QString displayString = "";
   foreach (Component *pInheritedComponent, mInheritedComponentsList) {
     if (pInheritedComponent->getLibraryTreeItem()) {
+      pInheritedComponent->getLibraryTreeItem()->getModelWidget()->loadDiagramView();
       foreach (Component *pComponent, pInheritedComponent->getLibraryTreeItem()->getModelWidget()->getDiagramGraphicsView()->getComponentsList()) {
         if (pComponent->getComponentInfo()->getName().compare(parameterName) == 0) {
           OMCProxy *pOMCProxy = pComponent->getGraphicsView()->getModelWidget()->getModelWidgetContainer()->getMainWindow()->getOMCProxy();
-          QString className = pComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure();
-          displayString = pComponent->getComponentInfo()->getParameterValue(pOMCProxy, className);
+          displayString = pComponent->getComponentInfo()->getParameterValue(pOMCProxy, pComponent->getLibraryTreeItem()->getNameStructure());
           if (!displayString.isEmpty()) {
             return displayString;
           }

diff --git a/OMEdit/OMEditGUI/Component/Transformation.cpp b/OMEdit/OMEditGUI/Component/Transformation.cpp
@@ -38,34 +38,45 @@
 
 #include "Transformation.h"
 
+Transformation::Transformation()
+{
+  mValid = false;
+  initialize(StringHandler::Diagram);
+}
+
 Transformation::Transformation(StringHandler::ViewType viewType)
 {
   mValid = true;
+  initialize(viewType);
+}
+
+Transformation::Transformation(const Transformation &transformation)
+{
+  updateTransformation(transformation);
+}
+
+void Transformation::initialize(StringHandler::ViewType viewType)
+{
   mViewType = viewType;
   mWidth = 200.0;
   mHeight = 200.0;
   mVisible = true;
   mOriginDiagram = QPointF(0.0, 0.0);
   mHasOriginDiagramX = true;
   mHasOriginDiagramY = true;
-  mExtent1Diagram = QPointF(0.0, 0.0);
-  mExtent2Diagram = QPointF(0.0, 0.0);
+  mExtent1Diagram = QPointF(-100.0, -100.0);
+  mExtent2Diagram = QPointF(100.0, 100.0);
   mRotateAngleDiagram = 0.0;
   mPositionDiagram = QPointF(0.0, 0.0);
   mOriginIcon = QPointF(0.0, 0.0);
   mHasOriginIconX = true;
   mHasOriginIconY = true;
-  mExtent1Icon = QPointF(0.0, 0.0);
-  mExtent2Icon = QPointF(0.0, 0.0);
+  mExtent1Icon = QPointF(-100.0, -100.0);
+  mExtent2Icon = QPointF(100.0, 100.0);
   mRotateAngleIcon = 0.0;
   mPositionIcon = QPointF(0.0, 0.0);
 }
 
-Transformation::Transformation(const Transformation &transformation)
-{
-  updateTransformation(transformation);
-}
-
 void Transformation::parseTransformationString(QString value, qreal width, qreal height)
 {
   /*
@@ -261,7 +272,7 @@ void Transformation::setExtent1(QPointF extent)
   }
 }
 
-QPointF Transformation::getExtent1()
+QPointF Transformation::getExtent1() const
 {
   switch (mViewType) {
     case StringHandler::Icon:
@@ -287,7 +298,7 @@ void Transformation::setExtent2(QPointF extent)
   }
 }
 
-QPointF Transformation::getExtent2()
+QPointF Transformation::getExtent2() const
 {
   switch (mViewType) {
     case StringHandler::Icon:

diff --git a/OMEdit/OMEditGUI/Component/Transformation.h b/OMEdit/OMEditGUI/Component/Transformation.h
@@ -48,9 +48,10 @@ class Component;
 class Transformation
 {
 public:
-  Transformation() {mValid = false;}
+  Transformation();
   Transformation(StringHandler::ViewType viewType);
   Transformation(const Transformation &transformation);
+  void initialize(StringHandler::ViewType viewType);
   void parseTransformationString(QString value, qreal width, qreal height);
   void updateTransformation(const Transformation &transformation);
   QTransform getTransformationMatrix();
@@ -61,9 +62,9 @@ class Transformation
   void setOrigin(QPointF origin);
   QPointF getOrigin();
   void setExtent1(QPointF extent);
-  QPointF getExtent1();
+  QPointF getExtent1() const;
   void setExtent2(QPointF extent);
-  QPointF getExtent2();
+  QPointF getExtent2() const;
   void setRotateAngle(qreal rotateAngle);
   qreal getRotateAngle();
   QPointF getPosition();