Take care of redeclare when copying extends modification (#13528)

Fixes #13516

Author: adeas31

OMEdit/OMEditLIB/Modeling/Model.cpp

@@ -36,6 +36,8 @@
 #include "Util/Helper.h"
 #include "MessagesWidget.h"
 #include "Options/OptionsDialog.h"
+#include "MainWindow.h"
+#include "OMC/OMCProxy.h"
 
 #include <QRectF>
 #include <QtMath>
@@ -736,22 +738,6 @@ namespace ModelInstance
     deserialize(jsonValue);
   }
 
-  Modifier::Modifier(const Modifier *pModifier)
-  {
-    mName = pModifier->getName();
-    mpParentModel = pModifier->getParentModel();
-    mType = pModifier->getType();
-    mFinal = pModifier->isFinal();
-    mEach = pModifier->isEach();
-    mComment = pModifier->getComment();
-    mpElement = 0; // perhaps not needed for deep copy. This constructor is used only during copy/paste of elements.
-    mValue = pModifier->getValue();
-    mValueDefined = pModifier->isValueDefined();
-    foreach (auto pSubModifier, pModifier->getModifiers()) {
-      mModifiers.append(new Modifier(pSubModifier));
-    }
-  }
-
   Modifier::~Modifier()
   {
     if (mpElement) {
@@ -858,9 +844,31 @@ namespace ModelInstance
     return pModifier && pModifier->getName().compare(modifier) == 0;
   }
 
+  /*!
+   * \brief createModifier
+   * Creates the Modifier from another Modifier.\n
+   * See issue #13301 and #13516.\n
+   * Dump the modifier as string and use OMCProxy::modifierToJSON to convert it to JSON.\n
+   * Contruct new Modifier instance with JSON.
+   * \param pModifier
+   * \return
+   */
+  Modifier *createModifier(const Modifier *pModifier, Model *pParentModel)
+  {
+    // If value is defined then we wrap within parenthesis otherwise its not needed.
+    if (pModifier->isValueDefined()) {
+      QJsonObject jsonObject = MainWindow::instance()->getOMCProxy()->modifierToJSON("(" % pModifier->toString() % ")");
+      return new Modifier(pModifier->getName(), jsonObject.value(pModifier->getName()), pParentModel);
+    } else {
+      QJsonObject jsonObject;
+      jsonObject.insert("modifiers", MainWindow::instance()->getOMCProxy()->modifierToJSON(pModifier->toString()));
+      return new Modifier(pModifier->getName(), jsonObject.value("modifiers"), pParentModel);
+    }
+  }
+
   void Modifier::addModifier(const Modifier *pModifier)
   {
-    mModifiers.append(new Modifier(pModifier));
+    mModifiers.append(createModifier(pModifier, mpParentModel));
   }
 
   bool Modifier::isRedeclare() const
@@ -2301,6 +2309,24 @@ namespace ModelInstance
     return modifiers;
   }
 
+  /*!
+   * \brief Component::mergeModifiersIntoOne
+   * Merges the list of all extends modifiers into one modifier.
+   * \param extendsModifiers
+   * \return
+   */
+  Modifier *Component::mergeModifiersIntoOne(QList<Modifier *> extendsModifiers) const
+  {
+    Modifier *pModifier = nullptr;
+    if (!extendsModifiers.isEmpty()) {
+      pModifier = createModifier(extendsModifiers.last(), mpParentModel);
+      for (int i = extendsModifiers.size() - 2 ; i >= 0 ; i--) {
+        Component::mergeModifiers(pModifier, extendsModifiers.at(i));
+      }
+    }
+    return pModifier;
+  }
+
   /*!
    * \brief Component::mergeModifiers
    * Merges pModifier2 into pModifier1
@@ -2329,24 +2355,6 @@ namespace ModelInstance
     }
   }
 
-  /*!
-   * \brief Component::mergeModifiersIntoOne
-   * Merges the list of all extends modifiers into one modifier.
-   * \param extendsModifiers
-   * \return
-   */
-  Modifier* Component::mergeModifiersIntoOne(QList<Modifier *> extendsModifiers)
-  {
-    Modifier *pModifier = nullptr;
-    if (!extendsModifiers.isEmpty()) {
-      pModifier = new Modifier(extendsModifiers.last());
-      for (int i = extendsModifiers.size() - 2 ; i >= 0 ; i--) {
-        Component::mergeModifiers(pModifier, extendsModifiers.at(i));
-      }
-    }
-    return pModifier;
-  }
-
   /*!
    * \brief Component::getQualifiedName
    * Returns the qualified name of the component.
@@ -2396,13 +2404,13 @@ namespace ModelInstance
     if (mpModifier) {
       Modifier *pModifier = nullptr;
       if (mergeExtendsModifiers) {
-        // Merge extends modifiers. See issue #13301
+        // Merge extends modifiers. See issue #13301 and #13516.
         QList<Modifier *> extendsModifiers = getExtendsModifiers(mpModifier);
-        pModifier = Component::mergeModifiersIntoOne(extendsModifiers);
+        pModifier = mergeModifiersIntoOne(extendsModifiers);
       }
 
       if (pModifier) {
-        mergeModifiers(pModifier, mpModifier);
+        Component::mergeModifiers(pModifier, mpModifier);
         // we don't need the name coming from the extend modification
         pModifier->setName("");
         value.append(pModifier->toString());

OMEdit/OMEditLIB/Modeling/Model.h

@@ -477,7 +477,6 @@ namespace ModelInstance
   {
   public:
     Modifier(const QString &name, const QJsonValue &jsonValue, Model *pParentModel);
-    Modifier(const Modifier *pModifier);
     ~Modifier();
     void deserialize(const QJsonValue &jsonValue);
 
@@ -762,8 +761,8 @@ namespace ModelInstance
   private:
     void deserialize_impl(const QJsonObject &jsonObject) override;
     QList<Modifier*> getExtendsModifiers(const Modifier *pModifier) const;
+    Modifier *mergeModifiersIntoOne(QList<Modifier*> extendsModifiers) const;
     static void mergeModifiers(Modifier *pModifier1, Modifier *pModifier2);
-    static Modifier *mergeModifiersIntoOne(QList<Modifier*> extendsModifiers);
   private:
     QString mName;
     bool mCondition = true;