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

Refactor: rename RimWellLogFile to RimWellLogLasFile

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-10-02 12:39:44 +02:00
parent d177491843
commit 8df4dd42eb
63 changed files with 353 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp
View File

@@ -24,9 +24,9 @@
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimWellLogFile.h"
#include "RimWellLogFileChannel.h"
#include "RimWellLogFileCurve.h"
#include "RimWellLogLasFile.h"
#include "RimWellLogLasFileCurve.h"
#include "RimWellLogPlot.h"
#include "RimWellLogPlotCollection.h"
#include "RimWellLogTrack.h"
@@ -74,11 +74,11 @@ void RicAddWellLogToPlotFeature::onActionTriggered( bool isChecked )
RimWellLogFileChannel* wellLog = selection[wlIdx];
auto wellPath = wellLog->firstAncestorOrThisOfType<RimWellPath>();
auto wellLogFile = wellLog->firstAncestorOrThisOfType<RimWellLogFile>();
auto wellLogFile = wellLog->firstAncestorOrThisOfType<RimWellLogLasFile>();
if ( wellLogFile )
{
RimWellLogFileCurve* curve = new RimWellLogFileCurve;
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() );
RimWellLogLasFileCurve* curve = new RimWellLogLasFileCurve;
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() );
curve->setColor( curveColor );
plotTrack->addCurve( curve );

4
ApplicationLibCode/Commands/WellLogCommands/RicChangeDataSourceFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "RimWellLogCurve.h"
#include "RimWellLogCurveCommonDataSource.h"
#include "RimWellLogExtractionCurve.h"
#include "RimWellLogFileCurve.h"
#include "RimWellLogLasFileCurve.h"
#include "RimWellLogPlot.h"
#include "RimWellLogTrack.h"
#include "RimWellPath.h"
@@ -101,7 +101,7 @@ bool RicChangeDataSourceFeature::selectedTracksAndCurves( std::vector<RimWellLog
{
RimWellLogTrack* wellLogTrack = dynamic_cast<RimWellLogTrack*>( selectedObject );
RimWellLogExtractionCurve* wellLogExtractionCurve = dynamic_cast<RimWellLogExtractionCurve*>( selectedObject );
RimWellLogFileCurve* wellLogFileCurve = dynamic_cast<RimWellLogFileCurve*>( selectedObject );
RimWellLogLasFileCurve* wellLogFileCurve = dynamic_cast<RimWellLogLasFileCurve*>( selectedObject );
if ( wellLogTrack )
{
tracks->push_back( wellLogTrack );

10
ApplicationLibCode/Commands/WellLogCommands/RicMoveWellLogFilesFeature.cpp
View File

@@ -20,7 +20,7 @@
#include "RicMoveWellLogFilesFeature.h"
#include "RimProject.h"
#include "RimWellLogFile.h"
#include "RimWellLogLasFile.h"
#include "RimWellPath.h"
#include "RiuMainWindow.h"
@@ -36,7 +36,7 @@ CAF_CMD_SOURCE_INIT( RicMoveWellLogFilesFeature, "RicMoveWellLogFilesFeature" );
//--------------------------------------------------------------------------------------------------
bool RicMoveWellLogFilesFeature::isCommandEnabled() const
{
RimWellLogFile* selectedWellLogFile = caf::firstAncestorOfTypeFromSelectedObject<RimWellLogFile>();
RimWellLogLasFile* selectedWellLogFile = caf::firstAncestorOfTypeFromSelectedObject<RimWellLogLasFile>();
if ( !selectedWellLogFile ) return false;
@@ -55,9 +55,9 @@ void RicMoveWellLogFilesFeature::onActionTriggered( bool isChecked )
{
RimProject* proj = RimProject::current();
RimWellPath* destWellPath = proj->wellPathByName( userData.toString() );
RimWellLogFile* wellLogFile = caf::firstAncestorOfTypeFromSelectedObject<RimWellLogFile>();
RimWellPath* sourceWellPath = caf::firstAncestorOfTypeFromSelectedObject<RimWellPath>();
RimWellPath* destWellPath = proj->wellPathByName( userData.toString() );
RimWellLogLasFile* wellLogFile = caf::firstAncestorOfTypeFromSelectedObject<RimWellLogLasFile>();
RimWellPath* sourceWellPath = caf::firstAncestorOfTypeFromSelectedObject<RimWellPath>();
if ( !destWellPath || !wellLogFile || !sourceWellPath ) return;

4
ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp
View File

@@ -36,9 +36,9 @@
#include "RimTools.h"
#include "RimWellBoreStabilityPlot.h"
#include "RimWellLogExtractionCurve.h"
#include "RimWellLogFile.h"
#include "RimWellLogFileChannel.h"
#include "RimWellLogFileCurve.h"
#include "RimWellLogLasFile.h"
#include "RimWellLogLasFileCurve.h"
#include "RimWellLogPlotCollection.h"
#include "RimWellLogTrack.h"
#include "RimWellLogWbsCurve.h"

8
ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp
View File

@@ -24,9 +24,9 @@
#include "RicWellLogTools.h"
#include "RimTools.h"
#include "RimWellLogFile.h"
#include "RimWellLogFileChannel.h"
#include "RimWellLogFileCurve.h"
#include "RimWellLogLasFile.h"
#include "RimWellLogLasFileCurve.h"
#include "RimWellLogTrack.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
@@ -66,8 +66,8 @@ void RicNewWellLogFileCurveFeature::onActionTriggered( bool isChecked )
RimWellPath* wellPath = RicWellLogTools::selectedWellPathWithLogFile();
if ( wellPath )
{
RimWellLogTrack* newWellLogPlotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack();
RimWellLogFileCurve* plotCurve = RicWellLogTools::addFileCurve( newWellLogPlotTrack );
RimWellLogTrack* newWellLogPlotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack();
RimWellLogLasFileCurve* plotCurve = RicWellLogTools::addFileCurve( newWellLogPlotTrack );
plotCurve->setWellPath( wellPath );
if ( wellPath->wellLogFiles().size() == 1 )

2
ApplicationLibCode/Commands/WellLogCommands/RicPasteWellLogCurveFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "RimWellBoreStabilityPlot.h"
#include "RimWellLogCurve.h"
#include "RimWellLogExtractionCurve.h"
#include "RimWellLogFileCurve.h"
#include "RimWellLogLasFileCurve.h"
#include "RimWellLogRftCurve.h"
#include "RimWellLogTrack.h"
#include "RimWellMeasurementCurve.h"

8
ApplicationLibCode/Commands/WellLogCommands/RicWellLogFileCloseFeature.cpp
View File

@@ -21,7 +21,7 @@
#include "RimViewWindow.h"
#include "RimWellAllocationPlot.h"
#include "RimWellLogFile.h"
#include "RimWellLogLasFile.h"
#include "RimWellLogPlot.h"
#include "RimWellPath.h"
#include "RimWellPltPlot.h"
@@ -40,7 +40,7 @@ CAF_CMD_SOURCE_INIT( RicWellLogFileCloseFeature, "RicWellLogFileCloseFeature" );
//--------------------------------------------------------------------------------------------------
bool RicWellLogFileCloseFeature::isCommandEnabled() const
{
std::vector<RimWellLogFile*> objects = caf::selectedObjectsByType<RimWellLogFile*>();
std::vector<RimWellLogLasFile*> objects = caf::selectedObjectsByType<RimWellLogLasFile*>();
return !objects.empty();
}
@@ -49,7 +49,7 @@ bool RicWellLogFileCloseFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicWellLogFileCloseFeature::onActionTriggered( bool isChecked )
{
std::vector<RimWellLogFile*> objects = caf::selectedObjectsByType<RimWellLogFile*>();
std::vector<RimWellLogLasFile*> objects = caf::selectedObjectsByType<RimWellLogLasFile*>();
if ( objects.empty() ) return;
@@ -85,7 +85,7 @@ void RicWellLogFileCloseFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RimViewWindow*> RicWellLogFileCloseFeature::referringWellLogPlots( const RimWellLogFile* wellLogFile )
std::set<RimViewWindow*> RicWellLogFileCloseFeature::referringWellLogPlots( const RimWellLogLasFile* wellLogFile )
{
// Remove all curves displaying data from the specified wellLogFile
std::vector<caf::PdmObjectHandle*> referringObjects = wellLogFile->objectsWithReferringPtrFields();

4
ApplicationLibCode/Commands/WellLogCommands/RicWellLogFileCloseFeature.h
View File

@@ -22,7 +22,7 @@
#include "cafCmdFeature.h"
#include <set>
class RimWellLogFile;
class RimWellLogLasFile;
class RimViewWindow;
//==================================================================================================
@@ -37,5 +37,5 @@ protected:
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
std::set<RimViewWindow*> referringWellLogPlots( const RimWellLogFile* wellLogFile );
std::set<RimViewWindow*> referringWellLogPlots( const RimWellLogLasFile* wellLogFile );
};

5
ApplicationLibCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.cpp
View File

@@ -37,14 +37,15 @@ CAF_CMD_SOURCE_INIT( RicWellLogsImportFileFeature, "RicWellLogsImportFileFeature
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimWellLogFile*> RicWellLogsImportFileFeature::importWellLogFiles( const QStringList& wellLogFilePaths, QStringList* errorMessages )
std::vector<RimWellLogLasFile*> RicWellLogsImportFileFeature::importWellLogFiles( const QStringList& wellLogFilePaths,
QStringList* errorMessages )
{
RiaApplication* app = RiaApplication::instance();
// Remember the path to next time
app->setLastUsedDialogDirectory( "WELL_LOGS_DIR", QFileInfo( wellLogFilePaths.last() ).absolutePath() );
std::vector<RimWellLogFile*> wellLogFiles = app->addWellLogsToModel( wellLogFilePaths, errorMessages );
std::vector<RimWellLogLasFile*> wellLogFiles = app->addWellLogsToModel( wellLogFilePaths, errorMessages );
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();

6
ApplicationLibCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.h
View File

@@ -23,7 +23,7 @@
#include <vector>
class RimWellLogFile;
class RimWellLogLasFile;
//==================================================================================================
///
@@ -31,8 +31,8 @@ class RimWellLogFile;
class RicWellLogsImportFileFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
static std::vector<RimWellLogFile*> importWellLogFiles( const QStringList& wellLogFilePaths, QStringList* errorMessages );
static QStringList wellLogFileNameFilters();
static std::vector<RimWellLogLasFile*> importWellLogFiles( const QStringList& wellLogFilePaths, QStringList* errorMessages );
static QStringList wellLogFileNameFilters();
protected:
void onActionTriggered( bool isChecked ) override;