Merge d60c941 into 2bf9694

opencor · Jan 31, 2019 · 325abae · 325abae
2 parents 2bf9694 + d60c941
commit 325abae
Show file tree

Hide file tree

Showing 8 changed files with 270 additions and 217 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -43,7 +43,7 @@ var jsonData = { "versions": [
                        { "change": "<strong>CellML Annotation view:</strong> prevent OpenCOR from crashing after a CellML file has been rendered invalid (see issue <a href=\"https://github.com/opencor/opencor/issues/1958\">#1958</a>)." },
                        { "change": "<strong>CellML Text view:</strong> improved Unicode support (see issue <a href=\"https://github.com/opencor/opencor/issues/1926\">#1926</a>)." },
                        { "change": "<strong>CellML tools:</strong> can now validate a <a href=\"https://www.cellml.org/\">CellML</a> file from the <a href=\"https://en.wikipedia.org/wiki/Command-line_interface\">CLI</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/1964\">#1964</a>)." },
-                       { "change": "<strong>Simulation Experiment view:</strong> ensure that graph panels are always properly aligned (see issue <a href=\"https://github.com/opencor/opencor/issues/1956\">#1956</a>)." },
+                       { "change": "<strong>Simulation Experiment view:</strong> ensure that graph panels are always properly aligned (see issue <a href=\"https://github.com/opencor/opencor/issues/1956\">#1956</a>). Fixed various issues with saving a file under a new name (see issue <a href=\"https://github.com/opencor/opencor/issues/1967\">#1967</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 7.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1917\">#1917</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 4.0.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/1960\">#1960</a>). Upgraded the <a href=\"http://qwt.sourceforge.net/\">Qwt</a> library to version 6.1.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1933\">#1933</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.2.8 (see issue <a href=\"https://github.com/opencor/opencor/issues/1945\">#1945</a>)." }
                      ]
                    },

diff --git a/doc/whatIsNew.js b/doc/whatIsNew.js
@@ -20,7 +20,8 @@ var jsonData = { "versions": [
                            { "type": "subCategory", "name": "Simulation Experiment view",
                              "entries": [
                                { "type": "improved", "description": "Rendering of the <a href=\"https://en.wikipedia.org/wiki/Graphical_user_interface\">GUI</a>." },
-                               { "type": "improved", "description": "Plotting of simulations." }
+                               { "type": "improved", "description": "Plotting of simulations." },
+                               { "type": "fixed", "description": "Various issue with saving a file under a new name." }
                              ]
                            }
                          ]

diff --git a/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp b/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp
@@ -3362,12 +3362,11 @@ void SimulationExperimentViewSimulationWidget::simulationDataModified(bool pIsMo
 {
     // Update some of our actions based on whether we are modified
 
-    if (mDevelopmentModeAction->isChecked()) {
+    if (mDevelopmentModeAction->isChecked())
         Core::FileManager::instance()->setModified(mSimulation->fileName(), pIsModified);
-    } else {
-        mResetStateModelParametersAction->setEnabled(mSimulation->data()->isStatesModified());
-        mResetAllModelParametersAction->setEnabled(pIsModified);
-    }
+
+    mResetStateModelParametersAction->setEnabled(mSimulation->data()->isStatesModified());
+    mResetAllModelParametersAction->setEnabled(pIsModified);
 }
 
 //==============================================================================
@@ -4122,7 +4121,7 @@ void SimulationExperimentViewSimulationWidget::checkSimulationProperties()
 
     // Update our file's modified status
 
-    updateFileModifiedStatus();
+    updateSedmlFileOrCombineArchiveModifiedStatus();
 }
 
 //==============================================================================
@@ -4135,7 +4134,7 @@ void SimulationExperimentViewSimulationWidget::checkSolversProperties()
 
     // Update our file's modified status
 
-    updateFileModifiedStatus();
+    updateSedmlFileOrCombineArchiveModifiedStatus();
 }
 
 //==============================================================================
@@ -4182,7 +4181,7 @@ void SimulationExperimentViewSimulationWidget::checkGraphPanelsAndGraphs()
 
     // Update our file's modified status
 
-    updateFileModifiedStatus();
+    updateSedmlFileOrCombineArchiveModifiedStatus();
 }
 
 //==============================================================================
@@ -4209,7 +4208,7 @@ QStringList SimulationExperimentViewSimulationWidget::allPropertyValues(Core::Pr
 
 //==============================================================================
 
-void SimulationExperimentViewSimulationWidget::updateFileModifiedStatus()
+void SimulationExperimentViewSimulationWidget::updateSedmlFileOrCombineArchiveModifiedStatus()
 {
     // Make sure that we are not dealing with a remote file
 

diff --git a/...lugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.h b/...lugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.h
@@ -306,7 +306,7 @@ class SimulationExperimentViewSimulationWidget : public Core::Widget
 
     QStringList allPropertyValues(Core::PropertyEditorWidget *pPropertyEditor) const;
 
-    void updateFileModifiedStatus();
+    void updateSedmlFileOrCombineArchiveModifiedStatus();
 
     void simulationError(const QString &pMessage, ErrorType pErrorType);