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

#10367 Janitor: Remove unneccessary 'this' pointers

Browse Source
This commit is contained in:
Kristian Bendiksen 2023-08-04 09:04:14 +02:00
parent 2614cf3d62
commit 5bf2c2a89d
292 changed files with 1625 additions and 1664 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/Application/RiaApplication.cpp
View File

@ -421,7 +421,7 @@ QString RiaApplication::createAbsolutePathFromProjectRelativePath( QString proje
}
else
{
absolutePath = this->lastUsedDialogDirectory( "BINARY_GRID" );
absolutePath = lastUsedDialogDirectory( "BINARY_GRID" );
}
QDir projectDir( absolutePath );
@ -645,7 +645,7 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
}
}
this->setActiveReservoirView( riv );
setActiveReservoirView( riv );
RimGridView* rigv = dynamic_cast<RimGridView*>( riv );
if ( rigv ) rigv->cellFilterCollection()->updateIconState();
@ -1216,10 +1216,10 @@ void RiaApplication::applyPreferences()
m_defaultAnnotationFont = RiaFontCache::getFont( fontSizes[RiaDefines::FontSettingType::ANNOTATION_FONT] );
m_defaultWellLabelFont = RiaFontCache::getFont( fontSizes[RiaDefines::FontSettingType::WELL_LABEL_FONT] );
if ( this->project() )
if ( project() )
{
this->project()->setScriptDirectories( m_preferences->scriptDirectories(), m_preferences->maxScriptFoldersDepth() );
this->project()->setPlotTemplateFolders( m_preferences->plotTemplateFolders() );
project()->setScriptDirectories( m_preferences->scriptDirectories(), m_preferences->maxScriptFoldersDepth() );
project()->setPlotTemplateFolders( m_preferences->plotTemplateFolders() );
project()->scriptCollection()->updateConnectedEditors();
project()->rootPlotTemplateItem()->updateConnectedEditors();

5
ApplicationLibCode/Application/RiaConsoleApplication.cpp
View File

@ -123,8 +123,7 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( gsl::n
if ( progOpt->option( "help" ) || progOpt->option( "?" ) )
{
this->showFormattedTextInMessageBoxOrConsole( "\nThe current command line options in ResInsight are:\n" +
this->commandLineParameterHelp() );
showFormattedTextInMessageBoxOrConsole( "\nThe current command line options in ResInsight are:\n" + commandLineParameterHelp() );
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}
@ -132,7 +131,7 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( gsl::n
{
QString text = QString( STRPRODUCTVER ) + "\n";
this->showFormattedTextInMessageBoxOrConsole( text );
showFormattedTextInMessageBoxOrConsole( text );
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}

5
ApplicationLibCode/Application/RiaGuiApplication.cpp
View File

@ -454,8 +454,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_n
if ( progOpt->option( "help" ) || progOpt->option( "?" ) )
{
this->showFormattedTextInMessageBoxOrConsole( "The current command line options in ResInsight are:\n" +
this->commandLineParameterHelp() );
showFormattedTextInMessageBoxOrConsole( "The current command line options in ResInsight are:\n" + commandLineParameterHelp() );
return RiaApplication::ApplicationStatus::EXIT_COMPLETED;
}
@ -1374,7 +1373,7 @@ void RiaGuiApplication::applyGuiPreferences( const RiaPreferences*
fontObject->updateFonts();
}
if ( this->project() )
if ( project() )
{
std::vector<RimViewWindow*> allViewWindows = project()->descendantsIncludingThisOfType<RimViewWindow>();

2
ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp
View File

@ -233,7 +233,7 @@ void RiaSCurveCalculator::initializeByFinding_q1q2( cvf::Vec3d p1, double azi1,
if ( ev_0.curveStatus() == RiaSCurveCalculator::OK_INFINITE_RADIUS12 )
{
*this = ev_0;
this->m_solveStatus = CONVERGED;
m_solveStatus = CONVERGED;
return;
} // Todo: Handle infinite radius in one place

2
ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp
View File

@ -50,7 +50,7 @@ CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotDataResult, "exportWellLogPlotDataResu
RicfExportWellLogPlotDataResult::RicfExportWellLogPlotDataResult()
{
CAF_PDM_InitObject( "export_well_data_result" );
CAF_PDM_InitFieldNoDefault( &this->exportedFiles, "exportedFiles", "" );
CAF_PDM_InitFieldNoDefault( &exportedFiles, "exportedFiles", "" );
}
CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotData, "exportWellLogPlotData" );

10
ApplicationLibCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.cpp
View File

@ -55,7 +55,7 @@ RicTextAnnotation3dEditor::~RicTextAnnotation3dEditor()
ownerRiuViewer->removeStaticModel( m_cvfModel.p() );
}
auto textAnnot = dynamic_cast<RimTextAnnotation*>( this->pdmObject() );
auto textAnnot = dynamic_cast<RimTextAnnotation*>( pdmObject() );
if ( textAnnot )
{
textAnnot->m_anchorPointXyd.uiCapability()->removeFieldEditor( this );
@ -70,7 +70,7 @@ RicTextAnnotation3dEditor::~RicTextAnnotation3dEditor()
//--------------------------------------------------------------------------------------------------
void RicTextAnnotation3dEditor::configureAndUpdateUi( const QString& uiConfigName )
{
RimTextAnnotation* textAnnot = dynamic_cast<RimTextAnnotation*>( this->pdmObject() );
RimTextAnnotation* textAnnot = dynamic_cast<RimTextAnnotation*>( pdmObject() );
RiuViewer* ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
Rim3dView* view = mainOrComparisonView();
@ -126,7 +126,7 @@ void RicTextAnnotation3dEditor::configureAndUpdateUi( const QString& uiConfigNam
//--------------------------------------------------------------------------------------------------
void RicTextAnnotation3dEditor::cleanupBeforeSettingPdmObject()
{
RimTextAnnotation* textAnnot = dynamic_cast<RimTextAnnotation*>( this->pdmObject() );
RimTextAnnotation* textAnnot = dynamic_cast<RimTextAnnotation*>( pdmObject() );
if ( textAnnot )
{
textAnnot->m_anchorPointXyd.uiCapability()->removeFieldEditor( this );
@ -139,7 +139,7 @@ void RicTextAnnotation3dEditor::cleanupBeforeSettingPdmObject()
//--------------------------------------------------------------------------------------------------
void RicTextAnnotation3dEditor::slotLabelUpdated( const cvf::Vec3d& origin, const cvf::Vec3d& tangent )
{
RimTextAnnotation* textAnnot = dynamic_cast<RimTextAnnotation*>( this->pdmObject() );
RimTextAnnotation* textAnnot = dynamic_cast<RimTextAnnotation*>( pdmObject() );
if ( !textAnnot )
{
@ -154,7 +154,7 @@ void RicTextAnnotation3dEditor::slotLabelUpdated( const cvf::Vec3d& origin, cons
//--------------------------------------------------------------------------------------------------
void RicTextAnnotation3dEditor::slotAnchorUpdated( const cvf::Vec3d& origin, const cvf::Vec3d& dummy )
{
RimTextAnnotation* textAnnot = dynamic_cast<RimTextAnnotation*>( this->pdmObject() );
RimTextAnnotation* textAnnot = dynamic_cast<RimTextAnnotation*>( pdmObject() );
if ( !textAnnot )
{

2
ApplicationLibCode/Commands/ApplicationCommands/RicCloseProjectFeature.cpp
View File

@ -29,7 +29,7 @@ CAF_CMD_SOURCE_INIT( RicCloseProjectFeature, "RicCloseProjectFeature" );
//--------------------------------------------------------------------------------------------------
void RicCloseProjectFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RiaGuiApplication* app = RiaGuiApplication::instance();
if ( !app || !app->askUserToSaveModifiedProject() ) return;

2
ApplicationLibCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp
View File

@ -53,7 +53,7 @@ std::vector<caf::FontHolderInterface*> findFontObjects()
//--------------------------------------------------------------------------------------------------
void RicEditPreferencesFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RiaGuiApplication* app = RiaGuiApplication::instance();

2
ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp
View File

@ -32,7 +32,7 @@ CAF_CMD_SOURCE_INIT( RicExitApplicationFeature, "RicExitApplicationFeature" );
//--------------------------------------------------------------------------------------------------
void RicExitApplicationFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RiaGuiApplication* app = RiaGuiApplication::instance();
if ( !app->askUserToSaveModifiedProject() ) return;

10
ApplicationLibCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
View File

@ -51,7 +51,7 @@ CAF_CMD_SOURCE_INIT( RicCreateNewIssueHelpFeature, "RicCreateNewIssueHelpFeature
//--------------------------------------------------------------------------------------------------
void RicHelpAboutFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
caf::AboutDialog dlg( nullptr );
@ -202,7 +202,7 @@ QString RicHelpAboutFeature::getPythonVersion( const QString& pathToPythonExecut
//--------------------------------------------------------------------------------------------------
void RicHelpCommandLineFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RiaApplication* app = RiaApplication::instance();
QString text = app->commandLineParameterHelp();
@ -223,7 +223,7 @@ void RicHelpCommandLineFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
void RicHelpSummaryCommandLineFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RiaApplication* app = RiaApplication::instance();
QString text = RicSummaryPlotFeatureImpl::summaryPlotCommandLineHelpText();
@ -244,7 +244,7 @@ void RicHelpSummaryCommandLineFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
void RicHelpOpenUsersGuideFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
QString usersGuideUrl = "https://resinsight.org/getting-started/overview/";
RiaNetworkTools::openUrlWithErrorReporting( usersGuideUrl );
@ -264,7 +264,7 @@ void RicHelpOpenUsersGuideFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
void RicSearchHelpFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
QString usersGuideUrl = "https://resinsight.org/getting-started/overview/";

2
ApplicationLibCode/Commands/ApplicationCommands/RicLaunchUnitTestsFeature.cpp
View File

@ -30,7 +30,7 @@ CAF_CMD_SOURCE_INIT( RicLaunchUnitTestsFeature, "RicLaunchUnitTestsFeature" );
//--------------------------------------------------------------------------------------------------
void RicLaunchUnitTestsFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RiaApplication::instance()->launchUnitTestsWithConsole();
}

2
ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp
View File

@ -42,7 +42,7 @@ RicSaveProjectAsFeature::RicSaveProjectAsFeature()
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicSaveProjectAsFeature::execute()
{
this->disableModelChangeContribution();
disableModelChangeContribution();
QString errorMessage;
if ( !RiaApplication::instance()->saveProjectAs( m_filePath(), &errorMessage ) )
{

2
ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp
View File

@ -39,7 +39,7 @@ RicSaveProjectFeature::RicSaveProjectFeature()
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicSaveProjectFeature::execute()
{
this->disableModelChangeContribution();
disableModelChangeContribution();
bool worked = false;
QString errorMessage;

2
ApplicationLibCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp
View File

@ -80,7 +80,7 @@ void RicShowMainWindowFeature::showMainWindow()
//--------------------------------------------------------------------------------------------------
void RicShowMainWindowFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RicShowMainWindowFeature::showMainWindow();
}

2
ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp
View File

@ -217,7 +217,7 @@ void RicShowPlotDataFeature::onActionTriggered( bool isChecked )
return;
}
this->disableModelChangeContribution();
disableModelChangeContribution();
std::vector<RimPlotWindow*> selection;
getSelection( selection );

2
ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotWindowFeature.cpp
View File

@ -29,7 +29,7 @@ CAF_CMD_SOURCE_INIT( RicShowPlotWindowFeature, "RicShowPlotWindowFeature" );
//--------------------------------------------------------------------------------------------------
void RicShowPlotWindowFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RiaGuiApplication::instance()->getOrCreateAndShowMainPlotWindow();
}

12
ApplicationLibCode/Commands/ApplicationCommands/RicTileWindowsFeature.cpp
View File

@ -72,7 +72,7 @@ bool RicTileWindowsFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicTileWindowsFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
auto* mainWindow = RiuMainWindow::instance();
applyTiling( mainWindow, RiaDefines::WindowTileMode::DEFAULT );
@ -140,7 +140,7 @@ bool RicTilePlotWindowsFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicTilePlotWindowsFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
auto* mainWindow = RiuPlotMainWindow::instance();
RicTilePlotWindowsFeature::applyTiling( mainWindow, RiaDefines::WindowTileMode::DEFAULT );
@ -187,7 +187,7 @@ bool RicTileWindowsVerticallyFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicTileWindowsVerticallyFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
auto* mainWindow = RiuMainWindow::instance();
RicTileWindowsFeature::applyTiling( mainWindow, RiaDefines::WindowTileMode::VERTICAL );
@ -233,7 +233,7 @@ bool RicTileWindowsHorizontallyFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicTileWindowsHorizontallyFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
auto* mainWindow = RiuMainWindow::instance();
RicTileWindowsFeature::applyTiling( mainWindow, RiaDefines::WindowTileMode::HORIZONTAL );
@ -285,7 +285,7 @@ bool RicTilePlotWindowsVerticallyFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicTilePlotWindowsVerticallyFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
auto* mainWindow = RiuPlotMainWindow::instance();
RicTilePlotWindowsFeature::applyTiling( mainWindow, RiaDefines::WindowTileMode::VERTICAL );
@ -331,7 +331,7 @@ bool RicTilePlotWindowsHorizontallyFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicTilePlotWindowsHorizontallyFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
auto* mainWindow = RiuPlotMainWindow::instance();
RicTilePlotWindowsFeature::applyTiling( mainWindow, RiaDefines::WindowTileMode::HORIZONTAL );

2
ApplicationLibCode/Commands/CompletionCommands/RicEditPerforationCollectionFeature.cpp
View File

@ -44,7 +44,7 @@ bool RicEditPerforationCollectionFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicEditPerforationCollectionFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RimPerforationCollection* perforationCollection = selectedPerforationCollection();

2
ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
View File

@ -68,7 +68,7 @@ struct WellBorePartForTransCalc
double intersectionWithWellMeasuredDepth;
size_t lateralIndex;
void setSourcePdmObject( const caf::PdmObject* sourcePdmObj ) { this->sourcePdmObject = const_cast<caf::PdmObject*>( sourcePdmObj ); }
void setSourcePdmObject( const caf::PdmObject* sourcePdmObj ) { sourcePdmObject = const_cast<caf::PdmObject*>( sourcePdmObj ); }
caf::PdmPointer<caf::PdmObject> sourcePdmObject;
};

2
ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp
View File

@ -67,7 +67,7 @@ bool RicAdvancedSnapshotExportFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicAdvancedSnapshotExportFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RimProject* proj = RimProject::current();

2
ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp
View File

@ -212,7 +212,7 @@ void RicCellRangeUi::setDefaultValues()
const cvf::StructGridInterface* grid = RigReservoirGridTools::gridByIndex( m_case, m_gridIndex() );
if ( !grid ) return;
RigActiveCellInfo* actCellInfo = this->activeCellInfo();
RigActiveCellInfo* actCellInfo = activeCellInfo();
const cvf::StructGridInterface* mainGrid = RigReservoirGridTools::mainGrid( m_case );

4
ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
View File

@ -390,13 +390,13 @@ void RicExportEclipseSectorModelUi::fieldChangedByUi( const caf::PdmFieldHandle*
{
exportParameters = EXPORT_TO_SEPARATE_FILE_PER_RESULT;
}
this->updateConnectedEditors();
updateConnectedEditors();
}
}
else if ( changedField == &exportGridBox )
{
applyBoundaryDefaults();
this->updateConnectedEditors();
updateConnectedEditors();
}
}

2
ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
View File

@ -58,7 +58,7 @@ bool RicExportFaultsFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicExportFaultsFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
std::vector<RimFaultInView*> selectedFaults;

2
ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp
View File

@ -131,7 +131,7 @@ bool RicExportToLasFileFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicExportToLasFileFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
if ( RicWellLogPlotCurveFeatureImpl::parentWellAllocationPlot() ) return;

2
ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputPropertyFeature.cpp
View File

@ -53,7 +53,7 @@ bool RicSaveEclipseInputPropertyFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicSaveEclipseInputPropertyFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RimEclipseInputProperty* inputProperty = selectedInputProperty();
if ( !inputProperty ) return;

2
ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseResultAsInputPropertyFeature.cpp
View File

@ -76,7 +76,7 @@ RimEclipseCellColors* RicSaveEclipseResultAsInputPropertyFeature::selectedEclips
//--------------------------------------------------------------------------------------------------
void RicSaveEclipseResultAsInputPropertyFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RimEclipseCellColors* eclipseCellColors = selectedEclipseCellColors();
if ( !eclipseCellColors )

2
ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp
View File

@ -70,7 +70,7 @@ QString RicSnapshotViewToClipboardFeature::text()
//--------------------------------------------------------------------------------------------------
void RicSnapshotViewToClipboardFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
RimViewWindow* viewWindow = RiaGuiApplication::activeViewWindow();

2
ApplicationLibCode/Commands/FlowCommands/RicShowTotalAllocationDataFeature.cpp
View File

@ -47,7 +47,7 @@ bool RicShowTotalAllocationDataFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicShowTotalAllocationDataFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
std::set<RimWellAllocationPlot*> wellAllocPlots = RicShowTotalAllocationDataFeature::selectedWellAllocationPlots();
CVF_ASSERT( wellAllocPlots.size() > 0 );

2
ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp
View File

@ -60,7 +60,7 @@ bool RicCopyReferencesToClipboardFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicCopyReferencesToClipboardFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
if ( !isAnyCopyableObjectSelected() ) return;

2
ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp
View File

@ -46,7 +46,7 @@ bool RicCutReferencesToClipboardFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicCutReferencesToClipboardFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
if ( !isAnyCuttableObjectSelected() ) return;

6
ApplicationLibCode/Commands/RicCalculatorWidgetCreator.cpp
View File

@ -39,7 +39,7 @@ RicCalculatorWidgetCreator::RicCalculatorWidgetCreator( std::unique_ptr<RicUserD
: m_pdmTableView( nullptr )
{
m_calculator = std::move( calculator );
this->setPdmObject( m_calculator.get() );
setPdmObject( m_calculator.get() );
}
//--------------------------------------------------------------------------------------------------
@ -55,7 +55,7 @@ RicCalculatorWidgetCreator::~RicCalculatorWidgetCreator()
m_pdmTableView = nullptr;
}
this->setPdmObject( nullptr );
setPdmObject( nullptr );
}
//--------------------------------------------------------------------------------------------------
@ -183,7 +183,7 @@ QWidget* RicCalculatorWidgetCreator::createWidget( QWidget* parent )
//--------------------------------------------------------------------------------------------------
QMinimizePanel* RicCalculatorWidgetCreator::updateGroupBoxWithContent( caf::PdmUiGroup* group, const QString& uiConfigName )
{
QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, uiConfigName );
QMinimizePanel* groupBox = findOrCreateGroupBox( widget(), group, uiConfigName );
recursivelyConfigureAndUpdateUiOrderingInGridLayout( *group, groupBox->contentFrame(), uiConfigName );
return groupBox;

12
ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp
View File

@ -358,7 +358,7 @@ QString RicRecursiveFileSearchDialog::cleanTextFromPathFilterField() const
//--------------------------------------------------------------------------------------------------
QString RicRecursiveFileSearchDialog::rootDirWithEndSeparator() const
{
QString rootDir = this->cleanTextFromPathFilterField();
QString rootDir = cleanTextFromPathFilterField();
rootDir = RiaFilePathTools::rootSearchPathFromSearchFilter( rootDir );
return RiaFilePathTools::appendSeparatorIfNo( rootDir );
}
@ -368,7 +368,7 @@ QString RicRecursiveFileSearchDialog::rootDirWithEndSeparator() const
//--------------------------------------------------------------------------------------------------
QString RicRecursiveFileSearchDialog::pathFilterWithoutStartSeparator() const
{
QString pathFilter = this->cleanTextFromPathFilterField();
QString pathFilter = cleanTextFromPathFilterField();
QString rootDir = RiaFilePathTools::rootSearchPathFromSearchFilter( pathFilter );
pathFilter.remove( 0, rootDir.size() );
@ -542,8 +542,8 @@ QStringList RicRecursiveFileSearchDialog::findMatchingFiles()
QStringList dirs;
QString pathFilter = this->pathFilterWithoutStartSeparator();
QString rootDir = this->rootDirWithEndSeparator();
QString pathFilter = pathFilterWithoutStartSeparator();
QString rootDir = rootDirWithEndSeparator();
if ( rootDir.size() > 1 && rootDir.endsWith( RiaFilePathTools::separator() ) ) rootDir.chop( 1 );
buildDirectoryListRecursiveSimple( rootDir, pathFilter, &dirs );
@ -894,7 +894,7 @@ void RicRecursiveFileSearchDialog::slotFindOrCancelButtonClicked()
m_foundFiles = candidates;
this->updateFileListWidget();
updateFileListWidget();
m_findOrCancelButton->setText( FIND_BUTTON_FIND_TEXT );
@ -1042,7 +1042,7 @@ QStringList RicRecursiveFileSearchDialog::buildDirectoryListRecursive( const QSt
// Optimizing for speed by a refined match at first directory level
if ( level == 1 )
{
QString pathFilter = this->pathFilterWithoutStartSeparator();
QString pathFilter = pathFilterWithoutStartSeparator();
if ( !pathFilter.startsWith( "*" ) )
{
int wildcardIndex = pathFilter.indexOf( QRegExp( QString( "[*%1]" ).arg( RiaFilePathTools::separator() ) ) );

2
ApplicationLibCode/Commands/RicTogglePerspectiveViewFeature.cpp
View File

@ -54,7 +54,7 @@ void RicTogglePerspectiveViewFeature::onActionTriggered( bool isChecked )
RiaApplication::instance()->activeReservoirView()->viewer()->enableParallelProjection( isPerspective );
RiaApplication::instance()->activeReservoirView()->viewer()->navigationPolicyUpdate();
this->action(); // Retrieve the action to update the looks
action(); // Retrieve the action to update the looks
}
}

4
ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp
View File

@ -102,7 +102,7 @@ void RicUserDefinedCalculatorUi::fieldChangedByUi( const caf::PdmFieldHandle* ch
m_currentCalculation = calculationCollection()->addCalculation();
this->updateConnectedEditors();
updateConnectedEditors();
}
else if ( changedField == &m_deleteCalculation )
{
@ -113,7 +113,7 @@ void RicUserDefinedCalculatorUi::fieldChangedByUi( const caf::PdmFieldHandle* ch
calculationCollection()->deleteCalculation( m_currentCalculation() );
m_currentCalculation = nullptr;
this->updateConnectedEditors();
updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
}
}

4
ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp
View File

@ -90,7 +90,7 @@ void RimOilFieldEntry::initAfterRead()
{
updateEnabledState();
this->updateUiIconFromToggleField();
updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
@ -99,7 +99,7 @@ void RimOilFieldEntry::initAfterRead()
void RimOilFieldEntry::updateEnabledState()
{
bool wellsReadOnly = !selected;
if ( this->isUiReadOnly() )
if ( isUiReadOnly() )
{
wellsReadOnly = true;
}

36
ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp
View File

@ -81,27 +81,27 @@ void RimWellPathImport::updateRegions( const QStringList& regionStrings, const Q
std::vector<RimOilRegionEntry*> regionsToRemove;
// Remove regions and fields not present in last request
for ( size_t regionIdx = 0; regionIdx < this->regions.size(); regionIdx++ )
for ( size_t regionIdx = 0; regionIdx < regions.size(); regionIdx++ )
{
if ( !regionStrings.contains( this->regions[regionIdx]->name ) )
if ( !regionStrings.contains( regions[regionIdx]->name ) )
{
regionsToRemove.push_back( this->regions[regionIdx] );
regionsToRemove.push_back( regions[regionIdx] );
}
else
{
std::vector<RimOilFieldEntry*> fieldsToRemove;
for ( size_t fIdx = 0; fIdx < this->regions[regionIdx]->fields.size(); fIdx++ )
for ( size_t fIdx = 0; fIdx < regions[regionIdx]->fields.size(); fIdx++ )
{
if ( !fieldStrings.contains( this->regions[regionIdx]->fields[fIdx]->name ) )
if ( !fieldStrings.contains( regions[regionIdx]->fields[fIdx]->name ) )
{
fieldsToRemove.push_back( this->regions[regionIdx]->fields[fIdx] );
fieldsToRemove.push_back( regions[regionIdx]->fields[fIdx] );
}
}
for ( size_t i = 0; i < fieldsToRemove.size(); i++ )
{
this->regions[regionIdx]->fields.removeChild( fieldsToRemove[i] );
regions[regionIdx]->fields.removeChild( fieldsToRemove[i] );
delete fieldsToRemove[i];
}
@ -110,7 +110,7 @@ void RimWellPathImport::updateRegions( const QStringList& regionStrings, const Q
for ( size_t i = 0; i < regionsToRemove.size(); i++ )
{
this->regions.removeChild( regionsToRemove[i] );
regions.removeChild( regionsToRemove[i] );
delete regionsToRemove[i];
}
@ -120,17 +120,17 @@ void RimWellPathImport::updateRegions( const QStringList& regionStrings, const Q
RimOilRegionEntry* oilRegionEntry = nullptr;
RimOilFieldEntry* oilFieldEntry = nullptr;
for ( size_t regionIdx = 0; regionIdx < this->regions.size(); regionIdx++ )
for ( size_t regionIdx = 0; regionIdx < regions.size(); regionIdx++ )
{
if ( this->regions[regionIdx]->name == regionStrings[i] )
if ( regions[regionIdx]->name == regionStrings[i] )
{
oilRegionEntry = this->regions[regionIdx];
oilRegionEntry = regions[regionIdx];
for ( size_t fIdx = 0; fIdx < this->regions[regionIdx]->fields.size(); fIdx++ )
for ( size_t fIdx = 0; fIdx < regions[regionIdx]->fields.size(); fIdx++ )
{
if ( this->regions[regionIdx]->fields[fIdx]->edmId == edmIds[i] )
if ( regions[regionIdx]->fields[fIdx]->edmId == edmIds[i] )
{
oilFieldEntry = this->regions[regionIdx]->fields[fIdx];
oilFieldEntry = regions[regionIdx]->fields[fIdx];
}
}
}
@ -141,7 +141,7 @@ void RimWellPathImport::updateRegions( const QStringList& regionStrings, const Q
oilRegionEntry = new RimOilRegionEntry;
oilRegionEntry->name = regionStrings[i];
this->regions.push_back( oilRegionEntry );
regions.push_back( oilRegionEntry );
}
assert( oilRegionEntry );
@ -244,11 +244,11 @@ void RimWellPathImport::updateFilePaths()
{
QString wellPathsFolderPath = RimFileWellPath::getCacheDirectoryPath();
for ( size_t regionIdx = 0; regionIdx < this->regions.size(); regionIdx++ )
for ( size_t regionIdx = 0; regionIdx < regions.size(); regionIdx++ )
{
for ( size_t fIdx = 0; fIdx < this->regions[regionIdx]->fields.size(); fIdx++ )
for ( size_t fIdx = 0; fIdx < regions[regionIdx]->fields.size(); fIdx++ )
{
RimOilFieldEntry* oilField = this->regions[regionIdx]->fields[fIdx];
RimOilFieldEntry* oilField = regions[regionIdx]->fields[fIdx];
QFileInfo fi( oilField->wellsFilePath );

2
ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp
View File

@ -1007,7 +1007,7 @@ void WellSelectionPage::customMenuRequested( const QPoint& pos )
// Qt doc: QAbstractScrollArea and its subclasses that map the context menu event to coordinates of the
// viewport(). Since we might get this signal from different treeViews, we need to map the position accordingly.
QObject* senderObj = this->sender();
QObject* senderObj = sender();
QTreeView* treeView = dynamic_cast<QTreeView*>( senderObj );
if ( treeView )
{

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp
View File

@ -47,7 +47,7 @@ CAF_CMD_SOURCE_INIT( RicAsciiExportSummaryPlotFeature, "RicAsciiExportSummaryPlo
//--------------------------------------------------------------------------------------------------
void RicAsciiExportSummaryPlotFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
std::vector<RimSummaryPlot*> selectedSummaryPlots;
caf::SelectionManager::instance()->objectsByType( &selectedSummaryPlots );

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@ -128,7 +128,7 @@ RicSummaryPlotEditorUi::RicSummaryPlotEditorUi()
m_summaryCurveSelectionEditor = std::make_unique<RiuSummaryVectorSelectionWidgetCreator>();
m_summaryCurveSelectionEditor->summaryAddressSelection()->setFieldChangedHandler( [this]() { this->selectionEditorFieldChanged(); } );
m_summaryCurveSelectionEditor->summaryAddressSelection()->setFieldChangedHandler( [this]() { selectionEditorFieldChanged(); } );
m_summaryCurveSelectionEditor->summaryAddressSelection()->setMultiSelectionMode( true );
}

14
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp
View File

@ -48,7 +48,7 @@ RicSummaryPlotEditorWidgetCreator::RicSummaryPlotEditorWidgetCreator( QWidget* p
m_summaryCurveCreator.reset( new RicSummaryPlotEditorUi() );
this->setPdmObject( m_summaryCurveCreator.get() );
setPdmObject( m_summaryCurveCreator.get() );
}
//--------------------------------------------------------------------------------------------------
@ -213,7 +213,7 @@ QMinimizePanel* RicSummaryPlotEditorWidgetCreator::getOrCreateCurveTreeGroup()
{
if ( !m_curvesPanel )
{
m_curvesPanel = new QMinimizePanel( this->widget() );
m_curvesPanel = new QMinimizePanel( widget() );
m_curvesPanel->setTitle( "Curves" );
QVBoxLayout* curvesLayout = new QVBoxLayout( m_curvesPanel->contentFrame() );
@ -271,7 +271,7 @@ void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int
{
caf::PdmUiFieldHandle* field = dynamic_cast<caf::PdmUiFieldHandle*>( uiItems[i] );
caf::PdmUiFieldEditorHandle* fieldEditor = findOrCreateFieldEditor( this->widget(), field, uiConfigName );
caf::PdmUiFieldEditorHandle* fieldEditor = findOrCreateFieldEditor( widget(), field, uiConfigName );
if ( fieldEditor )
{
@ -280,7 +280,7 @@ void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int
if ( fieldCombinedWidget )
{
fieldCombinedWidget->setParent( this->widget() );
fieldCombinedWidget->setParent( widget() );
layout->insertWidget( currentWidgetIndex++, fieldCombinedWidget );
}
else
@ -294,7 +294,7 @@ void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int
QWidget* fieldLabelWidget = fieldEditor->labelWidget();
if ( fieldLabelWidget )
{
fieldLabelWidget->setParent( this->widget() );
fieldLabelWidget->setParent( widget() );
layout->insertWidget( currentWidgetIndex++, fieldLabelWidget );
@ -309,7 +309,7 @@ void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int
if ( fieldEditorWidget )
{
fieldEditorWidget->setParent( this->widget() ); // To make sure this widget has the current
fieldEditorWidget->setParent( widget() ); // To make sure this widget has the current
// group box as parent.
layout->insertWidget( currentWidgetIndex++, fieldEditorWidget );
@ -327,7 +327,7 @@ void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int
//--------------------------------------------------------------------------------------------------
QMinimizePanel* RicSummaryPlotEditorWidgetCreator::createGroupBoxWithContent( caf::PdmUiGroup* group, const QString& uiConfigName )
{
QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, uiConfigName );
QMinimizePanel* groupBox = findOrCreateGroupBox( widget(), group, uiConfigName );
recursivelyConfigureAndUpdateUiOrderingInGridLayout( *group, groupBox->contentFrame(), uiConfigName );
return groupBox;

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp
View File

@ -37,7 +37,7 @@ CAF_CMD_SOURCE_INIT( RicViewZoomAllFeature, "RicViewZoomAllFeature" );
//--------------------------------------------------------------------------------------------------
void RicViewZoomAllFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
QWidget* topLevelWidget = RiaGuiApplication::activeWindow();

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

@ -44,7 +44,7 @@ CAF_CMD_SOURCE_INIT( RicAsciiExportWellLogPlotFeature, "RicAsciiExportWellLogPlo
//--------------------------------------------------------------------------------------------------
void RicAsciiExportWellLogPlotFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
std::vector<RimWellLogPlot*> selectedWellLogPlots;
caf::SelectionManager::instance()->objectsByType( &selectedWellLogPlots );

2
ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolyline3dEditor.cpp
View File

@ -54,7 +54,7 @@ RicPolyline3dEditor::~RicPolyline3dEditor()
//--------------------------------------------------------------------------------------------------
void RicPolyline3dEditor::configureAndUpdateUi( const QString& uiConfigName )
{
auto* pickerInterface = dynamic_cast<RimPolylinePickerInterface*>( this->pdmObject() );
auto* pickerInterface = dynamic_cast<RimPolylinePickerInterface*>( pdmObject() );
for ( auto targetEditor : m_targetEditors )
{

12
ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp
View File

@ -57,7 +57,7 @@ RicPolylineTarget3dEditor::~RicPolylineTarget3dEditor()
ownerRiuViewer->removeStaticModel( m_cvfModel.p() );
}
RimPolylineTarget* oldTarget = dynamic_cast<RimPolylineTarget*>( this->pdmObject() );
RimPolylineTarget* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
if ( oldTarget )
{
oldTarget->targetPointUiCapability()->removeFieldEditor( this );
@ -71,7 +71,7 @@ RicPolylineTarget3dEditor::~RicPolylineTarget3dEditor()
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigName )
{
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( this->pdmObject() );
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
RiuViewer* ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
Rim3dView* view = mainOrComparisonView();
@ -114,7 +114,7 @@ void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigNam
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::cleanupBeforeSettingPdmObject()
{
RimPolylineTarget* oldTarget = dynamic_cast<RimPolylineTarget*>( this->pdmObject() );
RimPolylineTarget* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
if ( oldTarget )
{
oldTarget->targetPointUiCapability()->removeFieldEditor( this );
@ -126,7 +126,7 @@ void RicPolylineTarget3dEditor::cleanupBeforeSettingPdmObject()
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf::Vec3d& tangent )
{
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( this->pdmObject() );
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
Rim3dView* view = mainOrComparisonView();
if ( !target || !view )
@ -150,7 +150,7 @@ void RicPolylineTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::slotSelectedIn3D()
{
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( this->pdmObject() );
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
if ( !target )
{
return;
@ -164,7 +164,7 @@ void RicPolylineTarget3dEditor::slotSelectedIn3D()
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::slotDragFinished()
{
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( this->pdmObject() );
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
if ( target )
{
target->triggerVisualizationUpdate();

2
ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.cpp
View File

@ -55,7 +55,7 @@ RicWellPathGeometry3dEditor::~RicWellPathGeometry3dEditor()
//--------------------------------------------------------------------------------------------------
void RicWellPathGeometry3dEditor::configureAndUpdateUi( const QString& uiConfigName )
{
RimWellPathGeometryDef* geomDef = dynamic_cast<RimWellPathGeometryDef*>( this->pdmObject() );
RimWellPathGeometryDef* geomDef = dynamic_cast<RimWellPathGeometryDef*>( pdmObject() );
for ( auto targetEditor : m_targetEditors )
{

10
ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
View File

@ -72,7 +72,7 @@ RicWellTarget3dEditor::~RicWellTarget3dEditor()
//--------------------------------------------------------------------------------------------------
void RicWellTarget3dEditor::configureAndUpdateUi( const QString& uiConfigName )
{
auto* target = dynamic_cast<RimWellPathTarget*>( this->pdmObject() );
auto* target = dynamic_cast<RimWellPathTarget*>( pdmObject() );
auto* ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
Rim3dView* view = mainOrComparisonView();
@ -157,7 +157,7 @@ void RicWellTarget3dEditor::cleanupBeforeSettingPdmObject()
//--------------------------------------------------------------------------------------------------
void RicWellTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf::Vec3d& tangent )
{
auto* manipulatedTarget = dynamic_cast<RimWellPathTarget*>( this->pdmObject() );
auto* manipulatedTarget = dynamic_cast<RimWellPathTarget*>( pdmObject() );
Rim3dView* view = mainOrComparisonView();
if ( !manipulatedTarget || !view )
@ -324,7 +324,7 @@ void RicWellTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf::Ve
//--------------------------------------------------------------------------------------------------
void RicWellTarget3dEditor::slotSelectedIn3D()
{
auto* target = dynamic_cast<RimWellPathTarget*>( this->pdmObject() );
auto* target = dynamic_cast<RimWellPathTarget*>( pdmObject() );
if ( !target )
{
return;
@ -338,7 +338,7 @@ void RicWellTarget3dEditor::slotSelectedIn3D()
//--------------------------------------------------------------------------------------------------
void RicWellTarget3dEditor::slotDragFinished()
{
auto* target = dynamic_cast<RimWellPathTarget*>( this->pdmObject() );
auto* target = dynamic_cast<RimWellPathTarget*>( pdmObject() );
if ( !target )
{
return;
@ -352,7 +352,7 @@ void RicWellTarget3dEditor::slotDragFinished()
//--------------------------------------------------------------------------------------------------
void RicWellTarget3dEditor::removeAllFieldEditors()
{
if ( auto* oldTarget = dynamic_cast<RimWellPathTarget*>( this->pdmObject() ) )
if ( auto* oldTarget = dynamic_cast<RimWellPathTarget*>( pdmObject() ) )
{
for ( auto field : oldTarget->fieldsFor3dManipulator() )
{

2
ApplicationLibCode/Commands/WellPathCommands/RicShowWellPlanFeature.cpp
View File

@ -44,7 +44,7 @@ bool RicShowWellPlanFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicShowWellPlanFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
disableModelChangeContribution();
std::vector<RimModeledWellPath*> selectedWellPaths = caf::selectedObjectsByType<RimModeledWellPath*>();
if ( selectedWellPaths.empty() )

32
ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@ -520,11 +520,11 @@ std::string RifEclipseSummaryAddress::itemUiText() const
{
std::string text;
switch ( this->category() )
switch ( category() )
{
case SUMMARY_REGION:
{
text += std::to_string( this->regionNumber() );
text += std::to_string( regionNumber() );
}
break;
case SUMMARY_REGION_2_REGION:
@ -534,37 +534,37 @@ std::string RifEclipseSummaryAddress::itemUiText() const
break;
case SUMMARY_GROUP:
{
text += this->groupName();
text += groupName();
}
break;
case SUMMARY_WELL:
{
text += this->wellName();
text += wellName();
}
break;
case SUMMARY_WELL_COMPLETION:
{
text += this->wellName();
text += wellName();
text += ":" + blockAsString();
}
break;
case SUMMARY_WELL_LGR:
{
text += this->lgrName();
text += ":" + this->wellName();
text += lgrName();
text += ":" + wellName();
}
break;
case SUMMARY_WELL_COMPLETION_LGR:
{
text += this->lgrName();
text += ":" + this->wellName();
text += lgrName();
text += ":" + wellName();
text += ":" + blockAsString();
}
break;
case SUMMARY_WELL_SEGMENT:
{
text += this->wellName();
text += ":" + std::to_string( this->wellSegmentNumber() );
text += wellName();
text += ":" + std::to_string( wellSegmentNumber() );
}
break;
case SUMMARY_BLOCK:
@ -574,18 +574,18 @@ std::string RifEclipseSummaryAddress::itemUiText() const
break;
case SUMMARY_BLOCK_LGR:
{
text += this->lgrName();
text += lgrName();
text += ":" + blockAsString();
}
break;
case SUMMARY_AQUIFER:
{
text += std::to_string( this->aquiferNumber() );
text += std::to_string( aquiferNumber() );
}
break;
case SUMMARY_IMPORTED:
{
text += this->vectorName();
text += vectorName();
}
break;
}
@ -968,7 +968,7 @@ std::string RifEclipseSummaryAddress::blockAsString() const
{
// Avoid space in address text https://github.com/OPM/ResInsight/issues/9707
return std::to_string( this->cellI() ) + "," + std::to_string( this->cellJ() ) + "," + std::to_string( this->cellK() );
return std::to_string( cellI() ) + "," + std::to_string( cellJ() ) + "," + std::to_string( cellK() );
}
//--------------------------------------------------------------------------------------------------
@ -990,7 +990,7 @@ std::tuple<int, int, int> RifEclipseSummaryAddress::ijkTupleFromUiText( const st
//--------------------------------------------------------------------------------------------------
std::string RifEclipseSummaryAddress::formatUiTextRegionToRegion() const
{
return std::to_string( this->regionNumber() ) + " - " + std::to_string( this->regionNumber2() );
return std::to_string( regionNumber() ) + " - " + std::to_string( regionNumber2() );
}
//--------------------------------------------------------------------------------------------------

22
ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -613,11 +613,11 @@ const size_t* RifReaderEclipseOutput::eclipseCellIndexMapping()
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseOutput::importFaults( const QStringList& fileSet, cvf::Collection<RigFault>* faults )
{
if ( this->filenamesWithFaults().size() > 0 )
if ( filenamesWithFaults().size() > 0 )
{
for ( size_t i = 0; i < this->filenamesWithFaults().size(); i++ )
for ( size_t i = 0; i < filenamesWithFaults().size(); i++ )
{
QString faultFilename = this->filenamesWithFaults()[i];
QString faultFilename = filenamesWithFaults()[i];
RifEclipseInputFileTools::parseAndReadFaults( faultFilename, faults );
}
@ -635,7 +635,7 @@ void RifReaderEclipseOutput::importFaults( const QStringList& fileSet, cvf::Coll
std::vector<QString>::iterator last = std::unique( filenamesWithFaults.begin(), filenamesWithFaults.end() );
filenamesWithFaults.erase( last, filenamesWithFaults.end() );
this->setFilenamesWithFaults( filenamesWithFaults );
setFilenamesWithFaults( filenamesWithFaults );
}
}
}
@ -1481,7 +1481,7 @@ public:
if ( ert_wellhead )
{
size_t localGridCellidx = localGridCellIndexFromErtConnection( m_mainGrid->gridByIndex( gridNr ), ert_wellhead, nullptr );
this->insertTheParentCells( gridNr, localGridCellidx );
insertTheParentCells( gridNr, localGridCellidx );
}
std::string gridname = gridNr == 0 ? ECL_GRID_GLOBAL_GRID : m_mainGrid->gridByIndex( gridNr )->gridName();
@ -1498,7 +1498,7 @@ public:
size_t localGridCellidx =
localGridCellIndexFromErtConnection( m_mainGrid->gridByIndex( gridNr ), ert_connection, nullptr );
this->insertTheParentCells( gridNr, localGridCellidx );
insertTheParentCells( gridNr, localGridCellidx );
}
}
}
@ -1723,7 +1723,7 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
for ( int gridNr = lastGridNr; gridNr >= 0; --gridNr )
{
std::string gridName = this->ertGridName( gridNr );
std::string gridName = ertGridName( gridNr );
// If this segment has connections in any grid, transfer the innermost ones
@ -1808,7 +1808,7 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
for ( int gridNr = lastGridNr; gridNr >= 0; --gridNr )
{
std::string gridName = this->ertGridName( gridNr );
std::string gridName = ertGridName( gridNr );
// If this segment has connections in any grid, use the deepest innermost one
@ -1881,7 +1881,7 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
for ( int gridNr = lastGridNr; gridNr >= 0; --gridNr )
{
std::string gridName = this->ertGridName( gridNr );
std::string gridName = ertGridName( gridNr );
// If this segment has connections in any grid, stop traversal
@ -2047,7 +2047,7 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
}
const well_conn_collection_type* connections =
well_state_get_grid_connections( ert_well_state, this->ertGridName( gridNr ).data() );
well_state_get_grid_connections( ert_well_state, ertGridName( gridNr ).data() );
// Import all well result cells for all connections
if ( connections )
@ -2222,7 +2222,7 @@ std::vector<RigEclipseTimeStepInfo> RifReaderEclipseOutput::createFilteredTimeSt
for ( size_t i = 0; i < timeStepsOnFile.size(); i++ )
{
if ( this->isTimeStepIncludedByFilter( i ) )
if ( isTimeStepIncludedByFilter( i ) )
{
timeStepInfos.push_back(
RigEclipseTimeStepInfo( timeStepsOnFile[i], reportNumbersOnFile[i], daysSinceSimulationStartOnFile[i] ) );

2
ApplicationLibCode/FileInterface/RifReaderMockModel.cpp
View File

@ -88,7 +88,7 @@ bool RifReaderMockModel::open( const QString& fileName, RigEclipseCaseData* ecli
cellResults->setTimeStepInfos( resAddr, staticResultTimeStepInfos ); \
cellResults->modifiableCellScalarResultTimesteps( resAddr )->resize( 1 ); \
std::vector<double>& values = cellResults->modifiableCellScalarResultTimesteps( resAddr )->at( 0 ); \
this->inputProperty( resultName, &values ); \
inputProperty( resultName, &values ); \
}
ADD_INPUT_PROPERTY( "PORO" );

2
ApplicationLibCode/FileInterface/RifReaderRftInterface.cpp
View File

@ -23,7 +23,7 @@
std::set<RifEclipseRftAddress> RifReaderRftInterface::eclipseRftAddresses( const QString& wellName, const QDateTime& timeStep )
{
std::set<RifEclipseRftAddress> matchingAddresses;
std::set<RifEclipseRftAddress> allAddresses = this->eclipseRftAddresses();
std::set<RifEclipseRftAddress> allAddresses = eclipseRftAddresses();
for ( const RifEclipseRftAddress& address : allAddresses )
{
if ( address.wellName() == wellName && address.timeStep() == timeStep )

44
ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.cpp
View File

@ -232,7 +232,7 @@ void RigFemPart::assertNodeToElmIndicesIsCalculated()
{
if ( m_nodeToElmRefs.size() != nodes().nodeIds.size() )
{
this->calculateNodeToElmRefs();
calculateNodeToElmRefs();
}
}
@ -279,7 +279,7 @@ void RigFemPart::assertElmNeighborsIsCalculated()
{
if ( m_elmNeighbors.size() != m_elementId.size() )
{
this->calculateElmNeighbors();
calculateElmNeighbors();
}
}
@ -295,12 +295,12 @@ void RigFemPart::calculateElmNeighbors()
// parallelization
std::vector<int> candidates; //
m_elmNeighbors.resize( this->elementCount() );
m_elmNeighbors.resize( elementCount() );
for ( int eIdx = 0; eIdx < this->elementCount(); ++eIdx )
for ( int eIdx = 0; eIdx < elementCount(); ++eIdx )
{
RigElementType elmType = this->elementType( eIdx );
const int* elmNodes = this->connectivities( eIdx );
RigElementType elmType = elementType( eIdx );
const int* elmNodes = connectivities( eIdx );
int faceCount = RigFemTypes::elementFaceCount( elmType );
int neighborCount = 0;
@ -315,7 +315,7 @@ void RigFemPart::calculateElmNeighbors()
candidates.clear();
{
int firstNodeIdxOfFace = elmNodes[localFaceIndices[0]];
const std::vector<int>& candidates1 = this->elementsUsingNode( firstNodeIdxOfFace );
const std::vector<int>& candidates1 = elementsUsingNode( firstNodeIdxOfFace );
if ( !candidates1.empty() )
{
@ -323,7 +323,7 @@ void RigFemPart::calculateElmNeighbors()
int thirdNodeIdxOfFace = elmNodes[localFaceIndices[3]];
const std::vector<int>& candidates2 = this->elementsUsingNode( thirdNodeIdxOfFace );
const std::vector<int>& candidates2 = elementsUsingNode( thirdNodeIdxOfFace );
// The candidates are sorted from smallest to largest, so we do a linear search to find the
// (two) common cells in the two arrays, and leaving this element out, we have one candidate left
@ -366,8 +366,8 @@ void RigFemPart::calculateElmNeighbors()
{
int nbcElmIdx = candidates[nbcIdx];
RigElementType nbcElmType = this->elementType( nbcElmIdx );
const int* nbcElmNodes = this->connectivities( nbcElmIdx );
RigElementType nbcElmType = elementType( nbcElmIdx );
const int* nbcElmNodes = connectivities( nbcElmIdx );
int nbcFaceCount = RigFemTypes::elementFaceCount( nbcElmType );
bool isNeighborFound = false;
@ -407,10 +407,10 @@ void RigFemPart::calculateElmNeighbors()
//--------------------------------------------------------------------------------------------------
cvf::Vec3f RigFemPart::faceNormal( int elmIdx, int faceIdx ) const
{
const std::vector<cvf::Vec3f>& nodeCoordinates = this->nodes().coordinates;
const std::vector<cvf::Vec3f>& nodeCoordinates = nodes().coordinates;
RigElementType eType = this->elementType( elmIdx );
const int* elmNodeIndices = this->connectivities( elmIdx );
RigElementType eType = elementType( elmIdx );
const int* elmNodeIndices = connectivities( elmIdx );
int faceNodeCount = 0;
const int* localElmNodeIndicesForFace = RigFemTypes::localElmNodeIndicesForFace( eType, faceIdx, &faceNodeCount );
@ -450,15 +450,15 @@ float RigFemPart::characteristicElementSize() const
float sumMaxEdgeLength = 0;
for ( int elmIdx = 0; elmIdx < elementCount(); elmIdx++ )
{
RigElementType eType = this->elementType( elmIdx );
RigElementType eType = elementType( elmIdx );
if ( eType == elmType )
{
const int* elementConn = this->connectivities( elmIdx );
cvf::Vec3f nodePos0 = this->nodes().coordinates[elementConn[0]];
cvf::Vec3f nodePos1 = this->nodes().coordinates[elementConn[1]];
cvf::Vec3f nodePos3 = this->nodes().coordinates[elementConn[3]];
cvf::Vec3f nodePos4 = this->nodes().coordinates[elementConn[4]];
const int* elementConn = connectivities( elmIdx );
cvf::Vec3f nodePos0 = nodes().coordinates[elementConn[0]];
cvf::Vec3f nodePos1 = nodes().coordinates[elementConn[1]];
cvf::Vec3f nodePos3 = nodes().coordinates[elementConn[3]];
cvf::Vec3f nodePos4 = nodes().coordinates[elementConn[4]];
float l1 = ( nodePos1 - nodePos0 ).length();
float l3 = ( nodePos3 - nodePos0 ).length();
@ -560,11 +560,11 @@ void RigFemPart::ensureIntersectionSearchTreeIsBuilt() const
//--------------------------------------------------------------------------------------------------
size_t RigFemPart::elementNodeResultCount() const
{
int lastElmIdx = this->elementCount() - 1;
int lastElmIdx = elementCount() - 1;
if ( lastElmIdx < 0 ) return 0;
RigElementType elmType = this->elementType( lastElmIdx );
RigElementType elmType = elementType( lastElmIdx );
int elmNodeCount = RigFemTypes::elementNodeCount( elmType );
size_t lastElmResultIdx = this->elementNodeResultIdx( lastElmIdx, elmNodeCount - 1 );
size_t lastElmResultIdx = elementNodeResultIdx( lastElmIdx, elmNodeCount - 1 );
return lastElmResultIdx + 1;
}

2
ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp
View File

@ -481,7 +481,7 @@ void RigFemPartGrid::cellCornerVertices( size_t cellIndex, cvf::Vec3d vertices[8
cvf::Vec3d RigFemPartGrid::cellCentroid( size_t cellIndex ) const
{
std::array<cvf::Vec3d, 8> cellVertices;
this->cellCornerVertices( cellIndex, cellVertices.data() );
cellCornerVertices( cellIndex, cellVertices.data() );
cvf::Vec3d centroid( 0.0, 0.0, 0.0 );
for ( int i = 0; i < 8; ++i )

48
ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
View File

@ -215,7 +215,7 @@ void RigFemPartResultsCollection::setActiveFormationNames( RigFormationNames* ac
{
m_activeFormationNamesData = activeFormationNames;
this->deleteResult( RigFemResultAddress( RIG_FORMATION_NAMES, "Active Formation Names", "" ) );
deleteResult( RigFemResultAddress( RIG_FORMATION_NAMES, "Active Formation Names", "" ) );
}
//--------------------------------------------------------------------------------------------------
@ -260,7 +260,7 @@ void RigFemPartResultsCollection::addElementPropertyFiles( const std::vector<QSt
// Invalidate previous result if already in cache
for ( const RigFemResultAddress& address : newAddresses )
{
this->deleteResult( address );
deleteResult( address );
}
}
@ -285,7 +285,7 @@ std::vector<RigFemResultAddress> RigFemPartResultsCollection::removeElementPrope
for ( const RigFemResultAddress& address : addressesToRemove )
{
this->deleteResult( address );
deleteResult( address );
}
return addressesToRemove;
@ -459,7 +459,7 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::findOrLoadScalarResult( i
// We need to read the data as bulk fields, and populate the correct scalar caches
std::vector<RigFemResultAddress> resultAddressOfComponents = this->getResAddrToComponentsToRead( resVarAddr );
std::vector<RigFemResultAddress> resultAddressOfComponents = getResAddrToComponentsToRead( resVarAddr );
if ( !resultAddressOfComponents.empty() )
{
@ -469,7 +469,7 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::findOrLoadScalarResult( i
resultsForEachComponent.push_back( m_femPartResults[partIndex]->createScalarResult( resultAddressOfComponent ) );
}
int timeSteps = this->timeStepCount();
int timeSteps = timeStepCount();
caf::ProgressInfo progress( timeSteps, "" );
progress.setProgressDescription(
QString( "Loading Native Result %1 %2" ).arg( resVarAddr.fieldName.c_str(), resVarAddr.componentName.c_str() ) );
@ -1183,7 +1183,7 @@ void RigFemPartResultsCollection::minMaxScalarValues( const RigFemResultAddress&
double* localMin,
double* localMax )
{
this->statistics( resVarAddr )->minMaxCellScalarValues( stepIndex, *localMin, *localMax );
statistics( resVarAddr )->minMaxCellScalarValues( stepIndex, *localMin, *localMax );
}
//--------------------------------------------------------------------------------------------------
@ -1191,7 +1191,7 @@ void RigFemPartResultsCollection::minMaxScalarValues( const RigFemResultAddress&
//--------------------------------------------------------------------------------------------------
void RigFemPartResultsCollection::minMaxScalarValues( const RigFemResultAddress& resVarAddr, double* globalMin, double* globalMax )
{
this->statistics( resVarAddr )->minMaxCellScalarValues( *globalMin, *globalMax );
statistics( resVarAddr )->minMaxCellScalarValues( *globalMin, *globalMax );
}
//--------------------------------------------------------------------------------------------------
@ -1203,7 +1203,7 @@ void RigFemPartResultsCollection::posNegClosestToZero( const RigFemResultAddress
double* localPosClosestToZero,
double* localNegClosestToZero )
{
this->statistics( resVarAddr )->posNegClosestToZero( stepIndex, *localPosClosestToZero, *localNegClosestToZero );
statistics( resVarAddr )->posNegClosestToZero( stepIndex, *localPosClosestToZero, *localNegClosestToZero );
}
//--------------------------------------------------------------------------------------------------
@ -1213,7 +1213,7 @@ void RigFemPartResultsCollection::posNegClosestToZero( const RigFemResultAddress
double* globalPosClosestToZero,
double* globalNegClosestToZero )
{
this->statistics( resVarAddr )->posNegClosestToZero( *globalPosClosestToZero, *globalNegClosestToZero );
statistics( resVarAddr )->posNegClosestToZero( *globalPosClosestToZero, *globalNegClosestToZero );
}
//--------------------------------------------------------------------------------------------------
@ -1223,7 +1223,7 @@ void RigFemPartResultsCollection::meanScalarValue( const RigFemResultAddress& re
{
CVF_ASSERT( meanValue );
this->statistics( resVarAddr )->meanCellScalarValues( *meanValue );
statistics( resVarAddr )->meanCellScalarValues( *meanValue );
}
//--------------------------------------------------------------------------------------------------
@ -1231,7 +1231,7 @@ void RigFemPartResultsCollection::meanScalarValue( const RigFemResultAddress& re
//--------------------------------------------------------------------------------------------------
void RigFemPartResultsCollection::meanScalarValue( const RigFemResultAddress& resVarAddr, int stepIndex, int frameIndex, double* meanValue )
{
this->statistics( resVarAddr )->meanCellScalarValues( stepIndex, *meanValue );
statistics( resVarAddr )->meanCellScalarValues( stepIndex, *meanValue );
}
//--------------------------------------------------------------------------------------------------
@ -1239,7 +1239,7 @@ void RigFemPartResultsCollection::meanScalarValue( const RigFemResultAddress& re
//--------------------------------------------------------------------------------------------------
void RigFemPartResultsCollection::p10p90ScalarValues( const RigFemResultAddress& resVarAddr, double* p10, double* p90 )
{
this->statistics( resVarAddr )->p10p90CellScalarValues( *p10, *p90 );
statistics( resVarAddr )->p10p90CellScalarValues( *p10, *p90 );
}
//--------------------------------------------------------------------------------------------------
@ -1247,7 +1247,7 @@ void RigFemPartResultsCollection::p10p90ScalarValues( const RigFemResultAddress&
//--------------------------------------------------------------------------------------------------
void RigFemPartResultsCollection::p10p90ScalarValues( const RigFemResultAddress& resVarAddr, int stepIndex, int frameIndex, double* p10, double* p90 )
{
this->statistics( resVarAddr )->p10p90CellScalarValues( stepIndex, *p10, *p90 );
statistics( resVarAddr )->p10p90CellScalarValues( stepIndex, *p10, *p90 );
}
//--------------------------------------------------------------------------------------------------
@ -1257,7 +1257,7 @@ void RigFemPartResultsCollection::sumScalarValue( const RigFemResultAddress& res
{
CVF_ASSERT( sum );
this->statistics( resVarAddr )->sumCellScalarValues( *sum );
statistics( resVarAddr )->sumCellScalarValues( *sum );
}
//--------------------------------------------------------------------------------------------------
@ -1267,7 +1267,7 @@ void RigFemPartResultsCollection::sumScalarValue( const RigFemResultAddress& res
{
CVF_ASSERT( sum );
this->statistics( resVarAddr )->sumCellScalarValues( stepIndex, *sum );
statistics( resVarAddr )->sumCellScalarValues( stepIndex, *sum );
}
//--------------------------------------------------------------------------------------------------
@ -1275,7 +1275,7 @@ void RigFemPartResultsCollection::sumScalarValue( const RigFemResultAddress& res
//--------------------------------------------------------------------------------------------------
const std::vector<size_t>& RigFemPartResultsCollection::scalarValuesHistogram( const RigFemResultAddress& resVarAddr )
{
return this->statistics( resVarAddr )->cellScalarValuesHistogram();
return statistics( resVarAddr )->cellScalarValuesHistogram();
}
//--------------------------------------------------------------------------------------------------
@ -1284,7 +1284,7 @@ const std::vector<size_t>& RigFemPartResultsCollection::scalarValuesHistogram( c
const std::vector<size_t>&
RigFemPartResultsCollection::scalarValuesHistogram( const RigFemResultAddress& resVarAddr, int stepIndex, int frameIndex )
{
return this->statistics( resVarAddr )->cellScalarValuesHistogram( stepIndex );
return statistics( resVarAddr )->cellScalarValuesHistogram( stepIndex );
}
//--------------------------------------------------------------------------------------------------
@ -1434,7 +1434,7 @@ void RigFemPartResultsCollection::setNormalizationAirGap( double normalizationAi
{
for ( auto result : normalizedResults() )
{
this->deleteResult( result );
deleteResult( result );
}
}
m_normalizationAirGap = normalizationAirGap;
@ -1464,7 +1464,7 @@ void RigFemPartResultsCollection::minMaxScalarValuesOverAllTensorComponents( con
for ( const auto& address : tensorPrincipalComponentAdresses( resVarAddr ) )
{
this->statistics( address )->minMaxCellScalarValues( stepIndex, min, max );
statistics( address )->minMaxCellScalarValues( stepIndex, min, max );
if ( min < currentMin )
{
currentMin = min;
@ -1493,7 +1493,7 @@ void RigFemPartResultsCollection::minMaxScalarValuesOverAllTensorComponents( con
for ( const auto& address : tensorPrincipalComponentAdresses( resVarAddr ) )
{
this->statistics( address )->minMaxCellScalarValues( min, max );
statistics( address )->minMaxCellScalarValues( min, max );
if ( min < currentMin )
{
currentMin = min;
@ -1524,7 +1524,7 @@ void RigFemPartResultsCollection::posNegClosestToZeroOverAllTensorComponents( co
for ( const auto& address : tensorPrincipalComponentAdresses( resVarAddr ) )
{
this->statistics( address )->posNegClosestToZero( stepIndex, pos, neg );
statistics( address )->posNegClosestToZero( stepIndex, pos, neg );
if ( pos < currentPosClosestToZero )
{
currentPosClosestToZero = pos;
@ -1553,7 +1553,7 @@ void RigFemPartResultsCollection::posNegClosestToZeroOverAllTensorComponents( co
for ( const auto& address : tensorPrincipalComponentAdresses( resVarAddr ) )
{
this->statistics( address )->posNegClosestToZero( pos, neg );
statistics( address )->posNegClosestToZero( pos, neg );
if ( pos < currentPosClosestToZero )
{
currentPosClosestToZero = pos;
@ -1700,7 +1700,7 @@ void RigFemPartResultsCollection::setCalculationParameters( RimMudWeightWindowPa
// Invalidate dependent results
for ( auto result : mudWeightWindowResults() )
{
this->deleteResult( result );
deleteResult( result );
}
}
@ -1824,7 +1824,7 @@ void RigFemPartResultsCollection::setMudWeightWindowParameters( double
// Invalidate dependent results
for ( auto result : mudWeightWindowResults() )
{
this->deleteResult( result );
deleteResult( result );
}
}

6
ApplicationLibCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
View File

@ -63,7 +63,7 @@ RivGeoMechVizLogic::~RivGeoMechVizLogic()
//--------------------------------------------------------------------------------------------------
void RivGeoMechVizLogic::appendNoAnimPartsToModel( cvf::ModelBasicList* model )
{
this->appendPartsToModel( -1, model );
appendPartsToModel( -1, model );
}
//--------------------------------------------------------------------------------------------------
@ -112,7 +112,7 @@ void RivGeoMechVizLogic::updateStaticCellColors( int viewerStepIndex )
//--------------------------------------------------------------------------------------------------
void RivGeoMechVizLogic::scheduleGeometryRegen( RivCellSetEnum geometryType )
{
this->scheduleRegenOfDirectlyDependentGeometry( geometryType );
scheduleRegenOfDirectlyDependentGeometry( geometryType );
bool resultsOk = ( m_geomechView->geoMechCase() && m_geomechView->geoMechCase()->geoMechData() &&
m_geomechView->geoMechCase()->geoMechData()->femPartResults() );
@ -149,7 +149,7 @@ void RivGeoMechVizLogic::scheduleRegenOfDirectlyDependentGeometry( RivCellSetEnu
{
if ( geometryType == RANGE_FILTERED )
{
this->scheduleGeometryRegen( PROPERTY_FILTERED );
scheduleGeometryRegen( PROPERTY_FILTERED );
}
}

8
ApplicationLibCode/GeoMech/OdbReader/RifOdbReader.cpp
View File

@ -448,7 +448,7 @@ std::vector<std::string> RifOdbReader::filteredStepNames() const
for ( sIter.first(); !sIter.isDone(); sIter.next() )
{
std::string stepName( sIter.currentValue().name().CStr() );
if ( this->isTimeStepIncludedByFilter( stepIndex++ ) )
if ( isTimeStepIncludedByFilter( stepIndex++ ) )
{
stepNames.push_back( stepName );
}
@ -468,7 +468,7 @@ std::vector<double> RifOdbReader::frameTimes( int stepIndex ) const
odb_StepList stepList = stepRepository.stepList();
int stepFileIndex = this->timeStepIndexOnFile( stepIndex );
int stepFileIndex = timeStepIndexOnFile( stepIndex );
odb_Step& step = stepList.Get( stepFileIndex );
@ -607,8 +607,8 @@ const odb_Frame& RifOdbReader::stepFrame( int stepIndex, int frameIndex ) const
const odb_StepRepository& stepRepository = m_odb->steps();
const odb_StepList& stepList = stepRepository.stepList();
int stepFileIndex = this->timeStepIndexOnFile( stepIndex );
int fileFrameIndex = this->frameIndexOnFile( frameIndex );
int stepFileIndex = timeStepIndexOnFile( stepIndex );
int fileFrameIndex = frameIndexOnFile( frameIndex );
const odb_Step& step = stepList.ConstGet( stepFileIndex );
const odb_SequenceFrame& stepFrames = step.frames();

2
ApplicationLibCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp
View File

@ -75,7 +75,7 @@ RivBoxIntersectionPartMgr::RivBoxIntersectionPartMgr( RimBoxIntersection* inters
void RivBoxIntersectionPartMgr::applySingleColorEffect()
{
m_defaultColor = cvf::Color3f::OLIVE; // m_rimCrossSection->CrossSectionColor();
this->updatePartEffect();
updatePartEffect();
}
//--------------------------------------------------------------------------------------------------

14
ApplicationLibCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@ -104,7 +104,7 @@ void RivFaultPartMgr::setCellVisibility( cvf::UByteArray* cellVisibilities )
void RivFaultPartMgr::applySingleColorEffect()
{
m_defaultColor = m_rimFault->faultColor();
this->updatePartEffect();
updatePartEffect();
}
//--------------------------------------------------------------------------------------------------
@ -137,7 +137,7 @@ void RivFaultPartMgr::updateCellResultColor( size_t timeStepIndex, RimEclipseCel
m_nativeFaultFacesTextureCoords.p(),
mapper,
m_opacityLevel,
this->faceCullingMode(),
faceCullingMode(),
eclipseView->isLightingDisabled() );
}
else
@ -159,7 +159,7 @@ void RivFaultPartMgr::updateCellResultColor( size_t timeStepIndex, RimEclipseCel
m_nativeFaultFacesTextureCoords.p(),
mapper,
m_opacityLevel,
this->faceCullingMode(),
faceCullingMode(),
eclipseView->isLightingDisabled() );
}
}
@ -182,7 +182,7 @@ void RivFaultPartMgr::updateCellResultColor( size_t timeStepIndex, RimEclipseCel
m_oppositeFaultFacesTextureCoords.p(),
mapper,
m_opacityLevel,
this->faceCullingMode(),
faceCullingMode(),
eclipseView->isLightingDisabled() );
}
else
@ -204,7 +204,7 @@ void RivFaultPartMgr::updateCellResultColor( size_t timeStepIndex, RimEclipseCel
m_oppositeFaultFacesTextureCoords.p(),
mapper,
m_opacityLevel,
this->faceCullingMode(),
faceCullingMode(),
eclipseView->isLightingDisabled() );
}
}
@ -232,7 +232,7 @@ void RivFaultPartMgr::updateCellEdgeResultColor( size_t timeStepI
cellEdgeResultColors,
m_opacityLevel,
m_defaultColor,
this->faceCullingMode(),
faceCullingMode(),
cellResultColors->reservoirView()->isLightingDisabled() );
m_nativeFaultFaces->setEffect( eff.p() );
@ -252,7 +252,7 @@ void RivFaultPartMgr::updateCellEdgeResultColor( size_t timeStepI
cellEdgeResultColors,
m_opacityLevel,
m_defaultColor,
this->faceCullingMode(),
faceCullingMode(),
cellResultColors->reservoirView()->isLightingDisabled() );
m_oppositeFaultFaces->setEffect( eff.p() );

2
ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
View File

@ -161,7 +161,7 @@ void RivSimWellPipesPartMgr::buildWellPipeParts( const caf::DisplayCoordTransfor
int branchIndex,
size_t frameIndex )
{
if ( !this->viewWithSettings() ) return;
if ( !viewWithSettings() ) return;
m_wellBranches.clear();
m_flattenedBranchWellHeadOffsets.clear();

32
ApplicationLibCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp
View File

@ -52,7 +52,7 @@ RivTernarySaturationOverlayItem::~RivTernarySaturationOverlayItem()
//--------------------------------------------------------------------------------------------------
void RivTernarySaturationOverlayItem::setAxisLabelsColor( const cvf::Color3f& color )
{
this->setTextColor( color );
setTextColor( color );
}
//--------------------------------------------------------------------------------------------------
@ -92,14 +92,14 @@ void RivTernarySaturationOverlayItem::renderGeneric( cvf::OpenGLContext* oglCont
camera.applyOpenGL();
camera.viewport()->applyOpenGL( oglContext, cvf::Viewport::CLEAR_DEPTH );
if ( this->backgroundEnabled() )
if ( backgroundEnabled() )
{
if ( software )
{
caf::InternalLegendRenderTools::renderBackgroundImmediateMode( oglContext,
cvf::Vec2f( sizeFrameBox ),
this->backgroundColor(),
this->backgroundFrameColor() );
backgroundColor(),
backgroundFrameColor() );
}
else
{
@ -108,22 +108,22 @@ void RivTernarySaturationOverlayItem::renderGeneric( cvf::OpenGLContext* oglCont
caf::InternalLegendRenderTools::renderBackgroundUsingShaders( oglContext,
matrixState,
cvf::Vec2f( sizeFrameBox ),
this->backgroundColor(),
this->backgroundFrameColor() );
backgroundColor(),
backgroundFrameColor() );
}
border = 8.0f;
}
cvf::TextDrawer textDrawer( this->font() );
textDrawer.setTextColor( this->textColor() );
cvf::TextDrawer textDrawer( font() );
textDrawer.setTextColor( textColor() );
float lineHeightInPixels = (float)( this->font()->textExtent( "SWAT" ).y() + 2 );
float lineHeightInPixels = (float)( font()->textExtent( "SWAT" ).y() + 2 );
float textPosY = static_cast<float>( size.y() - lineHeightInPixels - border );
for ( size_t it = 0; it < this->titleStrings().size(); it++ )
for ( size_t it = 0; it < titleStrings().size(); it++ )
{
cvf::Vec2f pos( border, textPosY );
textDrawer.addText( this->titleStrings()[it], pos );
textDrawer.addText( titleStrings()[it], pos );
textPosY -= lineHeightInPixels;
}
@ -134,10 +134,10 @@ void RivTernarySaturationOverlayItem::renderGeneric( cvf::OpenGLContext* oglCont
textPosY -= border;
{
cvf::uint sgasTextWidth = this->font()->textExtent( "SGAS" ).x();
cvf::uint sgasTextWidth = font()->textExtent( "SGAS" ).x();
textDrawer.addText( "SGAS", cvf::Vec2f( static_cast<float>( ( size.x() / 2 ) - sgasTextWidth / 2 ), textPosY ) );
cvf::uint sgasRangeTextWidth = this->font()->textExtent( m_sgasRange ).x();
cvf::uint sgasRangeTextWidth = font()->textExtent( m_sgasRange ).x();
textPosY -= lineHeightInPixels;
textDrawer.addText( m_sgasRange, cvf::Vec2f( static_cast<float>( ( size.x() / 2 ) - sgasRangeTextWidth / 2 ), textPosY ) );
}
@ -146,10 +146,10 @@ void RivTernarySaturationOverlayItem::renderGeneric( cvf::OpenGLContext* oglCont
textDrawer.addText( m_swatRange, cvf::Vec2f( (float)border, (float)border ) );
{
cvf::uint soilTextWidth = this->font()->textExtent( "SOIL" ).x();
cvf::uint soilTextWidth = font()->textExtent( "SOIL" ).x();
textDrawer.addText( "SOIL", cvf::Vec2f( static_cast<float>( size.x() - soilTextWidth - border ), lineHeightInPixels + border ) );
cvf::uint soilRangeTextWidth = this->font()->textExtent( m_soilRange ).x();
cvf::uint soilRangeTextWidth = font()->textExtent( m_soilRange ).x();
float soilRangePos = static_cast<float>( size.x() ) - soilRangeTextWidth - border;
textDrawer.addText( m_soilRange, cvf::Vec2f( soilRangePos, (float)border ) );
@ -187,7 +187,7 @@ void RivTernarySaturationOverlayItem::renderAxisImmediateMode( float
cvf::Color3ub colB( cvf::Color3::GREEN );
cvf::Color3ub colC( cvf::Color3::RED );
// float upperBoundY = static_cast<float>(this->sizeHint().y() - 20);
// float upperBoundY = static_cast<float>(sizeHint().y() - 20);
cvf::Vec3f a( float( border ), lowerBoundY, 0 );
cvf::Vec3f b( static_cast<float>( totalWidth - border ), lowerBoundY, 0 );

2
ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
View File

@ -74,7 +74,7 @@ void RivSurfacePartMgr::appendNativeGeometryPartsToModel( cvf::ModelBasicList* m
if ( m_nativeTrianglesPart.notNull() )
{
m_nativeTrianglesPart->setTransform( scaleTransform );
this->updateNativeSurfaceColors();
updateNativeSurfaceColors();
model->addPart( m_nativeTrianglesPart.p() );

20
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@ -188,7 +188,7 @@ RimAnalysisPlot::~RimAnalysisPlot()
//--------------------------------------------------------------------------------------------------
void RimAnalysisPlot::updateCaseNameHasChanged()
{
this->onLoadDataAndUpdate();
onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
@ -421,7 +421,7 @@ void RimAnalysisPlot::maxMinValueFromAddress( const RifEclipseSummaryAddress&
//--------------------------------------------------------------------------------------------------
void RimAnalysisPlot::onFiltersChanged( const caf::SignalEmitter* emitter )
{
this->loadDataAndUpdate();
loadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
@ -453,7 +453,7 @@ void RimAnalysisPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
dlg.enableMultiSelect( true );
dlg.enableIndividualEnsembleCaseSelection( true );
dlg.hideEnsembles();
dlg.setCurveSelection( this->curveDefinitions() );
dlg.setCurveSelection( curveDefinitions() );
if ( dlg.exec() == QDialog::Accepted )
{
@ -475,10 +475,10 @@ void RimAnalysisPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
{
m_selectedTimeSteps.v().clear();
this->updateConnectedEditors();
updateConnectedEditors();
}
this->loadDataAndUpdate();
loadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
@ -792,8 +792,8 @@ void RimAnalysisPlot::onLoadDataAndUpdate()
m_plotWidget->updateLegend();
}
this->updateAxes();
this->updatePlotTitle();
updateAxes();
updatePlotTitle();
}
//--------------------------------------------------------------------------------------------------
@ -1089,7 +1089,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
{
sumItemsToKeep = ( *filteredSummaryItems ); // Not filtering items
RigEnsembleParameter eParam = this->ensembleParameter( filter->ensembleParameterName() );
RigEnsembleParameter eParam = ensembleParameter( filter->ensembleParameterName() );
for ( auto sumCase : ( *filteredSumCases ) )
{
@ -1154,7 +1154,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
}
else if ( filter->consideredTimeStepsType() == RimPlotDataFilterItem::PLOT_SOURCE_TIMESTEPS )
{
selectedTimesteps = this->selectedTimeSteps();
selectedTimesteps = selectedTimeSteps();
}
std::function<void( double )> storeResultCoreLambda;
@ -1626,7 +1626,7 @@ RiaSummaryCurveDefinitionAnalyser* RimAnalysisPlot::getOrCreateSelectedCurveDefA
{
m_analyserOfSelectedCurveDefs = std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>( new RiaSummaryCurveDefinitionAnalyser );
}
m_analyserOfSelectedCurveDefs->setCurveDefinitions( this->curveDefinitions() );
m_analyserOfSelectedCurveDefs->setCurveDefinitions( curveDefinitions() );
return m_analyserOfSelectedCurveDefs.get();
}

10
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp
View File

@ -243,24 +243,24 @@ void RimPlotDataFilterItem::fieldChangedByUi( const caf::PdmFieldHandle* changed
{
if ( changedField == &m_filterTarget )
{
this->updateMaxMinAndDefaultValues( true );
updateMaxMinAndDefaultValues( true );
}
else if ( changedField == &m_filterQuantityUiField )
{
m_filterAddress->setAddress( m_filterQuantityUiField );
this->updateMaxMinAndDefaultValues( true );
updateMaxMinAndDefaultValues( true );
}
else if ( changedField == &m_filterEnsembleParameter )
{
this->updateMaxMinAndDefaultValues( true );
updateMaxMinAndDefaultValues( true );
}
else if ( changedField == &m_filterOperation )
{
this->updateMaxMinAndDefaultValues( false );
updateMaxMinAndDefaultValues( false );
}
else if ( changedField == &m_consideredTimestepsType || changedField == &m_explicitlySelectedTimeSteps )
{
this->updateMaxMinAndDefaultValues( false );
updateMaxMinAndDefaultValues( false );
}
filterChanged.send();
}

4
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp
View File

@ -203,10 +203,10 @@ void RimPolylinesFromFileAnnotation::fieldChangedByUi( const caf::PdmFieldHandle
if ( changedField == &m_polyLinesFileName )
{
QString errorMessage;
this->readPolyLinesFile( &errorMessage );
readPolyLinesFile( &errorMessage );
if ( !errorMessage.isEmpty() )
{
QString totalError = "\nError in: " + this->fileName() + "\n\t" + errorMessage;
QString totalError = "\nError in: " + fileName() + "\n\t" + errorMessage;
RiaLogging::errorInMessageBox( nullptr, "Import Polylines", totalError );
}
}

4
ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp
View File

@ -145,11 +145,11 @@ void RimReachCircleAnnotation::fieldChangedByUi( const caf::PdmFieldHandle* chan
if ( changedField == &m_centerPointXyd )
{
m_centerPointPickEnabled = false;
this->updateConnectedEditors();
updateConnectedEditors();
}
if ( changedField == &m_centerPointPickEnabled )
{
this->updateConnectedEditors();
updateConnectedEditors();
}
auto annColl = firstAncestorOrThisOfTypeAsserted<RimAnnotationCollection>();

8
ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
View File

@ -45,7 +45,7 @@ CAF_PDM_SOURCE_INIT( RimTextAnnotation, "RimTextAnnotation" );
RimTextAnnotation::RimTextAnnotation()
{
CAF_PDM_InitObject( "TextAnnotation", ":/TextAnnotation16x16.png" );
this->setUi3dEditorTypeName( RicTextAnnotation3dEditor::uiEditorTypeName() );
setUi3dEditorTypeName( RicTextAnnotation3dEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point" );
m_anchorPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
@ -172,16 +172,16 @@ void RimTextAnnotation::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
{
m_labelPointXyd = m_anchorPointXyd;
}
this->updateConnectedEditors();
updateConnectedEditors();
}
if ( changedField == &m_labelPointXyd )
{
m_labelPointPickEnabledButtonField = false;
this->updateConnectedEditors();
updateConnectedEditors();
}
if ( changedField == &m_anchorPointPickEnabledButtonField || changedField == &m_labelPointPickEnabledButtonField )
{
this->updateConnectedEditors();
updateConnectedEditors();
}
auto annColl = firstAncestorOrThisOfTypeAsserted<RimAnnotationCollectionBase>();

4
ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp
View File

@ -59,7 +59,7 @@ RimUserDefinedPolylinesAnnotation::RimUserDefinedPolylinesAnnotation()
m_targets.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
m_targets.uiCapability()->setCustomContextMenuEnabled( true );
this->setUi3dEditorTypeName( RicPolyline3dEditor::uiEditorTypeName() );
setUi3dEditorTypeName( RicPolyline3dEditor::uiEditorTypeName() );
}
//--------------------------------------------------------------------------------------------------
@ -259,7 +259,7 @@ void RimUserDefinedPolylinesAnnotation::fieldChangedByUi( const caf::PdmFieldHan
{
if ( changedField == &m_enablePicking )
{
this->updateConnectedEditors();
updateConnectedEditors();
}
else if ( changedField == &m_showLines )
{

4
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp
View File

@ -175,7 +175,7 @@ bool RimCellFilter::propagateToSubGrids() const
//--------------------------------------------------------------------------------------------------
void RimCellFilter::updateIconState()
{
caf::IconProvider iconProvider = this->uiIconProvider();
caf::IconProvider iconProvider = uiIconProvider();
if ( !iconProvider.valid() ) return;
@ -190,7 +190,7 @@ void RimCellFilter::updateIconState()
iconProvider.setActive( m_isActive && !m_isActive.uiCapability()->isUiReadOnly() );
this->setUiIcon( iconProvider );
setUiIcon( iconProvider );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
View File

@ -277,7 +277,7 @@ void RimCellFilterCollection::addFilter( RimCellFilter* pFilter )
setAutoName( pFilter );
m_cellFilters.push_back( pFilter );
connectToFilterUpdates( pFilter );
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp
View File

@ -163,7 +163,7 @@ void RimCellRangeFilter::computeAndSetValidValues()
cellCountK = std::clamp( cellCountK.v(), 1, static_cast<int>( grid->cellCountK() ) );
startIndexK = std::clamp( startIndexK.v(), 1, static_cast<int>( grid->cellCountK() ) );
}
this->updateIconState();
updateIconState();
}
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp
View File

@ -125,8 +125,8 @@ RimEclipseResultDefinition* RimEclipsePropertyFilter::resultDefinition() const
//--------------------------------------------------------------------------------------------------
void RimEclipsePropertyFilter::rangeValues( double* lower, double* upper ) const
{
*lower = this->m_lowerBound;
*upper = this->m_upperBound;
*lower = m_lowerBound;
*upper = m_upperBound;
}
//--------------------------------------------------------------------------------------------------
@ -166,11 +166,11 @@ void RimEclipsePropertyFilter::fieldChangedByUi( const caf::PdmFieldHandle* chan
{
m_isDuplicatedFromLinkedView = false;
this->m_resultDefinition->loadResult();
this->computeResultValueRange();
m_resultDefinition->loadResult();
computeResultValueRange();
updateFilterName();
this->updateIconState();
this->uiCapability()->updateConnectedEditors();
updateIconState();
uiCapability()->updateConnectedEditors();
parentContainer()->updateDisplayModelNotifyManagedViews( this );
}

10
ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp
View File

@ -80,9 +80,9 @@ void RimGeoMechPropertyFilter::fieldChangedByUi( const caf::PdmFieldHandle* chan
if ( &lowerBound == changedField || &upperBound == changedField || &m_isActive == changedField || &m_filterMode == changedField ||
&m_selectedCategoryValues == changedField )
{
this->updateIconState();
this->updateFilterName();
this->uiCapability()->updateConnectedEditors();
updateIconState();
updateFilterName();
uiCapability()->updateConnectedEditors();
parentContainer()->updateDisplayModelNotifyManagedViews( this );
}
@ -118,7 +118,7 @@ void RimGeoMechPropertyFilter::setToDefaultValues()
m_selectedCategoryValues = m_categoryValues;
this->updateFilterName();
updateFilterName();
}
//--------------------------------------------------------------------------------------------------
@ -213,7 +213,7 @@ void RimGeoMechPropertyFilter::updateActiveState()
//--------------------------------------------------------------------------------------------------
bool RimGeoMechPropertyFilter::isActiveAndHasResult()
{
return this->isActive() && this->resultDefinition->hasResult();
return isActive() && resultDefinition->hasResult();
}
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp
View File

@ -161,8 +161,8 @@ RimPolygonFilter::RimPolygonFilter()
m_polygonPlaneDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
m_polygonPlaneDepth.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::TOP );
this->setUi3dEditorTypeName( RicPolyline3dEditor::uiEditorTypeName() );
this->uiCapability()->setUiTreeChildrenHidden( true );
setUi3dEditorTypeName( RicPolyline3dEditor::uiEditorTypeName() );
uiCapability()->setUiTreeChildrenHidden( true );
m_propagateToSubGrids = false;
@ -412,7 +412,7 @@ void RimPolygonFilter::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
bool readOnlyState = isFilterControlled();
std::vector<caf::PdmFieldHandle*> objFields = this->fields();
std::vector<caf::PdmFieldHandle*> objFields = fields();
for ( auto& objField : objFields )
{
objField->uiCapability()->setUiReadOnly( readOnlyState );
@ -426,7 +426,7 @@ void RimPolygonFilter::fieldChangedByUi( const caf::PdmFieldHandle* changedField
{
if ( changedField == &m_enablePicking )
{
this->updateConnectedEditors();
updateConnectedEditors();
enableFilter( !m_enablePicking() );
filterChanged.send();
@ -435,7 +435,7 @@ void RimPolygonFilter::fieldChangedByUi( const caf::PdmFieldHandle* changedField
{
updateCells();
filterChanged.send();
this->updateIconState();
updateIconState();
}
}
@ -487,7 +487,7 @@ void RimPolygonFilter::updateCompundFilter( cvf::CellRangeFilter* cellRangeFilte
for ( size_t cellidx : m_cells[gridIndex] )
{
grid->ijkFromCellIndex( cellidx, &i, &j, &k );
if ( this->filterMode() == RimCellFilter::INCLUDE )
if ( filterMode() == RimCellFilter::INCLUDE )
{
cellRangeFilter->addCellInclude( i, j, k, propagateToSubGrids() );
}

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimUserDefinedFilter.cpp
View File

@ -85,7 +85,7 @@ void RimUserDefinedFilter::updateCompundFilter( cvf::CellRangeFilter* cellRangeF
if ( gridIndex != m_gridIndex ) return;
if ( this->filterMode() == RimCellFilter::INCLUDE )
if ( filterMode() == RimCellFilter::INCLUDE )
{
for ( const auto& cellIndex : m_individualCellIndices() )
{

4
ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@ -154,7 +154,7 @@ void RimEllipseFractureTemplate::changeUnits()
convertToUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_METRIC );
}
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
@ -303,7 +303,7 @@ void RimEllipseFractureTemplate::setDefaultValuesFromUnit()
// Default to 1/3 of height
m_wellPathDepthAtFracture = m_height / 3.0;
this->setDefaultWellDiameterFromUnit();
setDefaultWellDiameterFromUnit();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp
View File

@ -290,7 +290,7 @@ void RimEnsembleFractureStatistics::fieldChangedByUi( const caf::PdmFieldHandle*
#ifdef USE_QTCHARTS
// Update referring plots
std::vector<caf::PdmObjectHandle*> referringObjects = this->objectsWithReferringPtrFields();
std::vector<caf::PdmObjectHandle*> referringObjects = objectsWithReferringPtrFields();
for ( caf::PdmObjectHandle* obj : referringObjects )
{
auto plot = dynamic_cast<RimEnsembleFractureStatisticsPlot*>( obj );

2
ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp
View File

@ -152,7 +152,7 @@ bool RimFishbones::isActive() const
//--------------------------------------------------------------------------------------------------
QString RimFishbones::generatedName() const
{
caf::PdmChildArrayField<RimFishbones*>* container = dynamic_cast<caf::PdmChildArrayField<RimFishbones*>*>( this->parentField() );
caf::PdmChildArrayField<RimFishbones*>* container = dynamic_cast<caf::PdmChildArrayField<RimFishbones*>*>( parentField() );
CVF_ASSERT( container );
size_t index = container->indexOf( this ) + 1;

2
ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
View File

@ -43,7 +43,7 @@ RimFishbonesCollection::RimFishbonesCollection()
CAF_PDM_InitObject( "Fishbones", ":/FishBones16x16.png" );
nameField()->uiCapability()->setUiHidden( true );
this->setName( "Fishbones" );
setName( "Fishbones" );
CAF_PDM_InitFieldNoDefault( &m_fishbones, "FishbonesSubs", "fishbonesSubs" );
m_fishbones.uiCapability()->setUiTreeHidden( true );

12
ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@ -206,7 +206,7 @@ std::vector<size_t> RimFracture::getPotentiallyFracturedCells( const RigMainGrid
std::vector<size_t> cellindecies;
if ( !mainGrid ) return cellindecies;
cvf::BoundingBox fractureBBox = this->boundingBoxInDomainCoords();
cvf::BoundingBox fractureBBox = boundingBoxInDomainCoords();
mainGrid->findIntersectingCells( fractureBBox, &cellindecies );
@ -279,7 +279,7 @@ void RimFracture::fieldChangedByUi( const caf::PdmFieldHandle* changedField, con
}
if ( changedField == &m_azimuth || changedField == &m_fractureTemplate || changedField == &m_stimPlanTimeIndexToPlot ||
changedField == this->objectToggleField() || changedField == &m_dip || changedField == &m_tilt || changedField == &m_perforationLength )
changedField == objectToggleField() || changedField == &m_dip || changedField == &m_tilt || changedField == &m_perforationLength )
{
clearCachedNonDarcyProperties();
@ -461,7 +461,7 @@ cvf::BoundingBox RimFracture::boundingBoxInDomainCoords() const
std::vector<cvf::Vec3f> nodeCoordVec;
std::vector<cvf::uint> triangleIndices;
this->triangleGeometryTransformed( &triangleIndices, &nodeCoordVec, true );
triangleGeometryTransformed( &triangleIndices, &nodeCoordVec, true );
cvf::BoundingBox fractureBBox;
for ( const auto& nodeCoord : nodeCoordVec )
@ -902,10 +902,10 @@ void RimFracture::setFractureTemplate( RimFractureTemplate* fractureTemplate )
}
else
{
this->updateAzimuthBasedOnWellAzimuthAngle();
updateAzimuthBasedOnWellAzimuthAngle();
}
this->m_wellDiameter = fractureTemplate->wellDiameter();
this->m_perforationLength = fractureTemplate->perforationLength();
m_wellDiameter = fractureTemplate->wellDiameter();
m_perforationLength = fractureTemplate->perforationLength();
clearCachedNonDarcyProperties();

2
ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@ -877,7 +877,7 @@ void RimFractureTemplate::loadDataAndUpdateGeometryHasChanged()
//--------------------------------------------------------------------------------------------------
std::vector<RimFracture*> RimFractureTemplate::fracturesUsingThisTemplate() const
{
return this->objectsWithReferringPtrFieldsOfType<RimFracture>();
return objectsWithReferringPtrFieldsOfType<RimFracture>();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
View File

@ -290,7 +290,7 @@ void RimMswCompletionParameters::fieldChangedByUi( const caf::PdmFieldHandle* ch
if ( changedField == &m_refMDType )
{
m_refMD.uiCapability()->setUiHidden( m_refMDType == ReferenceMDType::AUTO_REFERENCE_MD );
this->updateAllRequiredEditors();
updateAllRequiredEditors();
}
if ( changedField == &m_enforceMaxSegmentLength )

2
ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
View File

@ -43,7 +43,7 @@ RimPerforationCollection::RimPerforationCollection()
CAF_PDM_InitObject( "Perforations", ":/PerforationIntervals16x16.png" );
nameField()->uiCapability()->setUiHidden( true );
this->setName( "Perforations" );
setName( "Perforations" );
CAF_PDM_InitFieldNoDefault( &m_perforations, "Perforations", "Perforations" );
m_perforations.uiCapability()->setUiTreeHidden( true );

6
ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
View File

@ -238,7 +238,7 @@ void RimPerforationInterval::updateAllReferringTracks()
{
track->loadDataAndUpdate();
}
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
@ -320,7 +320,7 @@ void RimPerforationInterval::fieldChangedByUi( const caf::PdmFieldHandle* change
}
}
this->updateAllReferringTracks();
updateAllReferringTracks();
RimProject* proj = RimProject::current();
proj->reloadCompletionTypeResultsInAllViews();
@ -331,7 +331,7 @@ void RimPerforationInterval::fieldChangedByUi( const caf::PdmFieldHandle* change
//--------------------------------------------------------------------------------------------------
void RimPerforationInterval::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
{
this->setName( QString( "%1 - %2" ).arg( m_startMD ).arg( m_endMD ) );
setName( QString( "%1 - %2" ).arg( m_startMD ).arg( m_endMD ) );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
View File

@ -212,7 +212,7 @@ void RimSimWellFracture::updateFracturePositionFromLocation()
{
cvf::Vec3d interpolated = m_branchCenterLines[m_branchIndex()].interpolatedPointAlongWellPath( m_location() );
this->setAnchorPosition( interpolated );
setAnchorPosition( interpolated );
RimProject* proj = RimProject::current();
if ( proj ) proj->scheduleCreateDisplayModelAndRedrawAllViews();

12
ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp
View File

@ -42,7 +42,7 @@ RimValveTemplate::RimValveTemplate()
m_type = RiaDefines::WellPathComponentType::ICD;
CAF_PDM_InitField( &m_userLabel, "UserLabel", QString( "Template" ), "Name" );
this->setName( fullLabel() );
setName( fullLabel() );
CAF_PDM_InitField( &m_orificeDiameter, "OrificeDiameter", 8.0, "Orifice Diameter [mm]" );
CAF_PDM_InitField( &m_flowCoefficient, "FlowCoefficient", 0.7, "Flow Coefficient" );
@ -234,7 +234,7 @@ void RimValveTemplate::fieldChangedByUi( const caf::PdmFieldHandle* changedField
{
if ( changedField == &m_type || changedField == &m_userLabel )
{
this->setName( fullLabel() );
setName( fullLabel() );
}
if ( changedField == &m_type )
{
@ -252,17 +252,17 @@ void RimValveTemplate::fieldChangedByUi( const caf::PdmFieldHandle* changedField
//--------------------------------------------------------------------------------------------------
void RimValveTemplate::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
{
this->setName( fullLabel() );
setName( fullLabel() );
if ( m_type() == RiaDefines::WellPathComponentType::ICV )
{
this->setUiIconFromResourceString( ":/ICVValve16x16.png" );
setUiIconFromResourceString( ":/ICVValve16x16.png" );
}
else if ( m_type() == RiaDefines::WellPathComponentType::ICD )
{
this->setUiIconFromResourceString( ":/ICDValve16x16.png" );
setUiIconFromResourceString( ":/ICDValve16x16.png" );
}
else if ( m_type() == RiaDefines::WellPathComponentType::AICD )
{
this->setUiIconFromResourceString( ":/AICDValve16x16.png" );
setUiIconFromResourceString( ":/AICDValve16x16.png" );
}
}

2
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
View File

@ -246,7 +246,7 @@ void RimWellPathFracture::updatePositionFromMeasuredDepth()
positionAlongWellpath = wellPathGeometry->interpolatedPointAlongWellPath( m_measuredDepth() );
}
this->setAnchorPosition( positionAlongWellpath );
setAnchorPosition( positionAlongWellpath );
}
//--------------------------------------------------------------------------------------------------

16
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp
View File

@ -181,33 +181,33 @@ void RimWellPathValve::applyValveLabelAndIcon()
{
if ( componentType() == RiaDefines::WellPathComponentType::ICV )
{
this->setUiIconFromResourceString( ":/ICVValve16x16.png" );
setUiIconFromResourceString( ":/ICVValve16x16.png" );
QString fullName = QString( "%1: %2" ).arg( componentLabel() ).arg( m_measuredDepth() );
this->setName( fullName );
setName( fullName );
}
else if ( componentType() == RiaDefines::WellPathComponentType::ICD )
{
this->setUiIconFromResourceString( ":/ICDValve16x16.png" );
setUiIconFromResourceString( ":/ICDValve16x16.png" );
QString fullName = QString( "%1 %2: %3 - %4" )
.arg( m_multipleValveLocations->valveLocations().size() )
.arg( componentLabel() )
.arg( m_multipleValveLocations->rangeStart() )
.arg( m_multipleValveLocations->rangeEnd() );
this->setName( fullName );
setName( fullName );
}
else if ( componentType() == RiaDefines::WellPathComponentType::AICD )
{
this->setUiIconFromResourceString( ":/AICDValve16x16.png" );
setUiIconFromResourceString( ":/AICDValve16x16.png" );
QString fullName = QString( "%1 %2: %3 - %4" )
.arg( m_multipleValveLocations->valveLocations().size() )
.arg( componentLabel() )
.arg( m_multipleValveLocations->rangeStart() )
.arg( m_multipleValveLocations->rangeEnd() );
this->setName( fullName );
setName( fullName );
}
else
{
this->setName( "Unspecified Valve" );
setName( "Unspecified Valve" );
}
}
@ -481,7 +481,7 @@ void RimWellPathValve::fieldChangedByUi( const caf::PdmFieldHandle* changedField
if ( changedField == &m_valveTemplate )
{
applyValveLabelAndIcon();
this->updateConnectedEditors();
updateConnectedEditors();
}
else if ( changedField == &m_createValveTemplate )
{

22
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
View File

@ -53,7 +53,7 @@ RimAbstractCorrelationPlot::RimAbstractCorrelationPlot()
: m_selectMultipleVectors( false )
{
CAF_PDM_InitObject( "Abstract Correlation Plot", ":/CorrelationPlot16x16.png" );
this->setDeletable( true );
setDeletable( true );
CAF_PDM_InitFieldNoDefault( &m_selectedVarsUiField, "SelectedVariableDisplayVar", "Vector" );
m_selectedVarsUiField.xmlCapability()->disableIO();
@ -161,8 +161,8 @@ void RimAbstractCorrelationPlot::fieldChangedByUi( const caf::PdmFieldHandle* ch
m_dataSources.push_back( plotEntry );
}
connectAllCaseSignals();
this->loadDataAndUpdate();
this->updateConnectedEditors();
loadDataAndUpdate();
updateConnectedEditors();
}
}
@ -170,17 +170,17 @@ void RimAbstractCorrelationPlot::fieldChangedByUi( const caf::PdmFieldHandle* ch
}
else if ( changedField == &m_timeStep )
{
this->loadDataAndUpdate();
this->updateConnectedEditors();
loadDataAndUpdate();
updateConnectedEditors();
}
else if ( changedField == &m_showPlotTitle || changedField == &m_useAutoPlotTitle || changedField == &m_description )
{
this->updatePlotTitle();
updatePlotTitle();
}
else if ( changedField == &m_labelFontSize || changedField == &m_axisTitleFontSize || changedField == &m_axisValueFontSize ||
changedField == &m_legendFontSize || changedField == &m_titleFontSize )
{
this->loadDataAndUpdate();
loadDataAndUpdate();
}
else if ( changedField == &m_timeStepFilter )
{
@ -196,17 +196,17 @@ void RimAbstractCorrelationPlot::fieldChangedByUi( const caf::PdmFieldHandle* ch
m_timeStep = allDateTimes[filteredTimeStepIndices.back()];
this->updateConnectedEditors();
updateConnectedEditors();
}
else if ( changedField == &m_curveSetForFiltering )
{
connectCurveFilterSignals();
this->loadDataAndUpdate();
loadDataAndUpdate();
}
else if ( changedField == &m_useCaseFilter )
{
this->loadDataAndUpdate();
loadDataAndUpdate();
}
else if ( changedField == &m_editCaseFilter )
{
@ -370,7 +370,7 @@ RiaSummaryCurveDefinitionAnalyser* RimAbstractCorrelationPlot::getOrCreateSelect
m_analyserOfSelectedCurveDefs = std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>( new RiaSummaryCurveDefinitionAnalyser );
}
m_analyserOfSelectedCurveDefs->setCurveDefinitions( this->curveDefinitions() );
m_analyserOfSelectedCurveDefs->setCurveDefinitions( curveDefinitions() );
return m_analyserOfSelectedCurveDefs.get();
}

8
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
View File

@ -171,7 +171,7 @@ RimCorrelationMatrixPlot::RimCorrelationMatrixPlot()
setLegendsVisible( false );
this->uiCapability()->setUiTreeChildrenHidden( true );
uiCapability()->setUiTreeChildrenHidden( true );
m_selectMultipleVectors = true;
}
@ -376,8 +376,8 @@ void RimCorrelationMatrixPlot::onLoadDataAndUpdate()
m_plotWidget->qwtPlot()->insertLegend( nullptr );
this->updateAxes();
this->updatePlotTitle();
updateAxes();
updatePlotTitle();
m_plotWidget->scheduleReplot();
}
}
@ -387,7 +387,7 @@ void RimCorrelationMatrixPlot::onLoadDataAndUpdate()
//--------------------------------------------------------------------------------------------------
void RimCorrelationMatrixPlot::childFieldChangedByUi( const caf::PdmFieldHandle* changedChildField )
{
this->loadDataAndUpdate();
loadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
View File

@ -195,8 +195,8 @@ void RimCorrelationPlot::onLoadDataAndUpdate()
m_plotWidget->qwtPlot()->insertLegend( nullptr );
m_plotWidget->updateLegend();
this->updateAxes();
this->updatePlotTitle();
updateAxes();
updatePlotTitle();
m_plotWidget->scheduleReplot();
}
}

8
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
View File

@ -54,7 +54,7 @@ CAF_PDM_SOURCE_INIT( RimCorrelationReportPlot, "CorrelationReportPlot" );
RimCorrelationReportPlot::RimCorrelationReportPlot()
{
CAF_PDM_InitObject( "Correlation Report Plot", ":/CorrelationReportPlot16x16.png" );
this->setDeletable( true );
setDeletable( true );
CAF_PDM_InitFieldNoDefault( &m_plotWindowTitle, "PlotWindowTitle", "Title" );
m_plotWindowTitle.registerGetMethod( this, &RimCorrelationReportPlot::createPlotWindowTitle );
@ -91,7 +91,7 @@ RimCorrelationReportPlot::RimCorrelationReportPlot()
m_parameterResultCrossPlot = new RimParameterResultCrossPlot;
m_parameterResultCrossPlot->setLegendsVisible( true );
this->uiCapability()->setUiTreeChildrenHidden( true );
uiCapability()->setUiTreeChildrenHidden( true );
m_correlationMatrixPlot->matrixCellSelected.connect( this, &RimCorrelationReportPlot::onDataSelection );
m_correlationPlot->tornadoItemSelected.connect( this, &RimCorrelationReportPlot::onDataSelection );
@ -367,7 +367,7 @@ void RimCorrelationReportPlot::defineUiOrdering( QString uiConfigName, caf::PdmU
//--------------------------------------------------------------------------------------------------
void RimCorrelationReportPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
this->loadDataAndUpdate();
loadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
@ -375,7 +375,7 @@ void RimCorrelationReportPlot::fieldChangedByUi( const caf::PdmFieldHandle* chan
//--------------------------------------------------------------------------------------------------
void RimCorrelationReportPlot::childFieldChangedByUi( const caf::PdmFieldHandle* changedChildField )
{
this->loadDataAndUpdate();
loadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
View File

@ -106,8 +106,8 @@ void RimParameterResultCrossPlot::fieldChangedByUi( const caf::PdmFieldHandle* c
RimAbstractCorrelationPlot::fieldChangedByUi( changedField, oldValue, newValue );
if ( changedField == &m_ensembleParameter )
{
this->loadDataAndUpdate();
this->updateConnectedEditors();
loadDataAndUpdate();
updateConnectedEditors();
}
}
@ -171,8 +171,8 @@ void RimParameterResultCrossPlot::onLoadDataAndUpdate()
m_plotWidget->updateLegend();
}
this->updateAxes();
this->updatePlotTitle();
updateAxes();
updatePlotTitle();
m_plotWidget->scheduleReplot();
}
}

6
ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp
View File

@ -65,7 +65,7 @@ caf::PdmFieldHandle* RimFaultInView::userDescriptionField()
//--------------------------------------------------------------------------------------------------
void RimFaultInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
this->updateUiIconFromToggleField();
updateUiIconFromToggleField();
if ( &faultColor == changedField || &showFault == changedField )
{
@ -83,7 +83,7 @@ void RimFaultInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
//--------------------------------------------------------------------------------------------------
void RimFaultInView::initAfterRead()
{
this->updateUiIconFromToggleField();
updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
@ -101,7 +101,7 @@ void RimFaultInView::setFaultGeometry( const RigFault* faultGeometry )
{
m_rigFault = faultGeometry;
this->name = faultGeometry->name();
name = faultGeometry->name();
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
View File

@ -190,7 +190,7 @@ bool RimFaultInViewCollection::hideNNCsWhenNoResultIsAvailable() const
//--------------------------------------------------------------------------------------------------
void RimFaultInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
this->updateUiIconFromToggleField();
updateUiIconFromToggleField();
if ( &m_faultLabelColor == changedField )
{
@ -307,7 +307,7 @@ void RimFaultInViewCollection::syncronizeFaults()
// Find corresponding fault from data model, or create a new
for ( size_t fIdx = 0; fIdx < rigFaults.size(); ++fIdx )
{
RimFaultInView* rimFault = this->findFaultByName( rigFaults[fIdx]->name() );
RimFaultInView* rimFault = findFaultByName( rigFaults[fIdx]->name() );
if ( !rimFault )
{

6
ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@ -102,7 +102,7 @@ RimFlowCharacteristicsPlot::RimFlowCharacteristicsPlot()
CAF_PDM_InitField( &m_minCommunication, "MinCommunication", 0.0, "Min Communication" );
CAF_PDM_InitField( &m_maxTof, "MaxTof", 146000, "Max Time of Flight [days]" );
this->m_showWindow = false;
m_showWindow = false;
setAsPlotMdiWindow();
setDeletable( true );
}
@ -186,7 +186,7 @@ void RimFlowCharacteristicsPlot::updateCurrentTimeStep()
if ( m_currentlyPlottedTimeSteps == calculatedTimesteps ) return;
this->onLoadDataAndUpdate();
onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
@ -599,7 +599,7 @@ void RimFlowCharacteristicsPlot::fieldChangedByUi( const caf::PdmFieldHandle* ch
// All fields update plot
this->onLoadDataAndUpdate();
onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp
View File

@ -164,7 +164,7 @@ RimWellConnectivityTable* RimFlowPlotCollection::defaultWellConnectivityTable()
m_defaultWellConnectivityTable = new RimWellConnectivityTable;
}
this->updateConnectedEditors();
updateConnectedEditors();
return m_defaultWellConnectivityTable;
}
@ -180,7 +180,7 @@ RimWellAllocationOverTimePlot* RimFlowPlotCollection::defaultWellAllocOverTimePl
m_defaultWellAllocOverTimePlot->setDescription( "Default Well Allocation Over Time Plot" );
}
this->updateConnectedEditors();
updateConnectedEditors();
return m_defaultWellAllocOverTimePlot();
}
@ -196,7 +196,7 @@ RimWellAllocationPlot* RimFlowPlotCollection::defaultWellAllocPlot()
m_defaultWellAllocPlot->setDescription( "Default Flow Diagnostics Plot" );
}
this->updateConnectedEditors();
updateConnectedEditors();
return m_defaultWellAllocPlot();
}
@ -211,7 +211,7 @@ RimFlowCharacteristicsPlot* RimFlowPlotCollection::defaultFlowCharacteristicsPlo
m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot;
}
this->updateConnectedEditors();
updateConnectedEditors();
return m_flowCharacteristicsPlot();
}

2
ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
View File

@ -199,7 +199,7 @@ QImage RimTofAccumulatedPhaseFractionsPlot::snapshotWindowContent()
void RimTofAccumulatedPhaseFractionsPlot::setDescription( const QString& description )
{
m_userName = description;
this->updateMdiWindowTitle();
updateMdiWindowTitle();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
View File

@ -156,7 +156,7 @@ QImage RimTotalWellAllocationPlot::snapshotWindowContent()
void RimTotalWellAllocationPlot::setDescription( const QString& description )
{
m_userName = description;
this->updateMdiWindowTitle();
updateMdiWindowTitle();
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
View File

@ -120,7 +120,7 @@ RimWellAllocationPlot::RimWellAllocationPlot()
m_tofAccumulatedPhaseFractionsPlot.uiCapability()->setUiTreeHidden( true );
m_tofAccumulatedPhaseFractionsPlot = new RimTofAccumulatedPhaseFractionsPlot;
this->setAsPlotMdiWindow();
setAsPlotMdiWindow();
m_accumulatedWellFlowPlot->setAvailableDepthUnits( {} );
m_accumulatedWellFlowPlot->setAvailableDepthTypes( { RiaDefines::DepthTypeEnum::CONNECTION_NUMBER,
@ -631,7 +631,7 @@ QList<caf::PdmOptionItemInfo> RimWellAllocationPlot::calculateValueOptions( cons
if ( fieldNeedingOptions == &m_wellName )
{
std::set<QString> sortedWellNames = this->findSortedWellNames();
std::set<QString> sortedWellNames = findSortedWellNames();
caf::IconProvider simWellIcon( ":/Well.svg" );
for ( const QString& wname : sortedWellNames )

6
ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
View File

@ -159,7 +159,7 @@ QString RimWellFlowRateCurve::createCurveAutoName()
//--------------------------------------------------------------------------------------------------
void RimWellFlowRateCurve::onLoadDataAndUpdate( bool updateParentPlot )
{
this->RimPlotCurve::updateCurvePresentation( updateParentPlot );
RimPlotCurve::updateCurvePresentation( updateParentPlot );
m_plotCurve->setTitle( createCurveAutoName() );
@ -185,7 +185,7 @@ void RimWellFlowRateCurve::updateCurveAppearance()
{
auto wellLogTrack = firstAncestorOrThisOfTypeAsserted<RimWellLogTrack>();
std::map<int, std::vector<RimWellLogCurve*>> stackedCurveGroups = wellLogTrack->visibleStackedCurves();
const std::vector<RimWellLogCurve*>& curveGroup = stackedCurveGroups[this->m_groupId];
const std::vector<RimWellLogCurve*>& curveGroup = stackedCurveGroups[m_groupId];
if ( !curveGroup.empty() )
{
@ -288,7 +288,7 @@ void RimWellFlowRateCurve::setFlowValuesPrDepthValue( const QString&
const std::vector<double>& flowRates )
{
bool useLogarithmicScale = false;
this->setPropertyValuesAndDepths( flowRates, depthValues, depthType, 0.0, RiaDefines::DepthUnitType::UNIT_NONE, false, useLogarithmicScale );
setPropertyValuesAndDepths( flowRates, depthValues, depthType, 0.0, RiaDefines::DepthUnitType::UNIT_NONE, false, useLogarithmicScale );
m_curveAutoName = curveName;
}

Some files were not shown because too many files have changed in this diff Show More