[NewAPI] Handle enumerations from instance api (#9425)

Added a tooltip for enumeration drop down list
OpenModelica · Sep 26, 2022 · a86f55e · a86f55e
1 parent eb5e7e0
commit a86f55e
Show file tree

Hide file tree

Showing 14 changed files with 392 additions and 382 deletions.
diff --git a/OMEdit/OMEditLIB/Annotations/DynamicAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/DynamicAnnotation.cpp
@@ -46,7 +46,7 @@ bool DynamicAnnotation::update(double time, Element *parent)
     fromExp(mExp.arg(1).evaluate([&] (std::string name) {
       auto vname = QString::fromStdString(name);
 
-      if (parent && parent->getComponentInfo()) {
+      if (parent && parent->getElementInfo()) {
         vname = QString("%1.%2").arg(parent->getName(), vname);
       }
 

diff --git a/OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp
@@ -228,7 +228,7 @@ LineAnnotation::LineAnnotation(LineAnnotation::LineType lineType, Element *pStar
   mpGraphicsView->addItem(this);
   setOldAnnotation("");
 
-  ElementInfo *pInfo = getStartElement()->getComponentInfo();
+  ElementInfo *pInfo = getStartElement()->getElementInfo();
   if (pInfo) {
     bool tlm = (pInfo->getTLMCausality() == "Bidirectional");
     int dimensions = pInfo->getDimensions();

diff --git a/OMEdit/OMEditLIB/Editors/CompositeModelEditor.cpp b/OMEdit/OMEditLIB/Editors/CompositeModelEditor.cpp
@@ -320,19 +320,19 @@ void CompositeModelEditor::setCompositeModelName(QString name)
  */
 bool CompositeModelEditor::addSubModel(Element *pComponent)
 {
-  pComponent->getComponentInfo()->setName(pComponent->getName().remove("."));
+  pComponent->getElementInfo()->setName(pComponent->getName().remove("."));
   QDomElement subModels = getSubModelsElement();
   if (!subModels.isNull()) {
     QDomElement subModel = mXmlDocument.createElement("SubModel");
     subModel.setAttribute("Name", pComponent->getName());
-    subModel.setAttribute("ModelFile", pComponent->getComponentInfo()->getModelFile());
-    subModel.setAttribute("StartCommand", pComponent->getComponentInfo()->getStartCommand());
-    subModel.setAttribute("Position", pComponent->getComponentInfo()->getPosition());
-    subModel.setAttribute("Angle321", pComponent->getComponentInfo()->getAngle321());
-    if (pComponent->getComponentInfo()->getGeometryFile().isEmpty()) {
+    subModel.setAttribute("ModelFile", pComponent->getElementInfo()->getModelFile());
+    subModel.setAttribute("StartCommand", pComponent->getElementInfo()->getStartCommand());
+    subModel.setAttribute("Position", pComponent->getElementInfo()->getPosition());
+    subModel.setAttribute("Angle321", pComponent->getElementInfo()->getAngle321());
+    if (pComponent->getElementInfo()->getGeometryFile().isEmpty()) {
       subModel.removeAttribute("GeometryFile");
     } else {
-      QFileInfo geometryFileInfo(pComponent->getComponentInfo()->getGeometryFile());
+      QFileInfo geometryFileInfo(pComponent->getElementInfo()->getGeometryFile());
       subModel.setAttribute("GeometryFile", geometryFileInfo.fileName());
     }
     // create Annotation Element
@@ -445,8 +445,8 @@ void CompositeModelEditor::updateSubModelOrientation(QString name, QGenericMatri
 
   Element *pComp = mpModelWidget->getDiagramGraphicsView()->getElementObject(name);
   if(pComp) {
-    pComp->getComponentInfo()->setPosition(pos_str);
-    pComp->getComponentInfo()->setAngle321(rot_str);
+    pComp->getElementInfo()->setPosition(pos_str);
+    pComp->getElementInfo()->setAngle321(rot_str);
   }
 }
 
@@ -821,11 +821,11 @@ void CompositeModelEditor::addInterface(Element *pInterfaceComponent, QString su
   QDomElement subModelElement = getSubModelElement(subModel);
   QDomElement interfacePoint = mXmlDocument.createElement("InterfacePoint");
   interfacePoint.setAttribute("Name", pInterfaceComponent->getName());
-  interfacePoint.setAttribute("Position", pInterfaceComponent->getComponentInfo()->getPosition());
-  interfacePoint.setAttribute("Angle321", pInterfaceComponent->getComponentInfo()->getAngle321());
-  interfacePoint.setAttribute("Dimensions", pInterfaceComponent->getComponentInfo()->getDimensions());
-  interfacePoint.setAttribute("Causality", pInterfaceComponent->getComponentInfo()->getTLMCausality());
-  interfacePoint.setAttribute("Domain", pInterfaceComponent->getComponentInfo()->getDomain());
+  interfacePoint.setAttribute("Position", pInterfaceComponent->getElementInfo()->getPosition());
+  interfacePoint.setAttribute("Angle321", pInterfaceComponent->getElementInfo()->getAngle321());
+  interfacePoint.setAttribute("Dimensions", pInterfaceComponent->getElementInfo()->getDimensions());
+  interfacePoint.setAttribute("Causality", pInterfaceComponent->getElementInfo()->getTLMCausality());
+  interfacePoint.setAttribute("Domain", pInterfaceComponent->getElementInfo()->getDomain());
   subModelElement.appendChild(interfacePoint);
   setPlainText(mXmlDocument.toString());
 }
@@ -1035,8 +1035,8 @@ void CompositeModelEditor::updateAllOrientations()
     if(subModelElement.hasAttribute("Position") && subModelElement.hasAttribute("Angle321")) {
       Element *pComp = pView->getElementObject(modelName);
       if(pComp) {
-        pComp->getComponentInfo()->setPosition(subModelElement.attribute("Position"));
-        pComp->getComponentInfo()->setAngle321(subModelElement.attribute("Angle321"));
+        pComp->getElementInfo()->setPosition(subModelElement.attribute("Position"));
+        pComp->getElementInfo()->setAngle321(subModelElement.attribute("Angle321"));
       }
     }
   }

diff --git a/OMEdit/OMEditLIB/Element/CornerItem.cpp b/OMEdit/OMEditLIB/Element/CornerItem.cpp
@@ -232,7 +232,7 @@ ResizerItem::ResizePositions ResizerItem::getResizePosition()
   */
 void ResizerItem::setActive()
 {
-  if (mpComponent->isInheritedComponent()
+  if (mpComponent->isInheritedElement()
       || (mpComponent->getLibraryTreeItem() && mpComponent->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::OMS
           && (mpComponent->getLibraryTreeItem()->getOMSConnector()
               || mpComponent->getLibraryTreeItem()->getOMSBusConnector()
@@ -389,7 +389,7 @@ void OriginItem::setActive()
 {
   setZValue(3000);
   if ((mpShapeAnnotation && mpShapeAnnotation->isInheritedShape())
-      || (mpComponent && (mpComponent->isInheritedComponent()
+      || (mpComponent && (mpComponent->isInheritedElement()
                           || (mpComponent->getLibraryTreeItem() && mpComponent->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::OMS
                               && (mpComponent->getLibraryTreeItem()->getOMSConnector()
                                   || mpComponent->getLibraryTreeItem()->getOMSBusConnector()