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

#4509 Guard access to gui application code in import and well path code to avoid crashes in console mode

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-07-25 15:54:20 +02:00
parent d6d1ebd25d
commit 000ce6db52
8 changed files with 113 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -142,9 +142,13 @@ void RimGeoMechView::onLoadDataAndUpdate()
{
QString displayMessage = errorMessage.empty() ? "Could not open the Odb file: \n" + m_geomechCase->caseFileName() : QString::fromStdString(errorMessage);
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
if (RiaGuiApplication::isRunning())
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
}
RiaLogging::error(displayMessage);
}
m_geomechCase = nullptr;

17
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@@ -20,6 +20,9 @@
#include "RimIdenticalGridCaseGroup.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RigActiveCellInfo.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
@@ -173,11 +176,15 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
RimEclipseCase* mainCase = caseCollection()->reservoirs[0];
if (!mainCase->openReserviorCase())
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"Error when opening project file",
"Could not open the Eclipse Grid file: \n"+ mainCase->gridFileName() + "\n"+
"Current working directory is: \n" +
QDir::currentPath());
QString errorMessage = QString("Could not open the Eclipse Grid file: \n") + mainCase->gridFileName() + "\n" +
"Current working directory is: \n" + QDir::currentPath();
if (RiaGuiApplication::isRunning())
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"Error when opening project file", errorMessage);
}
RiaLogging::error(errorMessage);
return;
}

13
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@@ -19,6 +19,9 @@
#include "RimWellLogFile.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaDateStringParser.h"
#include "RiaFieldHandleTools.h"
#include "RiaQDateTimeTools.h"
@@ -123,9 +126,13 @@ RimWellLogFile* RimWellLogFile::readWellLogFile(const QString& logFilePath)
displayMessage += errorMessage;
}
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
if (RiaGuiApplication::isRunning())
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
}
RiaLogging::warning(errorMessage);
delete wellLogFile;
wellLogFile = nullptr;

46
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaWellNameComparer.h"
@@ -144,9 +145,13 @@ void RimWellPathCollection::loadDataAndUpdate()
QString errorMessage;
if ( !fWPath->readWellPathFile(&errorMessage, m_wellPathImporter) )
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
if (RiaGuiApplication::isRunning())
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
}
RiaLogging::warning(errorMessage);
}
}
@@ -165,9 +170,13 @@ void RimWellPathCollection::loadDataAndUpdate()
displayMessage += errorMessage;
}
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
RiaLogging::warning(errorMessage);
if (RiaGuiApplication::isRunning())
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
displayMessage);
}
}
}
}
@@ -373,7 +382,10 @@ void RimWellPathCollection::addWellPathFormations(const QStringList& filePaths)
if (fileReadSuccess)
{
QMessageBox::information(Riu3DMainWindowTools::mainWindowWidget(), "Well Picks Import", outputMessage);
if (RiaGuiApplication::isRunning())
{
QMessageBox::information(Riu3DMainWindowTools::mainWindowWidget(), "Well Picks Import", outputMessage);
}
RiaLogging::info(outputMessage);
}
@@ -511,9 +523,13 @@ void RimWellPathCollection::readWellPathFormationFiles()
QString errorMessage;
if (!wellPaths[wpIdx]->readWellPathFormationsFile(&errorMessage, m_wellPathFormationsImporter))
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
if (RiaGuiApplication::isRunning())
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
}
RiaLogging::warning(errorMessage);
}
progress.setProgressDescription(QString("Reading formation file %1").arg(wpIdx));
@@ -533,9 +549,13 @@ void RimWellPathCollection::reloadAllWellPathFormations()
QString errorMessage;
if (!wellPaths[wpIdx]->reloadWellPathFormationsFile(&errorMessage, m_wellPathFormationsImporter))
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
if (RiaGuiApplication::isRunning())
{
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"File open error",
errorMessage);
}
RiaLogging::warning(errorMessage);
}
progress.setProgressDescription(QString("Reloading formation file %1").arg(wpIdx));