Simulation support: all issues are now considered to be blocking.

opencor · Jun 29, 2021 · fff694b · fff694b
1 parent bb0dc42
commit fff694b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 35 deletions.
diff --git a/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp b/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp
@@ -957,7 +957,7 @@ void SimulationExperimentViewSimulationWidget::initialize(bool pReloading)
         bool validRuntime = (runtime != nullptr) && runtime->isValid();
         CellMLSupport::CellmlFileRuntimeParameter *voi = validRuntime?runtime->voi():nullptr;
 
-        if (!mSimulation->hasBlockingIssues()) {
+        if (!mSimulation->hasIssues()) {
             information += QString()+OutputTab+"<strong>"+tr("Runtime:")+"</strong> ";
 
             if (voi != nullptr) {
@@ -1014,7 +1014,7 @@ void SimulationExperimentViewSimulationWidget::initialize(bool pReloading)
 
         mValidSimulationEnvironment = false;
 
-        if (!mSimulation->hasBlockingIssues()) {
+        if (!mSimulation->hasIssues()) {
             // Enable/disable our run/pause action depending on whether we have
             // a VOI
 

diff --git a/src/plugins/support/SimulationSupport/i18n/SimulationSupport_fr.ts b/src/plugins/support/SimulationSupport/i18n/SimulationSupport_fr.ts
@@ -23,8 +23,8 @@
 <context>
     <name>OpenCOR::SimulationSupport::SimulationSupportPythonWrapper</name>
     <message>
-        <source>The simulation has blocking issues and cannot therefore be run.</source>
-        <translation>La simulation a des problèmes blocants et ne peut donc pas être exécutée.</translation>
+        <source>The simulation has issues and cannot therefore be run.</source>
+        <translation>La simulation a des problèmes et ne peut donc pas être exécutée.</translation>
     </message>
     <message>
         <source>The simulation has an invalid runtime and cannot therefore be run.</source>

diff --git a/src/plugins/support/SimulationSupport/src/simulation.cpp b/src/plugins/support/SimulationSupport/src/simulation.cpp
@@ -1586,7 +1586,6 @@ void Simulation::checkIssues()
 
     mNeedCheckIssues = false;
     mIssues = SimulationIssues();
-    mHasBlockingIssues = false;
 
     // Make sure that we are dealing with a CellML file, a SED-ML file or a
     // COMBINE archive
@@ -1598,8 +1597,6 @@ void Simulation::checkIssues()
                                                                                                                                                    fileManagerInstance->url(mFileName):
                                                                                                                                                    mFileName)));
 
-        mHasBlockingIssues = true;
-
         return;
     }
 
@@ -1627,8 +1624,6 @@ void Simulation::checkIssues()
             case COMBINESupport::CombineArchiveIssue::Type::Error:
                 issueType = SimulationIssue::Type::Error;
 
-                mHasBlockingIssues = true;
-
                 break;
             case COMBINESupport::CombineArchiveIssue::Type::Warning:
                 issueType = SimulationIssue::Type::Warning;
@@ -1637,8 +1632,6 @@ void Simulation::checkIssues()
             case COMBINESupport::CombineArchiveIssue::Type::Fatal:
                 issueType = SimulationIssue::Type::Fatal;
 
-                mHasBlockingIssues = true;
-
                 break;
             }
 
@@ -1660,8 +1653,6 @@ void Simulation::checkIssues()
             case SEDMLSupport::SedmlFileIssue::Type::Error:
                 issueType = SimulationIssue::Type::Error;
 
-                mHasBlockingIssues = true;
-
                 break;
             case SEDMLSupport::SedmlFileIssue::Type::Warning:
                 issueType = SimulationIssue::Type::Warning;
@@ -1670,8 +1661,6 @@ void Simulation::checkIssues()
             case SEDMLSupport::SedmlFileIssue::Type::Fatal:
                 issueType = SimulationIssue::Type::Fatal;
 
-                mHasBlockingIssues = true;
-
                 break;
             }
 
@@ -1682,7 +1671,7 @@ void Simulation::checkIssues()
         }
     }
 
-    if (!mHasBlockingIssues) {
+    if (mIssues.empty()) {
         bool validRuntime = (mRuntime != nullptr) && mRuntime->isValid();
         CellMLSupport::CellmlFileRuntimeParameter *voi = validRuntime?
                                                              mRuntime->voi():
@@ -1746,20 +1735,7 @@ bool Simulation::hasIssues()
 {
     // Return whether we have issues, after having checked for them
 
-    checkIssues();
-
-    return !mIssues.empty();
-}
-
-//==============================================================================
-
-bool Simulation::hasBlockingIssues()
-{
-    // Return whether we have blocking issues, after having checked for them
-
-    checkIssues();
-
-    return mHasBlockingIssues;
+    return !issues().empty();
 }
 
 //==============================================================================

diff --git a/src/plugins/support/SimulationSupport/src/simulation.h b/src/plugins/support/SimulationSupport/src/simulation.h
@@ -397,7 +397,6 @@ class SIMULATIONSUPPORT_EXPORT Simulation : public QObject
 
     bool mNeedCheckIssues = true;
     SimulationIssues mIssues;
-    bool mHasBlockingIssues = false;
 
     CellMLSupport::CellmlFileRuntime *mRuntime = nullptr;
 
@@ -428,7 +427,6 @@ public slots:
     QString fileName() const;
 
     bool hasIssues();
-    bool hasBlockingIssues();
 
     void save();
     void reload();

diff --git a/src/plugins/support/SimulationSupport/src/simulationsupportpythonwrapper.cpp b/src/plugins/support/SimulationSupport/src/simulationsupportpythonwrapper.cpp
@@ -245,7 +245,7 @@ bool SimulationSupportPythonWrapper::valid(Simulation *pSimulation)
 {
     // Return whether the given simulation is valid
 
-    if (!pSimulation->hasBlockingIssues()) {
+    if (!pSimulation->hasIssues()) {
         CellMLSupport::CellmlFileRuntime *runtime = pSimulation->runtime();
 
         return (runtime != nullptr) && runtime->isValid();
@@ -261,8 +261,8 @@ bool SimulationSupportPythonWrapper::run(Simulation *pSimulation)
     // Run the given simulation, but only if it doesn't have blocking issues and
     // if it is valid
 
-    if (pSimulation->hasBlockingIssues()) {
-        throw std::runtime_error(tr("The simulation has blocking issues and cannot therefore be run.").toStdString());
+    if (pSimulation->hasIssues()) {
+        throw std::runtime_error(tr("The simulation has issues and cannot therefore be run.").toStdString());
     }
 
     if (!valid(pSimulation)) {