Instantiate OMSimulator model when simulate button is clicked

OpenModelica · Jun 23, 2020 · b858490 · b858490
1 parent bd4b2d5
commit b858490
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/OMEdit/OMEditLIB/MainWindow.cpp b/OMEdit/OMEditLIB/MainWindow.cpp
@@ -708,7 +708,13 @@ void MainWindow::simulate(LibraryTreeItem *pLibraryTreeItem)
       if (!mpOMSSimulationDialog) {
         mpOMSSimulationDialog = new OMSSimulationDialog(this);
       }
-      mpOMSSimulationDialog->simulate(pTopLevelLibraryTreeItem);
+      const QString modelName = pTopLevelLibraryTreeItem->getNameStructure();
+      instantiateOMSModel(pTopLevelLibraryTreeItem, !pTopLevelLibraryTreeItem->isOMSModelInstantiated());
+      // get the top level LibraryTreeItem again since instantiateOMSModel redraws them
+      LibraryTreeItem *pTopLevelLibraryTreeItem = mpLibraryWidget->getLibraryTreeModel()->findLibraryTreeItemOneLevel(modelName);
+      if (pTopLevelLibraryTreeItem) {
+        mpOMSSimulationDialog->simulate(pTopLevelLibraryTreeItem);
+      }
     }
   }
 }
@@ -819,23 +825,6 @@ void MainWindow::instantiateOMSModel(LibraryTreeItem *pLibraryTreeItem, bool che
   }
 }
 
-/*!
- * \brief MainWindow::simulateOMSModel
- * Simulates the OMSimulator model.
- * \param pLibraryTreeItem
- */
-void MainWindow::simulateOMSModel(LibraryTreeItem *pLibraryTreeItem)
-{
-  // get the top level LibraryTreeItem
-  LibraryTreeItem *pTopLevelLibraryTreeItem = mpLibraryWidget->getLibraryTreeModel()->getTopLevelLibraryTreeItem(pLibraryTreeItem);
-  if (pTopLevelLibraryTreeItem) {
-    if (!mpOMSSimulationDialog) {
-      mpOMSSimulationDialog = new OMSSimulationDialog(this);
-    }
-    mpOMSSimulationDialog->simulate(pTopLevelLibraryTreeItem);
-  }
-}
-
 void MainWindow::instantiateModel(LibraryTreeItem *pLibraryTreeItem)
 {
   /* if Modelica text is changed manually by user then validate it before saving. */

diff --git a/OMEdit/OMEditLIB/MainWindow.h b/OMEdit/OMEditLIB/MainWindow.h
@@ -227,7 +227,6 @@ class MainWindow : public QMainWindow
 #endif
   void simulationSetup(LibraryTreeItem *pLibraryTreeItem);
   void instantiateOMSModel(LibraryTreeItem *pLibraryTreeItem, bool checked);
-  void simulateOMSModel(LibraryTreeItem *pLibraryTreeItem);
   void instantiateModel(LibraryTreeItem *pLibraryTreeItem);
   void checkModel(LibraryTreeItem *pLibraryTreeItem);
   void checkAllModels(LibraryTreeItem *pLibraryTreeItem);

diff --git a/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp
@@ -8113,7 +8113,7 @@ void ModelWidgetContainer::currentModelWidgetChanged(QMdiSubWindow *pSubWindow)
   MainWindow::instance()->getBitmapShapeAction()->setEnabled(enabled && modelica && !textView);
   MainWindow::instance()->getConnectModeAction()->setEnabled(enabled && (modelica || compositeModel || (oms && !(omsSubmodel || omsConnector))) && !textView);
   MainWindow::instance()->getTransitionModeAction()->setEnabled(enabled && (modelica) && !textView);
-  MainWindow::instance()->getSimulateModelAction()->setEnabled(enabled && ((modelica && pLibraryTreeItem->isSimulationAllowed()) || (oms && isOMSModelInstantiated)));
+  MainWindow::instance()->getSimulateModelAction()->setEnabled(enabled && ((modelica && pLibraryTreeItem->isSimulationAllowed()) || (oms)));
   MainWindow::instance()->getSimulateWithTransformationalDebuggerAction()->setEnabled(enabled && modelica && pLibraryTreeItem->isSimulationAllowed());
   MainWindow::instance()->getSimulateWithAlgorithmicDebuggerAction()->setEnabled(enabled && modelica && pLibraryTreeItem->isSimulationAllowed());
 #if !defined(WITHOUT_OSG)

diff --git a/OMEdit/OMEditLIB/OMS/OMSSimulationDialog.cpp b/OMEdit/OMEditLIB/OMS/OMSSimulationDialog.cpp
@@ -240,7 +240,6 @@ void OMSSimulationDialog::simulationFinished(const QString &resultFilePath, QDat
                                                           Helper::scriptingKind, Helper::errorLevel));
     return;
   }
-  qDebug() << resultFilePath << resultFileLastModifiedDateTime << resultFileInfo.lastModified();
   VariablesWidget *pVariablesWidget = MainWindow::instance()->getVariablesWidget();
   OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
   QStringList list = pOMCProxy->readSimulationResultVars(resultFileInfo.absoluteFilePath());