OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1710 #1665 Wait for octave process to finish when executing through command file interface

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-07-31 11:10:22 +02:00
parent 94703d72c2
commit 48401d5a85
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/Application/RiaApplication.cpp
View File

@ -217,6 +217,8 @@ RiaApplication::RiaApplication(int& argc, char** argv)
m_runningRegressionTests = false; m_runningRegressionTests = false;
m_runningWorkerProcess = false;
m_mainPlotWindow = NULL; m_mainPlotWindow = NULL;
m_recentFileActionProvider = std::unique_ptr<RiuRecentFileActionProvider>(new RiuRecentFileActionProvider); m_recentFileActionProvider = std::unique_ptr<RiuRecentFileActionProvider>(new RiuRecentFileActionProvider);
@ -1943,6 +1945,7 @@ void RiaApplication::slotWorkerProcessFinished(int exitCode, QProcess::ExitStatu
if (exitStatus == QProcess::CrashExit) if (exitStatus == QProcess::CrashExit)
{ {
// MFLog::error("Simulation execution crashed or was aborted."); // MFLog::error("Simulation execution crashed or was aborted.");
m_runningWorkerProcess = false;
return; return;
} }
@ -1954,6 +1957,7 @@ void RiaApplication::slotWorkerProcessFinished(int exitCode, QProcess::ExitStatu
if (exitCode != 0) if (exitCode != 0)
{ {
// MFLog::error(QString("Simulation execution failed (exit code %1).").arg(exitCode)); // MFLog::error(QString("Simulation execution failed (exit code %1).").arg(exitCode));
m_runningWorkerProcess = false;
return; return;
} }
@ -1966,6 +1970,7 @@ void RiaApplication::slotWorkerProcessFinished(int exitCode, QProcess::ExitStatu
{ {
// Disable concept of current case // Disable concept of current case
m_socketServer->setCurrentCaseId(-1); m_socketServer->setCurrentCaseId(-1);
m_runningWorkerProcess = false;
} }
} }
@ -1990,6 +1995,7 @@ bool RiaApplication::launchProcess(const QString& program, const QStringList& ar
m_socketServer->setCurrentCaseId(-1); m_socketServer->setCurrentCaseId(-1);
} }
m_runningWorkerProcess = true;
m_workerProcess = new caf::UiProcess(this); m_workerProcess = new caf::UiProcess(this);
QProcessEnvironment penv = QProcessEnvironment::systemEnvironment(); QProcessEnvironment penv = QProcessEnvironment::systemEnvironment();
@ -2026,6 +2032,7 @@ bool RiaApplication::launchProcess(const QString& program, const QStringList& ar
{ {
m_workerProcess->close(); m_workerProcess->close();
m_workerProcess = NULL; m_workerProcess = NULL;
m_runningWorkerProcess = false;
RiuMainWindow::instance()->processMonitor()->stopMonitorWorkProcess(); RiuMainWindow::instance()->processMonitor()->stopMonitorWorkProcess();
@ -2145,9 +2152,21 @@ void RiaApplication::terminateProcess()
m_workerProcess->close(); m_workerProcess->close();
} }
m_runningWorkerProcess = false;
m_workerProcess = NULL; m_workerProcess = NULL;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaApplication::waitForProcess() const
{
while (m_runningWorkerProcess)
{
Sleep(100);
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/Application/RiaApplication.h
View File

@ -165,6 +165,7 @@ public:
bool launchProcess(const QString& program, const QStringList& arguments); bool launchProcess(const QString& program, const QStringList& arguments);
bool launchProcessForMultipleCases(const QString& program, const QStringList& arguments, const std::vector<int>& caseIds); bool launchProcessForMultipleCases(const QString& program, const QStringList& arguments, const std::vector<int>& caseIds);
void terminateProcess(); void terminateProcess();
void waitForProcess() const;
RiaPreferences* preferences(); RiaPreferences* preferences();
void applyPreferences(); void applyPreferences();
@ -267,6 +268,8 @@ private:
QString m_helpText; QString m_helpText;
bool m_runningRegressionTests; bool m_runningRegressionTests;
bool m_runningWorkerProcess;
RiuMainPlotWindow* m_mainPlotWindow; RiuMainPlotWindow* m_mainPlotWindow;
std::unique_ptr<RiuRecentFileActionProvider> m_recentFileActionProvider; std::unique_ptr<RiuRecentFileActionProvider> m_recentFileActionProvider;

4
ApplicationCode/CommandFileInterface/RicfRunOctaveScript.cpp
View File

@ -60,4 +60,8 @@ void RicfRunOctaveScript::execute()
{ {
RiaLogging::error(QString("runOctaveScript: Could not execute script %1").arg(m_path())); RiaLogging::error(QString("runOctaveScript: Could not execute script %1").arg(m_path()));
} }
else
{
RiaApplication::instance()->waitForProcess();
}
} }