ticket:4461 Save additional simulation flags

OpenModelica · Oct 4, 2017 · 90af743 · 90af743
1 parent ae793be
commit 90af743
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -2611,9 +2611,7 @@ QString OMCProxy::getCommandLineOptionsAnnotation(QString className)
 QList<QString> OMCProxy::getAnnotationNamedModifiers(QString className, QString annotation)
 {
   QList<QString> result = mpOMCInterface->getAnnotationNamedModifiers(className, annotation);
-  if (result.isEmpty()) {
-    printMessagesStringInternal();
-  }
+  getErrorString();
   return result;
 }
 

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -672,6 +672,8 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
             }
             i++;
           }
+        } else if (simulationFlag.compare("additionalSimulationFlags") == 0) {
+          mpAdditionalSimulationFlagsTextBox->setText(value);
         }
       }
     }
@@ -1202,6 +1204,9 @@ void SimulationDialog::saveSimulationFlagsAnnotation()
   if (logStreams.size() > 0) {
     simulationFlags.append(QString("%1=\"%2\"").arg("lv").arg(logStreams.join(",")));
   }
+  if (!mpAdditionalSimulationFlagsTextBox->text().isEmpty()) {
+    simulationFlags.append(QString("%1=\"%2\"").arg("additionalSimulationFlags").arg(mpAdditionalSimulationFlagsTextBox->text()));
+  }
   QString newSimulationFlags = QString("__OpenModelica_simulationFlags(%1)").arg(simulationFlags.join(","));
   // if we have ModelWidget for class then put the change on undo stack.
   if (mpLibraryTreeItem->getModelWidget()) {