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

(#537) (#515) Showing error messages from LAS file open exceptions

Browse Source
This commit is contained in:
Pål Hagen 2015-09-24 10:08:45 +02:00
parent f15c9973c9
commit 529b68e073
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@ -75,7 +75,7 @@ void RimWellLogFile::setFileName(const QString& fileName)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimWellLogFile::readFile() bool RimWellLogFile::readFile(QString* errorMessage)
{ {
if (!m_wellLogDataFile.p()) if (!m_wellLogDataFile.p())
{ {
@ -84,7 +84,7 @@ bool RimWellLogFile::readFile()
m_name = QFileInfo(m_fileName).fileName(); m_name = QFileInfo(m_fileName).fileName();
if (!m_wellLogDataFile->open(m_fileName)) if (!m_wellLogDataFile->open(m_fileName, errorMessage))
{ {
m_wellLogDataFile = NULL; m_wellLogDataFile = NULL;
return false; return false;

2
ApplicationCode/ProjectDataModel/RimWellLogFile.h
View File

@ -46,7 +46,7 @@ public:
void setFileName(const QString& fileName); void setFileName(const QString& fileName);
QString fileName() const { return m_fileName; } QString fileName() const { return m_fileName; }
bool readFile(); bool readFile(QString* errorMessage);
QString wellName() const; QString wellName() const;
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; } virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }

13
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -186,15 +186,22 @@ RimWellLogFile* RimWellPath::readWellLogFile(const QString& logFilePath)
if (fi.suffix().compare("las") == 0) if (fi.suffix().compare("las") == 0)
{ {
QString errorMessage;
wellLogFile = new RimWellLogFile(); wellLogFile = new RimWellLogFile();
wellLogFile->setFileName(logFilePath); wellLogFile->setFileName(logFilePath);
if (!wellLogFile->readFile()) if (!wellLogFile->readFile(&errorMessage))
{ {
QString errorMessage = "Could not open the LAS file: \n" + logFilePath; QString displayMessage = "Could not open the LAS file: \n" + logFilePath;
if (!errorMessage.isEmpty())
{
displayMessage += "\n\n";
displayMessage += errorMessage;
}
QMessageBox::warning(RiuMainWindow::instance(), QMessageBox::warning(RiuMainWindow::instance(),
"File open error", "File open error",
errorMessage); displayMessage);
delete wellLogFile; delete wellLogFile;
wellLogFile = NULL; wellLogFile = NULL;

13
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@ -138,13 +138,20 @@ void RimWellPathCollection::readWellPathFiles()
RimWellLogFile* wellLogFile = wellPaths[wpIdx]->m_wellLogFile; RimWellLogFile* wellLogFile = wellPaths[wpIdx]->m_wellLogFile;
if (wellLogFile) if (wellLogFile)
{ {
if (!wellLogFile->readFile()) QString errorMessage;
if (!wellLogFile->readFile(&errorMessage))
{ {
QString errorMessage = "Could not open the well log file: \n" + wellLogFile->fileName(); QString displayMessage = "Could not open the well log file: \n" + wellLogFile->fileName();
if (!errorMessage.isEmpty())
{
displayMessage += "\n\n";
displayMessage += errorMessage;
}
QMessageBox::warning(RiuMainWindow::instance(), QMessageBox::warning(RiuMainWindow::instance(),
"File open error", "File open error",
errorMessage); displayMessage);
} }
} }