Fix contact extents (#11362)

OpenModelica · Oct 12, 2023 · e03202a · e03202a
1 parent 34d9b6e
commit e03202a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/OMEdit/OMEditLIB/Element/Element.cpp b/OMEdit/OMEditLIB/Element/Element.cpp
@@ -1189,10 +1189,10 @@ ModelInstance::CoordinateSystem Element::getCoOrdinateSystemNew() const
 {
   ModelInstance::CoordinateSystem coordinateSystem;
   if (mpModel->isConnector()) {
-    if (mpGraphicsView->getViewType() == StringHandler::Icon) {
-      coordinateSystem = mpModel->getAnnotation()->getIconAnnotation()->mMergedCoOrdinateSystem;
-    } else {
+    if ((mpGraphicsView->getViewType() == StringHandler::Diagram) && canUseDiagramAnnotation()) {
       coordinateSystem = mpModel->getAnnotation()->getDiagramAnnotation()->mMergedCoOrdinateSystem;
+    } else {
+      coordinateSystem = mpModel->getAnnotation()->getIconAnnotation()->mMergedCoOrdinateSystem;
     }
   } else {
     coordinateSystem = mpModel->getAnnotation()->getIconAnnotation()->mMergedCoOrdinateSystem;
@@ -3099,15 +3099,19 @@ void Element::updateToolTip()
  * then we should not use the diagram annotation.
  * \return
  */
-bool Element::canUseDiagramAnnotation()
+bool Element::canUseDiagramAnnotation() const
 {
-  Element *pElement = this;
-  while (pElement->getParentElement()) {
+  if (getElementType() == Element::Port)
+    return false;
+
+  Element *pElement = getParentElement();
+  while (pElement) {
     if (pElement->getElementType() == Element::Port) {
       return false;
     }
     pElement = pElement->getParentElement();
   }
+
   return true;
 }
 

diff --git a/OMEdit/OMEditLIB/Element/Element.h b/OMEdit/OMEditLIB/Element/Element.h
@@ -221,9 +221,9 @@ class Element : public QObject, public QGraphicsItem
   bool isCondition() const;
   GraphicsView* getGraphicsView() {return mpGraphicsView;}
   Element *getReferenceElement() {return mpReferenceElement;}
-  Element* getParentElement() {return mpParentElement;}
+  Element* getParentElement() const {return mpParentElement;}
   Element* getRootParentElement();
-  ElementType getElementType() {return mElementType;}
+  ElementType getElementType() const {return mElementType;}
   QString getTransformationString() {return mTransformationString;}
   void setDialogAnnotation(QStringList dialogAnnotation) {mDialogAnnotation = dialogAnnotation;}
   QStringList getDialogAnnotation() {return mDialogAnnotation;}
@@ -387,7 +387,7 @@ class Element : public QObject, public QGraphicsItem
   static QString getParameterDisplayStringFromExtendsParameters(ModelInstance::Model *pModel, QString parameterName, QString modifierString);
   static bool checkEnumerationDisplayString(QString &displayString, const QString &typeName);
   void updateToolTip();
-  bool canUseDiagramAnnotation();
+  bool canUseDiagramAnnotation() const;
 signals:
   void added();
   void transformChange(bool positionChanged);