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

#4817 #4830 #4832 #4837 #4839 Python commands for WBS creation, well path import and well log file import (#4838)

Browse Source 
* Better minimum width for well log tracks

* Fix alignment of scrollbar in Well log plots

* Better Well Log Plot export

* Hide scroll bar before plotting
* Better borders

* Create plots through Python

* #4817 Create WBS plots with Python

* Rebase Summary and WellLogPlot on top of a new RimPlot

* Also Python: Allow setting folder as a parameter to export_snapshots

* #4832 Prepare for well path import command

* Well Path import WIP

* #4830 #4832 Import well paths and well log files from file using Python.

* #4837 Implement import of formation names in Python

* Fix debug build issue

* Fix RiaLogging build issue

* Fix warnings

* Yet another RiaLogging.h import added

* #4839 Import exporting of las and ascii files from well log plots
This commit is contained in:
Gaute Lindkvist
2019-10-09 09:21:28 +02:00
committed by GitHub
parent b24b0932a3
commit 11117383db
106 changed files with 2128 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@@ -40,6 +40,7 @@
#include <QFileInfo>
#include <QMessageBox>
#include <QString>
#include <QStringList>
CAF_PDM_SOURCE_INIT( RimWellLogFile, "WellLogFile" );
@@ -110,33 +111,20 @@ RimWellLogFile::~RimWellLogFile()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogFile* RimWellLogFile::readWellLogFile( const QString& logFilePath )
RimWellLogFile* RimWellLogFile::readWellLogFile( const QString& logFilePath, QString* errorMessage )
{
CAF_ASSERT( errorMessage );
QFileInfo fi( logFilePath );
RimWellLogFile* wellLogFile = nullptr;
if ( fi.suffix().toUpper().compare( "LAS" ) == 0 )
{
QString errorMessage;
wellLogFile = new RimWellLogFile();
wellLogFile->setFileName( logFilePath );
if ( !wellLogFile->readFile( &errorMessage ) )
if ( !wellLogFile->readFile( errorMessage ) )
{
QString displayMessage = "Could not open the LAS file: \n" + logFilePath;
if ( !errorMessage.isEmpty() )
{
displayMessage += "\n\n";
displayMessage += errorMessage;
}
if ( RiaGuiApplication::isRunning() )
{
QMessageBox::warning( Riu3DMainWindowTools::mainWindowWidget(), "File open error", displayMessage );
}
RiaLogging::warning( errorMessage );
delete wellLogFile;
wellLogFile = nullptr;
}
@@ -181,15 +169,10 @@ bool RimWellLogFile::readFile( QString* errorMessage )
}
else if ( !isDateValid( m_date() ) )
{
QMessageBox msgBox;
QString message =
*errorMessage =
QString(
"The LAS-file '%1' contains no recognizable date. Please assign a date in the LAS-file property panel" )
.arg( m_name() );
msgBox.setText( message );
msgBox.setStandardButtons( QMessageBox::Ok );
msgBox.exec();
m_date = DEFAULT_DATE_TIME;
}