Only check for redeclare and not replaceable for parent modifications (…

…#11343) Do not check when fetching element modifications
OpenModelica · Oct 8, 2023 · 1d923bb · 1d923bb
1 parent cdae530
commit 1d923bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/OMEdit/OMEditLIB/Element/ElementProperties.cpp b/OMEdit/OMEditLIB/Element/ElementProperties.cpp
@@ -280,7 +280,7 @@ Parameter::Parameter(ModelInstance::Element *pElement, ElementParameters *pEleme
     }
     setValueWidget(value, true, mUnit);
   } else {
-    mpElementParameters->applyFinalStartFixedAndDisplayUnitModifiers(this, mpModelInstanceElement->getModifier(), true);
+    mpElementParameters->applyFinalStartFixedAndDisplayUnitModifiers(this, mpModelInstanceElement->getModifier(), true, false);
   }
   update();
 }
@@ -1160,14 +1160,15 @@ QString ElementParameters::getElementParentClassName() const
  * \param pParameter
  * \param modifier
  * \param defaultValue
+ * \param isElementModification
  */
-void ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(Parameter *pParameter, const ModelInstance::Modifier &modifier, bool defaultValue)
+void ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(Parameter *pParameter, const ModelInstance::Modifier &modifier, bool defaultValue, bool isElementModification)
 {
   if (pParameter) {
     /* Ticket #2531
      * Check if parameter is marked final.
      */
-    if (modifier.isFinal() || (modifier.isRedeclare() && !modifier.isReplaceable())) {
+    if (modifier.isFinal() || (!isElementModification && modifier.isRedeclare() && !modifier.isReplaceable())) {
       mParametersList.removeOne(pParameter);
       delete pParameter;
     } else {
@@ -1466,7 +1467,7 @@ void ElementParameters::fetchElementExtendsModifiers(ModelInstance::Model *pMode
       fetchElementExtendsModifiers(pExtend->getModel());
       foreach (auto modifier, pExtend->getModifier().getModifiers()) {
         Parameter *pParameter = findParameter(modifier.getName());
-        applyFinalStartFixedAndDisplayUnitModifiers(pParameter, modifier, true);
+        applyFinalStartFixedAndDisplayUnitModifiers(pParameter, modifier, true, false);
       }
     }
   }
@@ -1480,7 +1481,7 @@ void ElementParameters::fetchElementModifiers()
 {
   foreach (auto modifier, mpElement->getModifier().getModifiers()) {
     Parameter *pParameter = findParameter(modifier.getName());
-    ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(pParameter, modifier, mInherited || mNested);
+    ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(pParameter, modifier, mInherited || mNested, true);
   }
 }
 
@@ -1502,7 +1503,7 @@ void ElementParameters::fetchClassExtendsModifiers(ModelInstance::Element *pMode
         if (modifier.getName().compare(mpElement->getName()) == 0) {
           foreach (auto subModifier, modifier.getModifiers()) {
             Parameter *pParameter = findParameter(subModifier.getName());
-            applyFinalStartFixedAndDisplayUnitModifiers(pParameter, subModifier, hasParentElement);
+            applyFinalStartFixedAndDisplayUnitModifiers(pParameter, subModifier, hasParentElement, false);
           }
           break;
         }
@@ -1525,7 +1526,7 @@ void ElementParameters::applyModifiers(const ModelInstance::Modifier modifiers,
   if (mNested) {
     foreach (auto modifier, modifiers.getModifiers()) {
       Parameter *pParameter = findParameter(modifier.getName());
-      ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(pParameter, modifier, defaultValue);
+      ElementParameters::applyFinalStartFixedAndDisplayUnitModifiers(pParameter, modifier, defaultValue, false);
     }
   }
 }

diff --git a/OMEdit/OMEditLIB/Element/ElementProperties.h b/OMEdit/OMEditLIB/Element/ElementProperties.h
@@ -193,7 +193,7 @@ class ElementParameters : public QDialog
   GraphicsView *getGraphicsView() const {return mpGraphicsView;}
   bool isInherited() const {return mInherited;}
   QString getModification() const {return mModification;}
-  void applyFinalStartFixedAndDisplayUnitModifiers(Parameter *pParameter, const ModelInstance::Modifier &modifier, bool defaultValue);
+  void applyFinalStartFixedAndDisplayUnitModifiers(Parameter *pParameter, const ModelInstance::Modifier &modifier, bool defaultValue, bool isElementModification);
   void updateParameters();
 private:
   ModelInstance::Element *mpElement;