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

Moved static method to the class where it belongs (more than it did).

Browse Source
This commit is contained in:
Pål Hagen 2015-09-25 18:14:25 +02:00
parent 803cc4328d
commit aa36a3f5e6
5 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@ -24,8 +24,11 @@
#include "RigWellLogFile.h"
#include "RiuMainWindow.h"
#include <QStringList>
#include <QFileInfo>
#include <QMessageBox>
CAF_PDM_SOURCE_INIT(RimWellLogFile, "WellLogFile");
@ -64,6 +67,42 @@ RimWellLogFile::~RimWellLogFile()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogFile* RimWellLogFile::readWellLogFile(const QString& logFilePath)
{
QFileInfo fi(logFilePath);
RimWellLogFile* wellLogFile = NULL;
if (fi.suffix().toUpper().compare("LAS") == 0)
{
QString errorMessage;
wellLogFile = new RimWellLogFile();
wellLogFile->setFileName(logFilePath);
if (!wellLogFile->readFile(&errorMessage))
{
QString displayMessage = "Could not open the LAS file: \n" + logFilePath;
if (!errorMessage.isEmpty())
{
displayMessage += "\n\n";
displayMessage += errorMessage;
}
QMessageBox::warning(RiuMainWindow::instance(),
"File open error",
displayMessage);
delete wellLogFile;
wellLogFile = NULL;
}
}
return wellLogFile;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/RimWellLogFile.h
View File

@ -43,6 +43,9 @@ public:
RimWellLogFile();
virtual ~RimWellLogFile();
static RimWellLogFile* readWellLogFile(const QString& logFilePath);
void setFileName(const QString& fileName);
QString fileName() const { return m_fileName; }

36
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -175,42 +175,6 @@ void RimWellPath::readWellPathFile()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogFile* RimWellPath::readWellLogFile(const QString& logFilePath)
{
QFileInfo fi(logFilePath);
RimWellLogFile* wellLogFile = NULL;
if (fi.suffix().toUpper().compare("LAS") == 0)
{
QString errorMessage;
wellLogFile = new RimWellLogFile();
wellLogFile->setFileName(logFilePath);
if (!wellLogFile->readFile(&errorMessage))
{
QString displayMessage = "Could not open the LAS file: \n" + logFilePath;
if (!errorMessage.isEmpty())
{
displayMessage += "\n\n";
displayMessage += errorMessage;
}
QMessageBox::warning(RiuMainWindow::instance(),
"File open error",
displayMessage);
delete wellLogFile;
wellLogFile = NULL;
}
}
return wellLogFile;
}
//--------------------------------------------------------------------------------------------------
/// Read JSON file containing well path data
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@ -74,7 +74,6 @@ public:
RivWellPathPartMgr* partMgr();
void readWellPathFile();
static RimWellLogFile* readWellLogFile(const QString& logFilePath);
void updateFilePathsFromProjectPath();

2
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@ -262,7 +262,7 @@ void RimWellPathCollection::addWellLogs(const QStringList& filePaths)
{
foreach (QString filePath, filePaths)
{
RimWellLogFile* logFileInfo = RimWellPath::readWellLogFile(filePath);
RimWellLogFile* logFileInfo = RimWellLogFile::readWellLogFile(filePath);
if (logFileInfo)
{
RimWellPath* wellPath = wellPathByName(logFileInfo->wellName());