Simulation Experiment view: fixed a couple of GUI glitches (#2332).

opencor · Apr 25, 2020 · 5536aa7 · 5536aa7
1 parent e64c399
commit 5536aa7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp b/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp
@@ -996,17 +996,15 @@ void SimulationExperimentViewSimulationWidget::initialize(bool pReloading)
 
             mRunPauseResumeSimulationAction->setEnabled(voi != nullptr);
 
-            // Update our simulation mode or clear our simulation results
-            // (should there be some) in case we are reloading ourselves
-            // Note: to clear our simualtion data will also update our
-            //       simulation mode, so we are fine...
+            // Clear our simulation results, in case we are reloading ourselves,
+            // and update our simulation mode
 
             if (pReloading) {
-                clearSimulationResults(pReloading);
-            } else {
-                updateSimulationMode();
+                clearSimulationResults();
             }
 
+            updateSimulationMode();
+
             // Initialise our contents widget and make sure that we have the
             // required type(s) of solvers
 
@@ -1099,7 +1097,7 @@ void SimulationExperimentViewSimulationWidget::initialize(bool pReloading)
 
             // Initialise our simulation
 
-            initializeSimulation(pReloading);
+            initializeSimulation();
 
             // Now, we can safely update our parameters widget since our model
             // parameters have been computed
@@ -1126,7 +1124,7 @@ void SimulationExperimentViewSimulationWidget::initialize(bool pReloading)
             initializeGui(mValidSimulationEnvironment);
 
             if (mValidSimulationEnvironment) {
-                initializeSimulation(pReloading);
+                initializeSimulation();
             }
         }
     mContentsWidget->setUpdatesEnabled(true);
@@ -1458,7 +1456,7 @@ void SimulationExperimentViewSimulationWidget::resetAllModelParameters()
 
 //==============================================================================
 
-void SimulationExperimentViewSimulationWidget::clearSimulationResults(bool pReloading)
+void SimulationExperimentViewSimulationWidget::clearSimulationResults()
 {
     setUpdatesEnabled(false);
         // Clear our simulation results
@@ -1467,7 +1465,7 @@ void SimulationExperimentViewSimulationWidget::clearSimulationResults(bool pRelo
         //       were to have several graph panels since they would try to
         //       realign themselves)...
 
-        mSimulation->results()->reset(pReloading);
+        mSimulation->results()->reset();
     setUpdatesEnabled(true);
 }
 
@@ -2716,13 +2714,13 @@ void SimulationExperimentViewSimulationWidget::initializeGui(bool pValidSimulati
 
 //==============================================================================
 
-void SimulationExperimentViewSimulationWidget::initializeSimulation(bool pReloading)
+void SimulationExperimentViewSimulationWidget::initializeSimulation()
 {
     // Reset both the simulation's data and results (well, initialise in the
     // case of its data)
 
     mSimulation->data()->reset();
-    mSimulation->results()->reset(pReloading);
+    mSimulation->results()->reset();
 
     // Retrieve our simulation and solvers properties since they may have an
     // effect on our parameter values (as well as result in some solver

diff --git a/...lugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.h b/...lugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.h
@@ -311,7 +311,7 @@ class SimulationExperimentViewSimulationWidget : public Core::Widget
 
     bool furtherInitialize();
     void initializeGui(bool pValidSimulationEnvironment);
-    void initializeSimulation(bool pReloading = false);
+    void initializeSimulation();
 
     void initializeTrackers(bool pInitialzeGraphPanelsWidgetSizes = false);
 
@@ -356,7 +356,7 @@ class SimulationExperimentViewSimulationWidget : public Core::Widget
     void exportDone(DataStore::DataStoreExporter *pDataStoreExporter);
 
 public slots:
-    void clearSimulationResults(bool pReloading = false);
+    void clearSimulationResults();
 
 private slots:
     void runPauseResumeSimulation();

diff --git a/src/plugins/support/SimulationSupport/src/simulation.cpp b/src/plugins/support/SimulationSupport/src/simulation.cpp
@@ -985,25 +985,21 @@ void SimulationResults::reload()
 
     mDataDataStores.clear();
 
-    reset(true);
+    reset();
 }
 
 //==============================================================================
 
-void SimulationResults::reset(bool pReloading)
+void SimulationResults::reset()
 {
     // Reset our data store by deleting it and then recreating it
 
     deleteDataStore();
     createDataStore();
 
-    // Let people know that we have been reset, but only if we are not reloading
-    // since otherwise our GUI may crash due our checking for results (see
-    // https://github.com/opencor/opencor/issues/2290)
+    // Let people know that we have been reset
 
-    if (!pReloading) {
-        emit resultsReset();
-    }
+    emit resultsReset();
 }
 
 //==============================================================================
@@ -1527,7 +1523,7 @@ void Simulation::save()
     // will disable its reset buttons), but only if we have / still have a
     // runtime
 
-    if (mRuntime != nullptr) {
+    if ((mRuntime != nullptr) && (mFileType == FileType::CellmlFile)) {
         mData->updateInitialValues();
     }
 }

diff --git a/src/plugins/support/SimulationSupport/src/simulation.h b/src/plugins/support/SimulationSupport/src/simulation.h
@@ -317,7 +317,7 @@ class SIMULATIONSUPPORT_EXPORT SimulationResults : public SimulationObject
 public slots:
     void reload();
 
-    void reset(bool pReloading = false);
+    void reset();
 
     int runsCount() const;