Fetch the solver methods from simulation_options.h

OpenModelica · Jun 25, 2015 · a1c898b · a1c898b
1 parent 6127950
commit a1c898b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 18 deletions.
diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -58,6 +58,7 @@ void omc_Main_setWindowsPaths(threadData_t *threadData, void* _inOMHome);
 #include <iostream>
 
 #include "OMCProxy.h"
+#include "simulation_options.h"
 
 static QVariant parseExpression(QString result)
 {
@@ -2307,6 +2308,19 @@ QStringList OMCProxy::getEnumerationLiterals(QString className)
   return enumerationLiterals;
 }
 
+/*!
+ * \brief OMCProxy::getSolverMethods
+ * Returns the list of solvers name and their description.
+ * \return
+ */
+void OMCProxy::getSolverMethods(QStringList *methods, QStringList *descriptions)
+{
+  for (int i = S_UNKNOWN + 1 ; i < S_MAX ; i++) {
+    *methods << SOLVER_METHOD_NAME[i];
+    *descriptions << SOLVER_METHOD_DESC[i];
+  }
+}
+
 /*!
   \class CustomExpressionBox
   \brief A text box for executing OMC commands.

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.h b/OMEdit/OMEditGUI/OMC/OMCProxy.h
@@ -209,6 +209,7 @@ class OMCProxy : public QObject
   bool exportToFigaro(QString className, QString directory, QString database, QString mode, QString options, QString processor);
   bool copyClass(QString className, QString newClassName, QString withIn);
   QStringList getEnumerationLiterals(QString className);
+  void getSolverMethods(QStringList *methods, QStringList *descriptions);
 signals:
   void commandFinished();
 public slots:

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -238,7 +238,8 @@ INCLUDEPATH += . \
   TLM \
   TransformationalDebugger \
   Util \
-  $$OPENMODELICAHOME/include/omc/scripting-API
+  $$OPENMODELICAHOME/include/omc/scripting-API \
+  $$OPENMODELICAHOME/include/omc/c/util
 
 OTHER_FILES += Resources/css/stylesheet.qss \
   Resources/XMLSchema/tlmModelDescription.xsd \

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -145,24 +145,19 @@ void SimulationDialog::setUpForm()
   // Integration
   mpIntegrationGroupBox = new QGroupBox(tr("Integration"));
   mpMethodLabel = new Label(tr("Method:"));
+  // get the solver methods
+  QStringList solverMethods, solverMethodsDesc;
+  mpMainWindow->getOMCProxy()->getSolverMethods(&solverMethods, &solverMethodsDesc);
   mpMethodComboBox = new QComboBox;
-  mpMethodComboBox->addItem("dassl");
-  mpMethodComboBox->setItemData(0, "dassl with colored numerical jacobian, with interval root finding", Qt::ToolTipRole);
-  mpMethodComboBox->addItem("euler");
-  mpMethodComboBox->addItem("rungekutta");
-  mpMethodComboBox->addItem("optimization");
-  mpMethodComboBox->addItem("radau1");
-  mpMethodComboBox->setItemData(4, "sundial/kinsol needed", Qt::ToolTipRole);
-  mpMethodComboBox->addItem("radau3");
-  mpMethodComboBox->setItemData(5, "sundial/kinsol needed", Qt::ToolTipRole);
-  mpMethodComboBox->addItem("radau5");
-  mpMethodComboBox->setItemData(6, "sundial/kinsol needed", Qt::ToolTipRole);
-  mpMethodComboBox->addItem("lobatto2");
-  mpMethodComboBox->setItemData(7, "sundial/kinsol needed", Qt::ToolTipRole);
-  mpMethodComboBox->addItem("lobatto4");
-  mpMethodComboBox->setItemData(8, "sundial/kinsol needed", Qt::ToolTipRole);
-  mpMethodComboBox->addItem("lobatto6");
-  mpMethodComboBox->setItemData(9, "sundial/kinsol needed", Qt::ToolTipRole);
+  mpMethodComboBox->addItems(solverMethods);
+  for (int i = 0 ; i < solverMethodsDesc.size() ; i++) {
+    mpMethodComboBox->setItemData(i, solverMethodsDesc.at(i), Qt::ToolTipRole);
+  }
+  // make dassl default solver method.
+  int currentIndex = mpMethodComboBox->findText("dassl", Qt::MatchExactly);
+  if (currentIndex > -1) {
+    mpMethodComboBox->setCurrentIndex(currentIndex);
+  }
   connect(mpMethodComboBox, SIGNAL(currentIndexChanged(QString)), SLOT(enableDasslOptions(QString)));
   mpMehtodHelpButton = new QToolButton;
   mpMehtodHelpButton->setIcon(QIcon(":/Resources/icons/link-external.svg"));