Enable solver start/stop/kill actions based on per-model solver state

Author: tomas-soltys

src/fea/doc/RELEASE_NOTES.md

@@ -218,6 +218,16 @@
   accepted alternatives. An acoustic entity carrying a density and a speed of
   sound is no longer flagged for missing a modulus of elasticity
 
+#### Solver control
+
+- **Stop solver** and **Kill solver** are enabled only while a solver is
+  running. They used to stay enabled after the solver finished, failed or was
+  killed
+- **Start solver** is enabled only when none of the selected models has a
+  solver running or queued, so a solver can no longer be started twice for the
+  same model. It becomes available again as soon as that model's solver
+  finishes, fails or is killed
+
 #### 3D view and picking
 
 - A picked node is visible. It was marked with a single point whose size the

src/fea/src/action.cpp

@@ -61,17 +61,6 @@
 Action::Action(RAction::Definition definition, QObject *parent)
     : RAction{definition,parent}
 {
-
-    if (this->name == Action::getName(ACTION_SOLVER_START))
-    {
-        QObject::connect(&SolverManager::getInstance(), &SolverManager::jobStarted, this, &Action::disable);
-        QObject::connect(&SolverManager::getInstance(), &SolverManager::jobFinished, this, &Action::enable);
-    }
-    if (this->name == Action::getName(ACTION_SOLVER_STOP) || this->name == Action::getName(ACTION_SOLVER_KILL))
-    {
-        QObject::connect(&SolverManager::getInstance(), &SolverManager::jobStarted, this, &Action::enable);
-        QObject::connect(&SolverManager::getInstance(), &SolverManager::jobFinished, this, &Action::disable);
-    }
 }
 
 QString Action::getGroupName(GroupType groupType)

src/fea/src/action_list.cpp

@@ -166,7 +166,16 @@ void ActionList::processAvailability()
         this->getAction(Action::ACTION_PROBLEM_SOLVER_SETUP)->setEnabled(true);
         this->getAction(Action::ACTION_PROBLEM_DEFINE_MONITORING_POINTS)->setEnabled(true);
         this->getAction(Action::ACTION_PROBLEM_RESET)->setEnabled(true);
-        this->getAction(Action::ACTION_SOLVER_START)->setEnabled(true);
+        bool solverActive = false;
+        for (uint modelID : std::as_const(selectedModelIDs))
+        {
+            if (SolverManager::getInstance().isSolverRunning(modelID) || SolverManager::getInstance().isSolverQueued(modelID))
+            {
+                solverActive = true;
+                break;
+            }
+        }
+        this->getAction(Action::ACTION_SOLVER_START)->setEnabled(!solverActive);
         this->getAction(Action::ACTION_REPORT_MODEL_STATISTICS)->setEnabled(true);
         this->getAction(Action::ACTION_REPORT_SOLVER_LOG)->setEnabled(true);
         this->getAction(Action::ACTION_REPORT_CONVERGENCE_GRAPH)->setEnabled(true);

src/fea/src/central_tab_widget.cpp

@@ -197,7 +197,7 @@ void CentralTabWidget::onInfoPrinted(const RMessage &message)
 
 void CentralTabWidget::onNoticePrinted(const RMessage &message)
 {
-    RMessageBox::information(this,tr("Notice"),QString(RMessage::messageToLogString(message)).replace("NOTICE: ",""));
+    RMessageBox::information(this,tr("Notice"),QString(message).replace("NOTICE: ","").trimmed());
 }
 
 void CentralTabWidget::onWarningPrinted(const RMessage &message)

src/fea/src/main_window.cpp

@@ -136,6 +136,9 @@ MainWindow::MainWindow(Session *session,
 
     // Solver manager signals.
     QObject::connect(&SolverManager::getInstance(),&SolverManager::jobBlocking,this,&MainWindow::onJobBlocking);
+    QObject::connect(&SolverManager::getInstance(),&SolverManager::jobStarted,this,&MainWindow::onSolverJobStateChanged);
+    QObject::connect(&SolverManager::getInstance(),&SolverManager::jobFinished,this,&MainWindow::onSolverJobStateChanged);
+    QObject::connect(&SolverManager::getInstance(),&SolverManager::jobFailed,this,&MainWindow::onSolverJobStateChanged);
 
     // Draw engine signals.
     QObject::connect(this->session->getDrawEngine(),&DrawEngine::objectAdded,this,&MainWindow::onDrawObjectAdded);
@@ -904,7 +907,11 @@ void MainWindow::setEnabled(bool enabled)
     this->ecTab->setEnabled(enabled);
     this->materialTab->setEnabled(enabled);
     this->resultsTab->setEnabled(enabled);
-    this->actionList->setEnabled(enabled);;
+    this->actionList->setEnabled(enabled);
+    if (enabled)
+    {
+        this->actionList->processAvailability();
+    }
 }
 
 void MainWindow::enable()
@@ -975,6 +982,12 @@ void MainWindow::onJobEnded()
     R_LOG_TRACE;
 }
 
+void MainWindow::onSolverJobStateChanged()
+{
+    R_LOG_TRACE;
+    this->actionList->processAvailability();
+}
+
 void MainWindow::onModelAdded(uint position)
 {
     R_LOG_TRACE;

src/fea/src/main_window.h

@@ -210,6 +210,9 @@ class MainWindow : public QMainWindow
         //! Job has ended.
         void onJobEnded();
 
+        //! Solver job has started, finished or failed.
+        void onSolverJobStateChanged();
+
         //! New model has been added.
         void onModelAdded(uint position);
 

src/fea/src/report_generator.cpp

@@ -41,6 +41,7 @@ void ReportGenerator::generateTitle()
     cursor.insertText(problemTypeList,ReportGenerator::getH3Format());
     cursor.insertBlock(blockFormat);
     cursor.insertBlock(blockFormat);
+    cursor.insertText(tr("Author") + ": ",ReportGenerator::getTextFormat());
     cursor.insertText(Application::instance()->getApplicationSettings()->getUserFullName(),ReportGenerator::getH4Format());
     cursor.insertBlock(blockFormat);
     cursor.insertText(Application::instance()->getApplicationSettings()->getUserEmail(),ReportGenerator::getTextFormat());

src/fea/src/solver_manager.cpp

@@ -58,6 +58,20 @@ bool SolverManager::isSolverQueued(uint modelID) const
     return false;
 }
 
+bool SolverManager::isSolverRunning(uint modelID) const
+{
+    QMutexLocker<QRecursiveMutex> locker(&this->jobsMutex);
+    for (int i=0;i<this->runningJobs.size();i++)
+    {
+        SolverTask *solverTask = static_cast<SolverTask*>(this->runningJobs[i]);
+        if (!solverTask->isFinished() && solverTask->getModelID() == modelID)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
 void SolverManager::stopRunningTasks()
 {
     if (!this->runningJobs.isEmpty())

src/fea/src/solver_manager.h

@@ -44,6 +44,9 @@ class SolverManager : public RJobManager
         //! Check if solver for given model ID is queued.
         bool isSolverQueued(uint modelID) const;
 
+        //! Check if solver for given model ID is running.
+        bool isSolverRunning(uint modelID) const;
+
         //! Stop current solvers.
         void stopRunningTasks();