Print prefixes for choices

OpenModelica · Dec 1, 2023 · 3cdc149 · 3cdc149
1 parent 239e4da
commit 3cdc149
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/OMEdit/OMEditLIB/Modeling/Model.cpp b/OMEdit/OMEditLIB/Modeling/Model.cpp
@@ -980,6 +980,17 @@ namespace ModelInstance
     return value.join(" ");
   }
 
+  QString Prefixes::typePrefixes() const
+  {
+    QStringList value;
+
+    if (!mConnector.isEmpty()) value.append(mConnector);
+    if (!mVariability.isEmpty()) value.append(mVariability);
+    if (!mDirection.isEmpty()) value.append(mDirection);
+
+    return value.join(" ");
+  }
+
   Source::Source()
   {
     mFileName = "";
@@ -2053,6 +2064,12 @@ namespace ModelInstance
     QStringList value;
 
     value.append(Element::toString(skipTopLevel));
+
+    if (mpPrefixes) {
+      auto prefixes = mpPrefixes->typePrefixes();
+      if (!prefixes.isEmpty()) value.append(prefixes);
+    }
+
     value.append(mType);
     value.append(mName);
     if (mpModifier) {
@@ -2119,7 +2136,12 @@ namespace ModelInstance
     value.append(mType);
     value.append(mName);
     if (!mBaseClass.isEmpty()) {
-      value.append("= " % mBaseClass);
+      value.append("= ");
+
+      auto dir = getDirectionPrefix();
+      if (!dir.isEmpty()) value.append(dir);
+
+      value.append(mBaseClass);
     }
 
     value.removeAll(QString(""));

diff --git a/OMEdit/OMEditLIB/Modeling/Model.h b/OMEdit/OMEditLIB/Modeling/Model.h
@@ -529,6 +529,8 @@ namespace ModelInstance
     const QString &getVariability() const {return mVariability;}
     const QString &getDirection() const {return mDirection;}
     QString toString(bool skipTopLevel = false) const;
+    QString typePrefixes() const;
+
   private:
     Model *mpParentModel;
     bool mPublic;