Fixes ticket:5412 Close the simulation result file properly

OpenModelica · Mar 29, 2019 · 03aae16 · 03aae16
1 parent 0bc9db2
commit 03aae16
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -639,8 +639,6 @@ void MainWindow::openResultFiles(QStringList fileNames)
   foreach (QString fileName, fileNames) {
     QFileInfo fileInfo(fileName);
     QStringList list = mpOMCProxy->readSimulationResultVars(fileInfo.absoluteFilePath());
-    // close the simulation result file.
-    mpOMCProxy->closeSimulationResultFile();
     if (list.size() > 0) {
       mpPerspectiveTabbar->setCurrentIndex(2);
       mpVariablesWidget->insertVariablesItemsToTree(fileInfo.fileName(), fileInfo.absoluteDir().absolutePath(), list, SimulationOptions());

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -2165,6 +2165,8 @@ int OMCProxy::readSimulationResultSize(QString fileName)
 {
   int size = mpOMCInterface->readSimulationResultSize(fileName);
   getErrorString();
+  // close the simulation result file.
+  closeSimulationResultFile();
   return size;
 }
 
@@ -2179,6 +2181,8 @@ QStringList OMCProxy::readSimulationResultVars(QString fileName)
   QStringList variablesList = mpOMCInterface->readSimulationResultVars(fileName, true, false);
   qSort(variablesList.begin(), variablesList.end());
   printMessagesStringInternal();
+  // close the simulation result file.
+  closeSimulationResultFile();
   return variablesList;
 }
 

diff --git a/OMEdit/OMEditGUI/OMS/OMSSimulationDialog.cpp b/OMEdit/OMEditGUI/OMS/OMSSimulationDialog.cpp
@@ -119,8 +119,6 @@ void OMSSimulationDialog::simulationFinished(OMSSimulationOptions omsSimulationO
     VariablesWidget *pVariablesWidget = MainWindow::instance()->getVariablesWidget();
     OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
     QStringList list = pOMCProxy->readSimulationResultVars(resultFileInfo.absoluteFilePath());
-    // close the simulation result file.
-    pOMCProxy->closeSimulationResultFile();
     if (list.size() > 0) {
       MainWindow::instance()->getPerspectiveTabBar()->setCurrentIndex(2);
       pVariablesWidget->insertVariablesItemsToTree(resultFileInfo.fileName(), omsSimulationOptions.getWorkingDirectory(),

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -1869,8 +1869,6 @@ void SimulationDialog::simulationProcessFinished(SimulationOptions simulationOpt
     VariablesWidget *pVariablesWidget = MainWindow::instance()->getVariablesWidget();
     OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
     QStringList list = pOMCProxy->readSimulationResultVars(resultFileInfo.absoluteFilePath());
-    // close the simulation result file.
-    pOMCProxy->closeSimulationResultFile();
     if (list.size() > 0) {
       if (OptionsDialog::instance()->getSimulationPage()->getSwitchToPlottingPerspectiveCheckBox()->isChecked()) {
         bool showPlotWindow = true;

diff --git a/OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.cpp b/OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.cpp
@@ -210,8 +210,6 @@ void TLMCoSimulationDialog::simulationProcessFinished(TLMCoSimulationOptions tlm
     VariablesWidget *pVariablesWidget = MainWindow::instance()->getVariablesWidget();
     OMCProxy *pOMCProxy = MainWindow::instance()->getOMCProxy();
     QStringList list = pOMCProxy->readSimulationResultVars(resultFileInfo.absoluteFilePath());
-    // close the simulation result file.
-    pOMCProxy->closeSimulationResultFile();
     if (list.size() > 0) {
 #if !defined(WITHOUT_OSG)
       // only show the AnimationWindow if we have a visual xml file.