diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp index 64b3ba50e5..ae815a1b33 100644 --- a/ApplicationLibCode/Application/RiaApplication.cpp +++ b/ApplicationLibCode/Application/RiaApplication.cpp @@ -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( 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(); diff --git a/ApplicationLibCode/Application/RiaConsoleApplication.cpp b/ApplicationLibCode/Application/RiaConsoleApplication.cpp index c5f348dd0c..b40ee52e0f 100644 --- a/ApplicationLibCode/Application/RiaConsoleApplication.cpp +++ b/ApplicationLibCode/Application/RiaConsoleApplication.cpp @@ -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; } diff --git a/ApplicationLibCode/Application/RiaGuiApplication.cpp b/ApplicationLibCode/Application/RiaGuiApplication.cpp index 6998407515..c752003829 100644 --- a/ApplicationLibCode/Application/RiaGuiApplication.cpp +++ b/ApplicationLibCode/Application/RiaGuiApplication.cpp @@ -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 allViewWindows = project()->descendantsIncludingThisOfType(); diff --git a/ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp b/ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp index 7fb9210bdb..19084db449 100644 --- a/ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp +++ b/ApplicationLibCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp @@ -232,8 +232,8 @@ void RiaSCurveCalculator::initializeByFinding_q1q2( cvf::Vec3d p1, double azi1, if ( ev_0.curveStatus() == RiaSCurveCalculator::OK_INFINITE_RADIUS12 ) { - *this = ev_0; - this->m_solveStatus = CONVERGED; + *this = ev_0; + m_solveStatus = CONVERGED; return; } // Todo: Handle infinite radius in one place diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp index b456e06a34..7d6352cbe8 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp @@ -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" ); diff --git a/ApplicationLibCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.cpp b/ApplicationLibCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.cpp index f9e5ea74dc..cf23e0f5f1 100644 --- a/ApplicationLibCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.cpp +++ b/ApplicationLibCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.cpp @@ -55,7 +55,7 @@ RicTextAnnotation3dEditor::~RicTextAnnotation3dEditor() ownerRiuViewer->removeStaticModel( m_cvfModel.p() ); } - auto textAnnot = dynamic_cast( this->pdmObject() ); + auto textAnnot = dynamic_cast( 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( this->pdmObject() ); + RimTextAnnotation* textAnnot = dynamic_cast( pdmObject() ); RiuViewer* ownerRiuViewer = dynamic_cast( ownerViewer() ); Rim3dView* view = mainOrComparisonView(); @@ -126,7 +126,7 @@ void RicTextAnnotation3dEditor::configureAndUpdateUi( const QString& uiConfigNam //-------------------------------------------------------------------------------------------------- void RicTextAnnotation3dEditor::cleanupBeforeSettingPdmObject() { - RimTextAnnotation* textAnnot = dynamic_cast( this->pdmObject() ); + RimTextAnnotation* textAnnot = dynamic_cast( 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( this->pdmObject() ); + RimTextAnnotation* textAnnot = dynamic_cast( 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( this->pdmObject() ); + RimTextAnnotation* textAnnot = dynamic_cast( pdmObject() ); if ( !textAnnot ) { diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicCloseProjectFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicCloseProjectFeature.cpp index b2d0f1caad..4a6e83fc53 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicCloseProjectFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicCloseProjectFeature.cpp @@ -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; diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp index 55beb9ad61..0b41b4def7 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp @@ -53,7 +53,7 @@ std::vector findFontObjects() //-------------------------------------------------------------------------------------------------- void RicEditPreferencesFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RiaGuiApplication* app = RiaGuiApplication::instance(); diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp index a0c235b9a5..b15eb2e983 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp @@ -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; diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicHelpFeatures.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicHelpFeatures.cpp index 8ef6c4b160..b927d259c2 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicHelpFeatures.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicHelpFeatures.cpp @@ -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/"; diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicLaunchUnitTestsFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicLaunchUnitTestsFeature.cpp index 224fcc2c10..7f3aded561 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicLaunchUnitTestsFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicLaunchUnitTestsFeature.cpp @@ -30,7 +30,7 @@ CAF_CMD_SOURCE_INIT( RicLaunchUnitTestsFeature, "RicLaunchUnitTestsFeature" ); //-------------------------------------------------------------------------------------------------- void RicLaunchUnitTestsFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RiaApplication::instance()->launchUnitTestsWithConsole(); } diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp index 3239f900ad..dca44f65bf 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp @@ -42,7 +42,7 @@ RicSaveProjectAsFeature::RicSaveProjectAsFeature() //-------------------------------------------------------------------------------------------------- caf::PdmScriptResponse RicSaveProjectAsFeature::execute() { - this->disableModelChangeContribution(); + disableModelChangeContribution(); QString errorMessage; if ( !RiaApplication::instance()->saveProjectAs( m_filePath(), &errorMessage ) ) { diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp index b0dd2ff69c..f3b9702ac9 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp @@ -39,7 +39,7 @@ RicSaveProjectFeature::RicSaveProjectFeature() //-------------------------------------------------------------------------------------------------- caf::PdmScriptResponse RicSaveProjectFeature::execute() { - this->disableModelChangeContribution(); + disableModelChangeContribution(); bool worked = false; QString errorMessage; diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp index 8cffdb5853..02d50586bf 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp @@ -80,7 +80,7 @@ void RicShowMainWindowFeature::showMainWindow() //-------------------------------------------------------------------------------------------------- void RicShowMainWindowFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RicShowMainWindowFeature::showMainWindow(); } diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp index e54d035fff..340f3351a0 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp @@ -217,7 +217,7 @@ void RicShowPlotDataFeature::onActionTriggered( bool isChecked ) return; } - this->disableModelChangeContribution(); + disableModelChangeContribution(); std::vector selection; getSelection( selection ); diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotWindowFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotWindowFeature.cpp index 4f97acb89e..d49c9133d6 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotWindowFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotWindowFeature.cpp @@ -29,7 +29,7 @@ CAF_CMD_SOURCE_INIT( RicShowPlotWindowFeature, "RicShowPlotWindowFeature" ); //-------------------------------------------------------------------------------------------------- void RicShowPlotWindowFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RiaGuiApplication::instance()->getOrCreateAndShowMainPlotWindow(); } diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicTileWindowsFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicTileWindowsFeature.cpp index b9f9b4167f..7eeb39b724 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicTileWindowsFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicTileWindowsFeature.cpp @@ -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 ); diff --git a/ApplicationLibCode/Commands/CompletionCommands/RicEditPerforationCollectionFeature.cpp b/ApplicationLibCode/Commands/CompletionCommands/RicEditPerforationCollectionFeature.cpp index be9702829b..64d2ea7f04 100644 --- a/ApplicationLibCode/Commands/CompletionCommands/RicEditPerforationCollectionFeature.cpp +++ b/ApplicationLibCode/Commands/CompletionCommands/RicEditPerforationCollectionFeature.cpp @@ -44,7 +44,7 @@ bool RicEditPerforationCollectionFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicEditPerforationCollectionFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RimPerforationCollection* perforationCollection = selectedPerforationCollection(); diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp index ad0d0354b0..0b9727e335 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp @@ -68,7 +68,7 @@ struct WellBorePartForTransCalc double intersectionWithWellMeasuredDepth; size_t lateralIndex; - void setSourcePdmObject( const caf::PdmObject* sourcePdmObj ) { this->sourcePdmObject = const_cast( sourcePdmObj ); } + void setSourcePdmObject( const caf::PdmObject* sourcePdmObj ) { sourcePdmObject = const_cast( sourcePdmObj ); } caf::PdmPointer sourcePdmObject; }; diff --git a/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp index 4ad61eee79..ebd090ed0d 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp @@ -67,7 +67,7 @@ bool RicAdvancedSnapshotExportFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicAdvancedSnapshotExportFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RimProject* proj = RimProject::current(); diff --git a/ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp index 8e941bfe76..4b66a26310 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp @@ -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 ); diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp index 967016f2b0..fc2ce09844 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp @@ -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(); } } diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp index a215d537c7..da99d7bd1a 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportFaultsFeature.cpp @@ -58,7 +58,7 @@ bool RicExportFaultsFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicExportFaultsFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); std::vector selectedFaults; diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp index 59ceedc92a..0bc682ee88 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp @@ -131,7 +131,7 @@ bool RicExportToLasFileFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicExportToLasFileFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); if ( RicWellLogPlotCurveFeatureImpl::parentWellAllocationPlot() ) return; diff --git a/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputPropertyFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputPropertyFeature.cpp index 140cf0f19e..799ca37419 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputPropertyFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputPropertyFeature.cpp @@ -53,7 +53,7 @@ bool RicSaveEclipseInputPropertyFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicSaveEclipseInputPropertyFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RimEclipseInputProperty* inputProperty = selectedInputProperty(); if ( !inputProperty ) return; diff --git a/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseResultAsInputPropertyFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseResultAsInputPropertyFeature.cpp index 27ff26434c..af9ac0eb4b 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseResultAsInputPropertyFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseResultAsInputPropertyFeature.cpp @@ -76,7 +76,7 @@ RimEclipseCellColors* RicSaveEclipseResultAsInputPropertyFeature::selectedEclips //-------------------------------------------------------------------------------------------------- void RicSaveEclipseResultAsInputPropertyFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RimEclipseCellColors* eclipseCellColors = selectedEclipseCellColors(); if ( !eclipseCellColors ) diff --git a/ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp index 0d69fb9d71..673fecd0ec 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp @@ -70,7 +70,7 @@ QString RicSnapshotViewToClipboardFeature::text() //-------------------------------------------------------------------------------------------------- void RicSnapshotViewToClipboardFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); RimViewWindow* viewWindow = RiaGuiApplication::activeViewWindow(); diff --git a/ApplicationLibCode/Commands/FlowCommands/RicShowTotalAllocationDataFeature.cpp b/ApplicationLibCode/Commands/FlowCommands/RicShowTotalAllocationDataFeature.cpp index c028e893b8..60aeca8844 100644 --- a/ApplicationLibCode/Commands/FlowCommands/RicShowTotalAllocationDataFeature.cpp +++ b/ApplicationLibCode/Commands/FlowCommands/RicShowTotalAllocationDataFeature.cpp @@ -47,7 +47,7 @@ bool RicShowTotalAllocationDataFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicShowTotalAllocationDataFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); std::set wellAllocPlots = RicShowTotalAllocationDataFeature::selectedWellAllocationPlots(); CVF_ASSERT( wellAllocPlots.size() > 0 ); diff --git a/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp b/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp index b25f3a5518..61cd114bd9 100644 --- a/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp +++ b/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp @@ -60,7 +60,7 @@ bool RicCopyReferencesToClipboardFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicCopyReferencesToClipboardFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); if ( !isAnyCopyableObjectSelected() ) return; diff --git a/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp b/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp index b95bde5cd4..d71d9d0eca 100644 --- a/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp +++ b/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp @@ -46,7 +46,7 @@ bool RicCutReferencesToClipboardFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicCutReferencesToClipboardFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); if ( !isAnyCuttableObjectSelected() ) return; diff --git a/ApplicationLibCode/Commands/RicCalculatorWidgetCreator.cpp b/ApplicationLibCode/Commands/RicCalculatorWidgetCreator.cpp index 98ea49c7f2..67436ada78 100644 --- a/ApplicationLibCode/Commands/RicCalculatorWidgetCreator.cpp +++ b/ApplicationLibCode/Commands/RicCalculatorWidgetCreator.cpp @@ -39,7 +39,7 @@ RicCalculatorWidgetCreator::RicCalculatorWidgetCreator( std::unique_ptrsetPdmObject( 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; diff --git a/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp b/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp index 7338cdf06b..8e4ba5ab5e 100644 --- a/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp +++ b/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp @@ -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() ) ) ); diff --git a/ApplicationLibCode/Commands/RicTogglePerspectiveViewFeature.cpp b/ApplicationLibCode/Commands/RicTogglePerspectiveViewFeature.cpp index ade4b00f7d..4ecaca30dc 100644 --- a/ApplicationLibCode/Commands/RicTogglePerspectiveViewFeature.cpp +++ b/ApplicationLibCode/Commands/RicTogglePerspectiveViewFeature.cpp @@ -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 } } diff --git a/ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp b/ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp index 0340fef642..16197bc80a 100644 --- a/ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp +++ b/ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp @@ -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(); } } diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp index 9aa6249262..231bda0172 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp @@ -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; } diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp index 36dd53530e..cc436a2e62 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp @@ -81,27 +81,27 @@ void RimWellPathImport::updateRegions( const QStringList& regionStrings, const Q std::vector 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 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 ); diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp index 9a220217ba..efdaadc126 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp @@ -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( senderObj ); if ( treeView ) { diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp index dbcb8cb120..93a3e6997e 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp @@ -47,7 +47,7 @@ CAF_CMD_SOURCE_INIT( RicAsciiExportSummaryPlotFeature, "RicAsciiExportSummaryPlo //-------------------------------------------------------------------------------------------------- void RicAsciiExportSummaryPlotFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); std::vector selectedSummaryPlots; caf::SelectionManager::instance()->objectsByType( &selectedSummaryPlots ); diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp index 9f8eed7279..9c36b8a795 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp @@ -128,7 +128,7 @@ RicSummaryPlotEditorUi::RicSummaryPlotEditorUi() m_summaryCurveSelectionEditor = std::make_unique(); - m_summaryCurveSelectionEditor->summaryAddressSelection()->setFieldChangedHandler( [this]() { this->selectionEditorFieldChanged(); } ); + m_summaryCurveSelectionEditor->summaryAddressSelection()->setFieldChangedHandler( [this]() { selectionEditorFieldChanged(); } ); m_summaryCurveSelectionEditor->summaryAddressSelection()->setMultiSelectionMode( true ); } diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp index 68abd05eb5..f9bd40abc9 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp @@ -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( 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,8 +309,8 @@ void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int if ( fieldEditorWidget ) { - fieldEditorWidget->setParent( this->widget() ); // To make sure this widget has the current - // group box as parent. + 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; diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp index d08cfbbad9..8d58f8b97f 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp @@ -37,7 +37,7 @@ CAF_CMD_SOURCE_INIT( RicViewZoomAllFeature, "RicViewZoomAllFeature" ); //-------------------------------------------------------------------------------------------------- void RicViewZoomAllFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); QWidget* topLevelWidget = RiaGuiApplication::activeWindow(); diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicAsciiExportWellLogPlotFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicAsciiExportWellLogPlotFeature.cpp index 0c75e05106..b8ed95f337 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicAsciiExportWellLogPlotFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicAsciiExportWellLogPlotFeature.cpp @@ -44,7 +44,7 @@ CAF_CMD_SOURCE_INIT( RicAsciiExportWellLogPlotFeature, "RicAsciiExportWellLogPlo //-------------------------------------------------------------------------------------------------- void RicAsciiExportWellLogPlotFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); std::vector selectedWellLogPlots; caf::SelectionManager::instance()->objectsByType( &selectedWellLogPlots ); diff --git a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolyline3dEditor.cpp b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolyline3dEditor.cpp index bc049bdb26..f67db7f3ff 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolyline3dEditor.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolyline3dEditor.cpp @@ -54,7 +54,7 @@ RicPolyline3dEditor::~RicPolyline3dEditor() //-------------------------------------------------------------------------------------------------- void RicPolyline3dEditor::configureAndUpdateUi( const QString& uiConfigName ) { - auto* pickerInterface = dynamic_cast( this->pdmObject() ); + auto* pickerInterface = dynamic_cast( pdmObject() ); for ( auto targetEditor : m_targetEditors ) { diff --git a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp index 9bf3b82c9d..5600965327 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp @@ -57,7 +57,7 @@ RicPolylineTarget3dEditor::~RicPolylineTarget3dEditor() ownerRiuViewer->removeStaticModel( m_cvfModel.p() ); } - RimPolylineTarget* oldTarget = dynamic_cast( this->pdmObject() ); + RimPolylineTarget* oldTarget = dynamic_cast( pdmObject() ); if ( oldTarget ) { oldTarget->targetPointUiCapability()->removeFieldEditor( this ); @@ -71,7 +71,7 @@ RicPolylineTarget3dEditor::~RicPolylineTarget3dEditor() //-------------------------------------------------------------------------------------------------- void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigName ) { - RimPolylineTarget* target = dynamic_cast( this->pdmObject() ); + RimPolylineTarget* target = dynamic_cast( pdmObject() ); RiuViewer* ownerRiuViewer = dynamic_cast( ownerViewer() ); Rim3dView* view = mainOrComparisonView(); @@ -114,7 +114,7 @@ void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigNam //-------------------------------------------------------------------------------------------------- void RicPolylineTarget3dEditor::cleanupBeforeSettingPdmObject() { - RimPolylineTarget* oldTarget = dynamic_cast( this->pdmObject() ); + RimPolylineTarget* oldTarget = dynamic_cast( 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( this->pdmObject() ); + RimPolylineTarget* target = dynamic_cast( 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( this->pdmObject() ); + RimPolylineTarget* target = dynamic_cast( pdmObject() ); if ( !target ) { return; @@ -164,7 +164,7 @@ void RicPolylineTarget3dEditor::slotSelectedIn3D() //-------------------------------------------------------------------------------------------------- void RicPolylineTarget3dEditor::slotDragFinished() { - RimPolylineTarget* target = dynamic_cast( this->pdmObject() ); + RimPolylineTarget* target = dynamic_cast( pdmObject() ); if ( target ) { target->triggerVisualizationUpdate(); diff --git a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.cpp b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.cpp index eb45067411..d0d4d459aa 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.cpp @@ -55,7 +55,7 @@ RicWellPathGeometry3dEditor::~RicWellPathGeometry3dEditor() //-------------------------------------------------------------------------------------------------- void RicWellPathGeometry3dEditor::configureAndUpdateUi( const QString& uiConfigName ) { - RimWellPathGeometryDef* geomDef = dynamic_cast( this->pdmObject() ); + RimWellPathGeometryDef* geomDef = dynamic_cast( pdmObject() ); for ( auto targetEditor : m_targetEditors ) { diff --git a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp index ba49215316..d91504ad6a 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp @@ -72,7 +72,7 @@ RicWellTarget3dEditor::~RicWellTarget3dEditor() //-------------------------------------------------------------------------------------------------- void RicWellTarget3dEditor::configureAndUpdateUi( const QString& uiConfigName ) { - auto* target = dynamic_cast( this->pdmObject() ); + auto* target = dynamic_cast( pdmObject() ); auto* ownerRiuViewer = dynamic_cast( 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( this->pdmObject() ); + auto* manipulatedTarget = dynamic_cast( 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( this->pdmObject() ); + auto* target = dynamic_cast( pdmObject() ); if ( !target ) { return; @@ -338,7 +338,7 @@ void RicWellTarget3dEditor::slotSelectedIn3D() //-------------------------------------------------------------------------------------------------- void RicWellTarget3dEditor::slotDragFinished() { - auto* target = dynamic_cast( this->pdmObject() ); + auto* target = dynamic_cast( pdmObject() ); if ( !target ) { return; @@ -352,7 +352,7 @@ void RicWellTarget3dEditor::slotDragFinished() //-------------------------------------------------------------------------------------------------- void RicWellTarget3dEditor::removeAllFieldEditors() { - if ( auto* oldTarget = dynamic_cast( this->pdmObject() ) ) + if ( auto* oldTarget = dynamic_cast( pdmObject() ) ) { for ( auto field : oldTarget->fieldsFor3dManipulator() ) { diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicShowWellPlanFeature.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicShowWellPlanFeature.cpp index e44c03cf58..8c3381e763 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicShowWellPlanFeature.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/RicShowWellPlanFeature.cpp @@ -44,7 +44,7 @@ bool RicShowWellPlanFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicShowWellPlanFeature::onActionTriggered( bool isChecked ) { - this->disableModelChangeContribution(); + disableModelChangeContribution(); std::vector selectedWellPaths = caf::selectedObjectsByType(); if ( selectedWellPaths.empty() ) diff --git a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp index 48fec6dd72..f9a9615701 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp @@ -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 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() ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp index eb66ab27c2..543d9c35e9 100644 --- a/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp @@ -613,11 +613,11 @@ const size_t* RifReaderEclipseOutput::eclipseCellIndexMapping() //-------------------------------------------------------------------------------------------------- void RifReaderEclipseOutput::importFaults( const QStringList& fileSet, cvf::Collection* 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::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 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] ) ); diff --git a/ApplicationLibCode/FileInterface/RifReaderMockModel.cpp b/ApplicationLibCode/FileInterface/RifReaderMockModel.cpp index a22d939227..bba117e3a6 100644 --- a/ApplicationLibCode/FileInterface/RifReaderMockModel.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderMockModel.cpp @@ -88,7 +88,7 @@ bool RifReaderMockModel::open( const QString& fileName, RigEclipseCaseData* ecli cellResults->setTimeStepInfos( resAddr, staticResultTimeStepInfos ); \ cellResults->modifiableCellScalarResultTimesteps( resAddr )->resize( 1 ); \ std::vector& values = cellResults->modifiableCellScalarResultTimesteps( resAddr )->at( 0 ); \ - this->inputProperty( resultName, &values ); \ + inputProperty( resultName, &values ); \ } ADD_INPUT_PROPERTY( "PORO" ); diff --git a/ApplicationLibCode/FileInterface/RifReaderRftInterface.cpp b/ApplicationLibCode/FileInterface/RifReaderRftInterface.cpp index 78a861ae4f..ddb8e8a808 100644 --- a/ApplicationLibCode/FileInterface/RifReaderRftInterface.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderRftInterface.cpp @@ -23,7 +23,7 @@ std::set RifReaderRftInterface::eclipseRftAddresses( const QString& wellName, const QDateTime& timeStep ) { std::set matchingAddresses; - std::set allAddresses = this->eclipseRftAddresses(); + std::set allAddresses = eclipseRftAddresses(); for ( const RifEclipseRftAddress& address : allAddresses ) { if ( address.wellName() == wellName && address.timeStep() == timeStep ) diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.cpp b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.cpp index 02d09fadaa..7bd2c17882 100644 --- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.cpp +++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.cpp @@ -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 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& candidates1 = this->elementsUsingNode( firstNodeIdxOfFace ); + const std::vector& candidates1 = elementsUsingNode( firstNodeIdxOfFace ); if ( !candidates1.empty() ) { @@ -323,7 +323,7 @@ void RigFemPart::calculateElmNeighbors() int thirdNodeIdxOfFace = elmNodes[localFaceIndices[3]]; - const std::vector& candidates2 = this->elementsUsingNode( thirdNodeIdxOfFace ); + const std::vector& 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& nodeCoordinates = this->nodes().coordinates; + const std::vector& 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; } diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp index 27f91354b0..52cdcef5ff 100644 --- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp +++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp @@ -481,7 +481,7 @@ void RigFemPartGrid::cellCornerVertices( size_t cellIndex, cvf::Vec3d vertices[8 cvf::Vec3d RigFemPartGrid::cellCentroid( size_t cellIndex ) const { std::array 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 ) diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp index ed64ba64bf..954cba0d83 100644 --- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp +++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp @@ -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::vectordeleteResult( address ); + deleteResult( address ); } } @@ -285,7 +285,7 @@ std::vector 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 resultAddressOfComponents = this->getResAddrToComponentsToRead( resVarAddr ); + std::vector 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& RigFemPartResultsCollection::scalarValuesHistogram( const RigFemResultAddress& resVarAddr ) { - return this->statistics( resVarAddr )->cellScalarValuesHistogram(); + return statistics( resVarAddr )->cellScalarValuesHistogram(); } //-------------------------------------------------------------------------------------------------- @@ -1284,7 +1284,7 @@ const std::vector& RigFemPartResultsCollection::scalarValuesHistogram( c const std::vector& 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 ); } } diff --git a/ApplicationLibCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp b/ApplicationLibCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp index 612eb4d902..ce51fd8a14 100644 --- a/ApplicationLibCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp +++ b/ApplicationLibCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp @@ -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 ); } } diff --git a/ApplicationLibCode/GeoMech/OdbReader/RifOdbReader.cpp b/ApplicationLibCode/GeoMech/OdbReader/RifOdbReader.cpp index 80ddfe3eaf..18926c01ef 100644 --- a/ApplicationLibCode/GeoMech/OdbReader/RifOdbReader.cpp +++ b/ApplicationLibCode/GeoMech/OdbReader/RifOdbReader.cpp @@ -448,7 +448,7 @@ std::vector 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 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(); diff --git a/ApplicationLibCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp b/ApplicationLibCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp index 46e7ca17ca..abbcad12c3 100644 --- a/ApplicationLibCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp +++ b/ApplicationLibCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp @@ -75,7 +75,7 @@ RivBoxIntersectionPartMgr::RivBoxIntersectionPartMgr( RimBoxIntersection* inters void RivBoxIntersectionPartMgr::applySingleColorEffect() { m_defaultColor = cvf::Color3f::OLIVE; // m_rimCrossSection->CrossSectionColor(); - this->updatePartEffect(); + updatePartEffect(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationLibCode/ModelVisualization/RivFaultPartMgr.cpp index 6f54527f4d..31ab2c05d9 100644 --- a/ApplicationLibCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationLibCode/ModelVisualization/RivFaultPartMgr.cpp @@ -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() ); diff --git a/ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.cpp b/ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.cpp index 1fbaffe294..c34dab3dcc 100644 --- a/ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.cpp +++ b/ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.cpp @@ -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(); diff --git a/ApplicationLibCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp b/ApplicationLibCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp index 6f7495c797..2d46529afa 100644 --- a/ApplicationLibCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp +++ b/ApplicationLibCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp @@ -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( 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( ( 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( ( 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( 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( 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(this->sizeHint().y() - 20); + // float upperBoundY = static_cast(sizeHint().y() - 20); cvf::Vec3f a( float( border ), lowerBoundY, 0 ); cvf::Vec3f b( static_cast( totalWidth - border ), lowerBoundY, 0 ); diff --git a/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp b/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp index 5f78c74e9f..8ed281cfa6 100644 --- a/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp +++ b/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp @@ -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() ); diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp index a739db75b0..fd5ec3f786 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp @@ -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 storeResultCoreLambda; @@ -1626,7 +1626,7 @@ RiaSummaryCurveDefinitionAnalyser* RimAnalysisPlot::getOrCreateSelectedCurveDefA { m_analyserOfSelectedCurveDefs = std::unique_ptr( new RiaSummaryCurveDefinitionAnalyser ); } - m_analyserOfSelectedCurveDefs->setCurveDefinitions( this->curveDefinitions() ); + m_analyserOfSelectedCurveDefs->setCurveDefinitions( curveDefinitions() ); return m_analyserOfSelectedCurveDefs.get(); } diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp index eb68173ccc..ace327b647 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp @@ -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(); } diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp index f6941a9a7f..a78843ddd0 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp @@ -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 ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp index 60cd97a613..c69778426a 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp @@ -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(); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp index e73b7f4964..3c8b4c7e37 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp @@ -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(); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp index 074043bb29..82916de56c 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp @@ -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 ) { diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp index b33e58fd4a..5c53ed7419 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp @@ -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 ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp index ea9e27f67b..043e60e6f6 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp @@ -277,7 +277,7 @@ void RimCellFilterCollection::addFilter( RimCellFilter* pFilter ) setAutoName( pFilter ); m_cellFilters.push_back( pFilter ); connectToFilterUpdates( pFilter ); - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp index 77bf481b30..555882a9ff 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp @@ -163,7 +163,7 @@ void RimCellRangeFilter::computeAndSetValidValues() cellCountK = std::clamp( cellCountK.v(), 1, static_cast( grid->cellCountK() ) ); startIndexK = std::clamp( startIndexK.v(), 1, static_cast( grid->cellCountK() ) ); } - this->updateIconState(); + updateIconState(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp index 6b5b3d2155..b9e3e5f318 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp @@ -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 ); } diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp index 6f4ce30df2..6ecc058b26 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp @@ -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(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp index 4e0c4e4f00..21a6268453 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp @@ -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 objFields = this->fields(); + std::vector 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() ); } diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimUserDefinedFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimUserDefinedFilter.cpp index e5218b89dd..75d2fc0377 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimUserDefinedFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimUserDefinedFilter.cpp @@ -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() ) { diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp index 24e7538c31..f8d92583d6 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp @@ -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(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp index 8e0ce641ff..b5467dd246 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp @@ -290,7 +290,7 @@ void RimEnsembleFractureStatistics::fieldChangedByUi( const caf::PdmFieldHandle* #ifdef USE_QTCHARTS // Update referring plots - std::vector referringObjects = this->objectsWithReferringPtrFields(); + std::vector referringObjects = objectsWithReferringPtrFields(); for ( caf::PdmObjectHandle* obj : referringObjects ) { auto plot = dynamic_cast( obj ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp index 361267d448..7277f86243 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp @@ -152,7 +152,7 @@ bool RimFishbones::isActive() const //-------------------------------------------------------------------------------------------------- QString RimFishbones::generatedName() const { - caf::PdmChildArrayField* container = dynamic_cast*>( this->parentField() ); + caf::PdmChildArrayField* container = dynamic_cast*>( parentField() ); CVF_ASSERT( container ); size_t index = container->indexOf( this ) + 1; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp index e18ba79d4a..0882d00464 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp @@ -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 ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp index 09125656ff..9dbc962a7b 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp @@ -206,7 +206,7 @@ std::vector RimFracture::getPotentiallyFracturedCells( const RigMainGrid std::vector 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 nodeCoordVec; std::vector 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(); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp index d0968dd570..71546aba91 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp @@ -877,7 +877,7 @@ void RimFractureTemplate::loadDataAndUpdateGeometryHasChanged() //-------------------------------------------------------------------------------------------------- std::vector RimFractureTemplate::fracturesUsingThisTemplate() const { - return this->objectsWithReferringPtrFieldsOfType(); + return objectsWithReferringPtrFieldsOfType(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp index 16a499e240..b987757935 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp @@ -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 ) diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp index 5d3e0e1fab..bdfde6f171 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp @@ -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 ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp index b607341379..a9c79c1a7b 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp @@ -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 ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp index 8f32cfa6df..7caa700273 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp @@ -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(); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp index a9df1bfba9..411147ee3a 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp @@ -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" ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp index 960bc9076b..2ae52d9f78 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp @@ -246,7 +246,7 @@ void RimWellPathFracture::updatePositionFromMeasuredDepth() positionAlongWellpath = wellPathGeometry->interpolatedPointAlongWellPath( m_measuredDepth() ); } - this->setAnchorPosition( positionAlongWellpath ); + setAnchorPosition( positionAlongWellpath ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp index 66508a3945..82965c32a5 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp @@ -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 ) { diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp index 7f7f01215d..f491ce55b9 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp @@ -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( new RiaSummaryCurveDefinitionAnalyser ); } - m_analyserOfSelectedCurveDefs->setCurveDefinitions( this->curveDefinitions() ); + m_analyserOfSelectedCurveDefs->setCurveDefinitions( curveDefinitions() ); return m_analyserOfSelectedCurveDefs.get(); } diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp index 9ac74e7ad3..c2670290fc 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp @@ -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(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp index b008d4eb54..dd692c4e06 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp @@ -195,8 +195,8 @@ void RimCorrelationPlot::onLoadDataAndUpdate() m_plotWidget->qwtPlot()->insertLegend( nullptr ); m_plotWidget->updateLegend(); - this->updateAxes(); - this->updatePlotTitle(); + updateAxes(); + updatePlotTitle(); m_plotWidget->scheduleReplot(); } } diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp index d23b934afa..b36cd65c62 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp @@ -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(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp index 6f93cf54b9..063035d633 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp @@ -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(); } } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp index 90c2950375..a99d51fe27 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp @@ -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(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp index fc9b3a7f51..0581e2e001 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp @@ -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 ) { diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp index 4dcaa5e5d7..0313cd03a2 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp @@ -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(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp index 50ef7077d9..648fef1571 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp @@ -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(); } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp index 1afaa8778e..d1b9e0fd22 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp @@ -199,7 +199,7 @@ QImage RimTofAccumulatedPhaseFractionsPlot::snapshotWindowContent() void RimTofAccumulatedPhaseFractionsPlot::setDescription( const QString& description ) { m_userName = description; - this->updateMdiWindowTitle(); + updateMdiWindowTitle(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp index cd0f8b46f8..56432c6879 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp @@ -156,7 +156,7 @@ QImage RimTotalWellAllocationPlot::snapshotWindowContent() void RimTotalWellAllocationPlot::setDescription( const QString& description ) { m_userName = description; - this->updateMdiWindowTitle(); + updateMdiWindowTitle(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp index 67c8db9122..a44e9c72be 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp @@ -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 RimWellAllocationPlot::calculateValueOptions( cons if ( fieldNeedingOptions == &m_wellName ) { - std::set sortedWellNames = this->findSortedWellNames(); + std::set sortedWellNames = findSortedWellNames(); caf::IconProvider simWellIcon( ":/Well.svg" ); for ( const QString& wname : sortedWellNames ) diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp index 9f06073da5..8450c689a5 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp @@ -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(); std::map> stackedCurveGroups = wellLogTrack->visibleStackedCurves(); - const std::vector& curveGroup = stackedCurveGroups[this->m_groupId]; + const std::vector& curveGroup = stackedCurveGroups[m_groupId]; if ( !curveGroup.empty() ) { @@ -288,7 +288,7 @@ void RimWellFlowRateCurve::setFlowValuesPrDepthValue( const QString& const std::vector& 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; } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index aa6aacc854..4d757452d7 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -134,7 +134,7 @@ RimWellPltPlot::RimWellPltPlot() m_nameConfig->setCustomName( "PLT Plot" ); setNamingMethod( RiaDefines::ObjectNamingMethod::CUSTOM ); - this->setAsPlotMdiWindow(); + setAsPlotMdiWindow(); m_doInitAfterLoad = false; m_isOnLoad = true; m_plotLegendsHorizontal = false; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 963a93b742..fbd2a31abc 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -133,7 +133,7 @@ RimWellRftPlot::RimWellRftPlot() setPlotTitleVisible( true ); - this->setAsPlotMdiWindow(); + setAsPlotMdiWindow(); m_isOnLoad = true; } @@ -534,7 +534,7 @@ void RimWellRftPlot::updateCurvesInPlot( const std::setsetSummaryCase( rftCase ); curve->setEnsemble( curveDefToAdd.address().ensemble() ); - curve->setObservedFmuRftData( this->findObservedFmuData( m_wellPathNameOrSimWellName, curveDefToAdd.timeStep() ) ); + curve->setObservedFmuRftData( findObservedFmuData( m_wellPathNameOrSimWellName, curveDefToAdd.timeStep() ) ); RifEclipseRftAddress address = RifEclipseRftAddress::createAddress( m_wellPathNameOrSimWellName, curveDefToAdd.timeStep(), RifEclipseRftAddress::RftWellLogChannelType::PRESSURE ); @@ -578,7 +578,7 @@ void RimWellRftPlot::updateCurvesInPlot( const std::setaddCurve( curve ); curve->setEnsemble( ensemble ); curve->setRftAddress( rftAddress ); - curve->setObservedFmuRftData( this->findObservedFmuData( m_wellPathNameOrSimWellName, curveDefToAdd.timeStep() ) ); + curve->setObservedFmuRftData( findObservedFmuData( m_wellPathNameOrSimWellName, curveDefToAdd.timeStep() ) ); curve->setZOrder( RiuQwtPlotCurveDefines::zDepthForIndex( RiuQwtPlotCurveDefines::ZIndex::Z_ENSEMBLE_STAT_CURVE ) ); applyCurveAppearance( curve ); auto symbol = statisticsCurveSymbolFromAddress( rftAddress ); @@ -953,7 +953,7 @@ void RimWellRftPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, { updateFormationsOnPlot(); syncCurvesFromUiSelection(); - this->updateConnectedEditors(); + updateConnectedEditors(); } else if ( changedField == &m_showStatisticsCurves || changedField == &m_showEnsembleCurves || changedField == &m_showErrorInObservedData ) { diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp index ff38a9ac54..04c962d67d 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp @@ -170,15 +170,15 @@ RimGeoMechCase::~RimGeoMechCase() RimWellLogPlotCollection* plotCollection = project->mainPlotCollection()->wellLogPlotCollection(); if ( plotCollection ) { - plotCollection->removeExtractors( this->geoMechData() ); + plotCollection->removeExtractors( geoMechData() ); } } } - if ( this->geoMechData() ) + if ( geoMechData() ) { // At this point, we assume that memory should be released - CVF_ASSERT( this->geoMechData()->refCount() == 1 ); + CVF_ASSERT( geoMechData()->refCount() == 1 ); } } @@ -203,11 +203,11 @@ const RigGeoMechCaseData* RimGeoMechCase::geoMechData() const //-------------------------------------------------------------------------------------------------- void RimGeoMechCase::reloadDataAndUpdate() { - if ( this->geoMechData() ) + if ( geoMechData() ) { m_geoMechCaseData = nullptr; std::string errMsg; - if ( this->openGeoMechCase( &errMsg ) == CASE_OPEN_ERROR ) + if ( openGeoMechCase( &errMsg ) == CASE_OPEN_ERROR ) { RiaLogging::error( QString::fromStdString( errMsg ) ); } @@ -268,7 +268,7 @@ RimGeoMechCase* RimGeoMechCase::createCopy( const QString& newInputFileName ) RimProject* project = RimProject::current(); RimGeoMechCase* copycase = - dynamic_cast( this->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) ); + dynamic_cast( xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) ); CVF_ASSERT( copycase ); QFileInfo filenameInfo( newInputFileName ); @@ -288,7 +288,7 @@ RimGeoMechCase* RimGeoMechCase::createCopy( const QString& newInputFileName ) RimGeoMechCase::CaseOpenStatus RimGeoMechCase::openGeoMechCase( std::string* errorMessage ) { // If read already, return - if ( this->m_geoMechCaseData.notNull() ) return CASE_OPEN_OK; + if ( m_geoMechCaseData.notNull() ) return CASE_OPEN_OK; if ( !caf::Utils::fileExists( m_caseFileName().path() ) ) { @@ -495,7 +495,7 @@ cvf::BoundingBox RimGeoMechCase::reservoirBoundingBox() { cvf::BoundingBox boundingBox; - RigGeoMechCaseData* rigCaseData = this->geoMechData(); + RigGeoMechCaseData* rigCaseData = geoMechData(); if ( rigCaseData && rigCaseData->femPartResults() && rigCaseData->femParts() ) { for ( int p = 0; p < rigCaseData->femParts()->partCount(); p++ ) @@ -592,7 +592,7 @@ void RimGeoMechCase::addElementPropertyFiles( const std::vector& } } - this->updateConnectedEditors(); + updateConnectedEditors(); if ( m_geoMechCaseData.notNull() ) { @@ -686,10 +686,10 @@ void RimGeoMechCase::setApplyTimeFilter( bool applyTimeFilter ) //-------------------------------------------------------------------------------------------------- cvf::Vec3d RimGeoMechCase::displayModelOffset() const { - auto bb = this->allCellsBoundingBox(); + auto bb = allCellsBoundingBox(); if ( bb.isValid() ) { - return this->allCellsBoundingBox().min(); + return allCellsBoundingBox().min(); } return cvf::Vec3d::ZERO; diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp index 75a6142d4b..7ca434b2f9 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp @@ -33,7 +33,7 @@ RimGeoMechCellColors::RimGeoMechCellColors() : legendConfigChanged( this ) { CAF_PDM_InitFieldNoDefault( &legendConfig, "LegendDefinition", "Color Legend" ); - this->legendConfig = new RimRegularLegendConfig(); + legendConfig = new RimRegularLegendConfig(); legendConfig.uiCapability()->setUiTreeHidden( true ); legendConfig->changed.connect( this, &RimGeoMechCellColors::onLegendConfigChanged ); } @@ -82,7 +82,7 @@ void RimGeoMechCellColors::initAfterRead() //-------------------------------------------------------------------------------------------------- void RimGeoMechCellColors::updateLegendCategorySettings() { - if ( this->hasCategoryResult() ) + if ( hasCategoryResult() ) { legendConfig->setMappingMode( RimRegularLegendConfig::MappingType::CATEGORY_INTEGER ); legendConfig->setColorLegend( RimRegularLegendConfig::mapToColorLegend( RimRegularLegendConfig::ColorRangesType::CATEGORY ) ); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp index b92a65c5fc..c047e8c101 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp @@ -195,15 +195,15 @@ void RimGeoMechContourMapView::onCreateDisplayModel() { RimGeoMechView::onCreateDisplayModel(); - if ( !this->isTimeStepDependentDataVisible() ) + if ( !isTimeStepDependentDataVisible() ) { // Need to add geometry even if it hasn't happened during dynamic time step update. updateGeometry(); } - if ( this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix ) + if ( viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix ) { - this->zoomAll(); + zoomAll(); } } @@ -213,8 +213,8 @@ void RimGeoMechContourMapView::onCreateDisplayModel() void RimGeoMechContourMapView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup( "Viewer" ); - viewGroup->add( this->userDescriptionField() ); - viewGroup->add( this->backgroundColorField() ); + viewGroup->add( userDescriptionField() ); + viewGroup->add( backgroundColorField() ); viewGroup->add( &m_showAxisLines ); viewGroup->add( &m_showScaleLegend ); @@ -305,7 +305,7 @@ void RimGeoMechContourMapView::appendContourMapProjectionToModel() cvf::ref contourMapProjectionModelBasicList = new cvf::ModelBasicList; contourMapProjectionModelBasicList->setName( name ); - cvf::ref transForm = this->displayCoordTransform(); + cvf::ref transForm = displayCoordTransform(); m_contourMapProjectionPartMgr->appendProjectionToModel( contourMapProjectionModelBasicList.p(), transForm.p() ); contourMapProjectionModelBasicList->updateBoundingBoxesRecursive(); @@ -330,7 +330,7 @@ void RimGeoMechContourMapView::appendContourLinesToModel() cvf::ref contourMapLabelModelBasicList = new cvf::ModelBasicList; contourMapLabelModelBasicList->setName( name ); - cvf::ref transForm = this->displayCoordTransform(); + cvf::ref transForm = displayCoordTransform(); m_contourMapProjectionPartMgr->appendContourLinesToModel( viewer()->mainCamera(), contourMapLabelModelBasicList.p(), transForm.p() ); contourMapLabelModelBasicList->updateBoundingBoxesRecursive(); @@ -355,7 +355,7 @@ void RimGeoMechContourMapView::appendPickPointVisToModel() cvf::ref contourMapProjectionModelBasicList = new cvf::ModelBasicList; contourMapProjectionModelBasicList->setName( name ); - cvf::ref transForm = this->displayCoordTransform(); + cvf::ref transForm = displayCoordTransform(); m_contourMapProjectionPartMgr->appendPickPointVisToModel( contourMapProjectionModelBasicList.p(), transForm.p() ); contourMapProjectionModelBasicList->updateBoundingBoxesRecursive(); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp index d311f5280d..559e572cef 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp @@ -98,7 +98,7 @@ RimGeoMechCase* RimGeoMechModels::copyCase( RimGeoMechCase* thecase, const QStri copy->resolveReferencesRecursively(); copy->updateConnectedEditors(); - this->updateConnectedEditors(); + updateConnectedEditors(); for ( auto riv : copy->views() ) { diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp index 8e305f5979..aa6cc245c5 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp @@ -351,7 +351,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch } // Get the possible property filter owner - auto propFilter = dynamic_cast( this->parentField()->ownerObject() ); + auto propFilter = dynamic_cast( parentField()->ownerObject() ); auto view = firstAncestorOrThisOfType(); auto curve = firstAncestorOrThisOfType(); auto rim3dWellLogCurve = firstAncestorOrThisOfType(); @@ -400,7 +400,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch if ( dynamic_cast( this ) ) { - this->updateLegendCategorySettings(); + updateLegendCategorySettings(); if ( view ) { @@ -566,8 +566,8 @@ void RimGeoMechResultDefinition::loadResult() { if ( m_geomCase && m_geomCase->geoMechData() ) { - if ( this->resultAddress().fieldName == RiaResultNames::wbsFGResult().toStdString() || - this->resultAddress().fieldName == RiaResultNames::wbsSFGResult().toStdString() ) + if ( resultAddress().fieldName == RiaResultNames::wbsFGResult().toStdString() || + resultAddress().fieldName == RiaResultNames::wbsSFGResult().toStdString() ) { RigFemResultAddress stressResAddr( RIG_ELEMENT_NODAL, std::string( "ST" ), "" ); RigFemResultAddress porBarResAddr( RIG_ELEMENT_NODAL, std::string( "POR-Bar" ), "" ); @@ -576,7 +576,7 @@ void RimGeoMechResultDefinition::loadResult() } else { - m_geomCase->geoMechData()->femPartResults()->assertResultsLoaded( this->resultAddress() ); + m_geomCase->geoMechData()->femPartResults()->assertResultsLoaded( resultAddress() ); } } } @@ -730,7 +730,7 @@ bool RimGeoMechResultDefinition::hasResult() RigFemPartResultsCollection* results = caseData->femPartResults(); if ( results ) { - return results->assertResultsLoaded( this->resultAddress() ); + return results->assertResultsLoaded( resultAddress() ); } } return false; @@ -789,17 +789,17 @@ QString RimGeoMechResultDefinition::resultVariableName() const //-------------------------------------------------------------------------------------------------- QString RimGeoMechResultDefinition::currentResultUnits() const { - RigFemResultAddress rigFemResultAddress = this->resultAddress(); + RigFemResultAddress rigFemResultAddress = resultAddress(); if ( RigFemPartResultCalculatorStressAnisotropy::isAnisotropyResult( rigFemResultAddress ) ) { return RiaWellLogUnitTools::noUnitString(); } - if ( this->resultFieldName() == "SE" || this->resultFieldName() == "ST" || this->resultFieldName() == "POR-Bar" || - this->resultFieldName() == "SM" || this->resultFieldName() == "SEM" || this->resultFieldName() == "Q" ) + if ( resultFieldName() == "SE" || resultFieldName() == "ST" || resultFieldName() == "POR-Bar" || resultFieldName() == "SM" || + resultFieldName() == "SEM" || resultFieldName() == "Q" ) { - auto componentName = this->resultComponentName(); + auto componentName = resultComponentName(); if ( componentName.endsWith( "azi" ) || componentName.endsWith( "inc" ) ) { return "Deg"; @@ -807,16 +807,15 @@ QString RimGeoMechResultDefinition::currentResultUnits() const return "Bar"; } - else if ( this->resultFieldName() == "MODULUS" ) + else if ( resultFieldName() == "MODULUS" ) { return "GPa"; } - else if ( this->resultFieldName() == "COMPRESSIBILITY" && - ( this->resultComponentName() == "PORE" || this->resultComponentName() == "VERTICAL" ) ) + else if ( resultFieldName() == "COMPRESSIBILITY" && ( resultComponentName() == "PORE" || resultComponentName() == "VERTICAL" ) ) { return "1/GPa"; } - else if ( this->resultFieldName() == "PORO-PERM" && this->resultComponentName() == "PERM" ) + else if ( resultFieldName() == "PORO-PERM" && resultComponentName() == "PERM" ) { return "mD"; } @@ -824,7 +823,7 @@ QString RimGeoMechResultDefinition::currentResultUnits() const { for ( auto resultName : RiaResultNames::wbsDerivedResultNames() ) { - if ( resultName == this->resultFieldName() ) + if ( resultName == resultFieldName() ) { return RiaWellLogUnitTools::sg_emwUnitString(); } @@ -889,7 +888,7 @@ QString RimGeoMechResultDefinition::convertToUiResultFieldName( QString resultFi //-------------------------------------------------------------------------------------------------- bool RimGeoMechResultDefinition::normalizableResultSelected() const { - return RigFemPartResultsCollection::isNormalizableResult( this->resultAddress() ); + return RigFemPartResultsCollection::isNormalizableResult( resultAddress() ); } //-------------------------------------------------------------------------------------------------- @@ -897,7 +896,7 @@ bool RimGeoMechResultDefinition::normalizableResultSelected() const //-------------------------------------------------------------------------------------------------- bool RimGeoMechResultDefinition::referenceCaseDependentResultSelected() const { - return RigFemPartResultsCollection::isReferenceCaseDependentResult( this->resultAddress() ); + return RigFemPartResultsCollection::isReferenceCaseDependentResult( resultAddress() ); } //-------------------------------------------------------------------------------------------------- @@ -924,7 +923,7 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf const QString& legendHeading, int viewerStepIndex ) { - if ( !this->ownerCaseData() || !( this->resultAddress().isValid() ) ) + if ( !ownerCaseData() || !( resultAddress().isValid() ) ) { return; } @@ -934,10 +933,10 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf double globalMin, globalMax; double globalPosClosestToZero, globalNegClosestToZero; - RigGeoMechCaseData* gmCase = this->ownerCaseData(); + RigGeoMechCaseData* gmCase = ownerCaseData(); CVF_ASSERT( gmCase ); - RigFemResultAddress resVarAddress = this->resultAddress(); + RigFemResultAddress resVarAddress = resultAddress(); auto [stepIdx, frameIdx] = gmCase->femPartResults()->stepListIndexToTimeStepAndDataFrameIndex( viewerStepIndex ); @@ -950,18 +949,17 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf legendConfigToUpdate->setClosestToZeroValues( globalPosClosestToZero, globalNegClosestToZero, localPosClosestToZero, localNegClosestToZero ); legendConfigToUpdate->setAutomaticRanges( globalMin, globalMax, localMin, localMax ); - if ( this->hasCategoryResult() ) + if ( hasCategoryResult() ) { std::vector fnVector = gmCase->femPartResults()->formationNames(); legendConfigToUpdate->setNamedCategories( fnVector ); } - QString legendTitle = legendHeading + caf::AppEnum( this->resultPositionType() ).uiText() + "\n" + - this->resultFieldUiName(); + QString legendTitle = legendHeading + caf::AppEnum( resultPositionType() ).uiText() + "\n" + resultFieldUiName(); - if ( !this->resultComponentUiName().isEmpty() ) + if ( !resultComponentUiName().isEmpty() ) { - legendTitle += ", " + this->resultComponentUiName(); + legendTitle += ", " + resultComponentUiName(); } QString unitString = currentResultUnits(); @@ -970,9 +968,9 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf legendTitle += QString( " [%1]" ).arg( unitString ); } - if ( !this->diffResultUiShortName().isEmpty() ) + if ( !diffResultUiShortName().isEmpty() ) { - legendTitle += QString( "\nTime Diff:\n%1" ).arg( this->diffResultUiShortName() ); + legendTitle += QString( "\nTime Diff:\n%1" ).arg( diffResultUiShortName() ); } legendConfigToUpdate->setTitle( legendTitle ); @@ -983,5 +981,5 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf //-------------------------------------------------------------------------------------------------- bool RimGeoMechResultDefinition::isBiotCoefficientDependent() const { - return ( this->resultFieldName() == "COMPRESSIBILITY" || this->resultFieldName() == "PORO-PERM" ); + return ( resultFieldName() == "COMPRESSIBILITY" || resultFieldName() == "PORO-PERM" ); } diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp index a60df05fdb..1dff18db1f 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp @@ -157,7 +157,7 @@ void RimGeoMechView::onLoadDataAndUpdate() onUpdateScaleTransform(); - this->updateSurfacesInViewTreeItems(); + updateSurfacesInViewTreeItems(); if ( m_geomechCase ) { @@ -186,22 +186,22 @@ void RimGeoMechView::onLoadDataAndUpdate() progress.setProgressDescription( "Reading Current Result" ); - CVF_ASSERT( this->cellResult() != nullptr ); - m_geomechCase->geoMechData()->femPartResults()->setNormalizationAirGap( this->cellResult()->normalizationAirGap() ); - m_geomechCase->geoMechData()->femPartResults()->assertResultsLoaded( this->cellResult()->resultAddress() ); + CVF_ASSERT( cellResult() != nullptr ); + m_geomechCase->geoMechData()->femPartResults()->setNormalizationAirGap( cellResult()->normalizationAirGap() ); + m_geomechCase->geoMechData()->femPartResults()->assertResultsLoaded( cellResult()->resultAddress() ); progress.incrementProgress(); progress.setProgressDescription( "Create Display model" ); updateMdiWindowVisibility(); - this->geoMechPropertyFilterCollection()->loadAndInitializePropertyFilters(); + geoMechPropertyFilterCollection()->loadAndInitializePropertyFilters(); m_wellMeasurementCollection->syncWithChangesInWellMeasurementCollection(); if ( m_surfaceCollection ) m_surfaceCollection->loadData(); if ( m_partsCollection ) m_partsCollection->syncWithCase( m_geomechCase ); - this->scheduleCreateDisplayModelAndRedraw(); + scheduleCreateDisplayModelAndRedraw(); progress.incrementProgress(); } @@ -215,7 +215,7 @@ void RimGeoMechView::onUpdateScaleTransform() cvf::Mat4d scale = cvf::Mat4d::IDENTITY; scale( 2, 2 ) = scaleZ(); - this->scaleTransform()->setLocalTransform( scale ); + scaleTransform()->setLocalTransform( scale ); if ( nativeOrOverrideViewer() ) nativeOrOverrideViewer()->updateCachedValuesInScene(); } @@ -414,7 +414,7 @@ void RimGeoMechView::onUpdateDisplayModelForCurrentTimeStep() updateElementDisplacements(); - if ( this->isTimeStepDependentDataVisibleInThisOrComparisonView() ) + if ( isTimeStepDependentDataVisibleInThisOrComparisonView() ) { if ( nativeOrOverrideViewer() ) { @@ -469,10 +469,10 @@ void RimGeoMechView::onUpdateDisplayModelForCurrentTimeStep() } } - bool hasGeneralCellResult = this->cellResult()->hasResult(); + bool hasGeneralCellResult = cellResult()->hasResult(); if ( hasGeneralCellResult ) - m_vizLogic->updateCellResultColor( m_currentTimeStep(), m_currentInternalTimeStep, m_currentDataFrameIndex, this->cellResult() ); + m_vizLogic->updateCellResultColor( m_currentTimeStep(), m_currentInternalTimeStep, m_currentDataFrameIndex, cellResult() ); else m_vizLogic->updateStaticCellColors( m_currentTimeStep() ); @@ -550,7 +550,7 @@ void RimGeoMechView::onUpdateLegends() } else { - std::vector legendConfs = this->legendConfigs(); + std::vector legendConfs = legendConfigs(); for ( auto legendConf : legendConfs ) { @@ -558,7 +558,7 @@ void RimGeoMechView::onUpdateLegends() } } - this->updateLegendTextAndRanges( cellResult()->legendConfig(), m_currentTimeStep() ); + updateLegendTextAndRanges( cellResult()->legendConfig(), m_currentTimeStep() ); if ( cellResult()->hasResult() && cellResult()->legendConfig()->showLegend() ) { @@ -566,12 +566,12 @@ void RimGeoMechView::onUpdateLegends() isUsingOverrideViewer() ); } - for ( RimIntersectionResultDefinition* sepInterResDef : this->separateIntersectionResultsCollection()->intersectionResultsDefinitions() ) + for ( RimIntersectionResultDefinition* sepInterResDef : separateIntersectionResultsCollection()->intersectionResultsDefinitions() ) { sepInterResDef->updateLegendRangesTextAndVisibility( "Intersection Results:\n", nativeOrOverrideViewer(), isUsingOverrideViewer() ); } - for ( RimIntersectionResultDefinition* sepInterResDef : this->separateSurfaceResultsCollection()->intersectionResultsDefinitions() ) + for ( RimIntersectionResultDefinition* sepInterResDef : separateSurfaceResultsCollection()->intersectionResultsDefinitions() ) { sepInterResDef->updateLegendRangesTextAndVisibility( "Surface Results:\n", nativeOrOverrideViewer(), isUsingOverrideViewer() ); } @@ -655,7 +655,7 @@ void RimGeoMechView::updateTensorLegendTextAndRanges( RimRegularLegendConfig* le //-------------------------------------------------------------------------------------------------- void RimGeoMechView::updateLegendTextAndRanges( RimRegularLegendConfig* legendConfig, int timeStepIndex ) { - if ( !this->isTimeStepDependentDataVisible() ) + if ( !isTimeStepDependentDataVisible() ) { return; } @@ -697,12 +697,12 @@ std::vector RimGeoMechView::legendConfigs() const absLegendConfigs.push_back( cellResult()->legendConfig() ); absLegendConfigs.push_back( tensorResults()->arrowColorLegendConfig() ); - for ( RimIntersectionResultDefinition* sepInterResDef : this->separateIntersectionResultsCollection()->intersectionResultsDefinitions() ) + for ( RimIntersectionResultDefinition* sepInterResDef : separateIntersectionResultsCollection()->intersectionResultsDefinitions() ) { absLegendConfigs.push_back( sepInterResDef->regularLegendConfig() ); } - for ( RimIntersectionResultDefinition* sepInterResDef : this->separateSurfaceResultsCollection()->intersectionResultsDefinitions() ) + for ( RimIntersectionResultDefinition* sepInterResDef : separateSurfaceResultsCollection()->intersectionResultsDefinitions() ) { absLegendConfigs.push_back( sepInterResDef->regularLegendConfig() ); } @@ -768,10 +768,10 @@ void RimGeoMechView::convertCameraPositionFromOldProjectFiles() RimCase* rimCase = geoMechCase; RiuViewerToViewInterface* viewerToViewInterface = this; cvf::Vec3d offset = rimCase->displayModelOffset(); - auto diplayCoordTrans = this->displayCoordTransform(); + auto diplayCoordTrans = displayCoordTransform(); { - cvf::Mat4d cameraMx = this->cameraPosition().getInverted(); + cvf::Mat4d cameraMx = cameraPosition().getInverted(); cvf::Vec3d translation = cameraMx.translation(); @@ -786,7 +786,7 @@ void RimGeoMechView::convertCameraPositionFromOldProjectFiles() } { - cvf::Vec3d pointOfInterest = this->cameraPointOfInterest(); + cvf::Vec3d pointOfInterest = cameraPointOfInterest(); cvf::Vec3d pointOfInterestDomain = diplayCoordTrans->scaleToDomainSize( pointOfInterest ); pointOfInterestDomain -= offset; @@ -798,8 +798,8 @@ void RimGeoMechView::convertCameraPositionFromOldProjectFiles() if ( viewer() ) { - viewer()->mainCamera()->setViewMatrix( this->cameraPosition() ); - viewer()->setPointOfInterest( this->cameraPointOfInterest() ); + viewer()->mainCamera()->setViewMatrix( cameraPosition() ); + viewer()->setPointOfInterest( cameraPointOfInterest() ); } } } @@ -847,22 +847,22 @@ size_t RimGeoMechView::onTimeStepCountRequested() //-------------------------------------------------------------------------------------------------- bool RimGeoMechView::isTimeStepDependentDataVisible() const { - if ( this->cellResult()->hasResult() || this->geoMechPropertyFilterCollection()->hasActiveFilters() ) + if ( cellResult()->hasResult() || geoMechPropertyFilterCollection()->hasActiveFilters() ) { return true; } - if ( this->hasVisibleTimeStepDependent3dWellLogCurves() ) + if ( hasVisibleTimeStepDependent3dWellLogCurves() ) { return true; } - if ( this->intersectionCollection()->hasAnyActiveSeparateResults() ) + if ( intersectionCollection()->hasAnyActiveSeparateResults() ) { return true; } - if ( this->surfaceInViewCollection() && this->surfaceInViewCollection()->hasAnyActiveSeparateResults() ) + if ( surfaceInViewCollection() && surfaceInViewCollection()->hasAnyActiveSeparateResults() ) { return true; } @@ -897,7 +897,7 @@ void RimGeoMechView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, if ( ( changedField == &m_showDisplacement ) || ( ( changedField == &m_displacementScaling ) && m_showDisplacement() ) ) { - this->createDisplayModelAndRedraw(); + createDisplayModelAndRedraw(); } } @@ -907,9 +907,9 @@ void RimGeoMechView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, void RimGeoMechView::initAfterRead() { RimGridView::initAfterRead(); - this->cellResult()->setGeoMechCase( m_geomechCase ); + cellResult()->setGeoMechCase( m_geomechCase ); - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -927,9 +927,9 @@ void RimGeoMechView::scheduleGeometryRegen( RivCellSetEnum geometryType ) { m_vizLogic->scheduleGeometryRegen( geometryType ); - if ( this->isMasterView() ) + if ( isMasterView() ) { - RimViewLinker* viewLinker = this->assosiatedViewLinker(); + RimViewLinker* viewLinker = assosiatedViewLinker(); if ( viewLinker ) { viewLinker->scheduleGeometryRegenForDepViews( geometryType ); @@ -950,8 +950,8 @@ void RimGeoMechView::setOverridePropertyFilterCollection( RimGeoMechPropertyFilt } m_propertyFilterCollection.uiCapability()->updateConnectedEditors(); - this->scheduleGeometryRegen( PROPERTY_FILTERED ); - this->scheduleCreateDisplayModelAndRedraw(); + scheduleGeometryRegen( PROPERTY_FILTERED ); + scheduleCreateDisplayModelAndRedraw(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index 482e061f58..2ae1f7e921 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -477,7 +477,7 @@ RiuPlotWidget* RimGridCrossPlot::doCreatePlotViewWidget( QWidget* mainWindowPare updateCurveNamesAndPlotTitle(); - this->connect( m_plotWidget, SIGNAL( plotZoomed() ), SLOT( onPlotZoomed() ) ); + connect( m_plotWidget, SIGNAL( plotZoomed() ), SLOT( onPlotZoomed() ) ); } return m_plotWidget; } @@ -623,7 +623,7 @@ void RimGridCrossPlot::updateCurveNamesAndPlotTitle() if ( m_plotWidget ) { - QString plotTitle = this->createAutoName(); + QString plotTitle = createAutoName(); m_plotWidget->setPlotTitle( plotTitle ); m_plotWidget->setPlotTitleEnabled( m_showPlotTitle && !isSubPlot() ); } diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp index f4dfebdd67..e3ef6c4ae4 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp @@ -1493,7 +1493,7 @@ void RimGridCrossPlotDataSet::updateCurveNames( size_t dataSetIndex, size_t data //-------------------------------------------------------------------------------------------------- void RimGridCrossPlotDataSet::updateDataSetName() { - this->setName( createAutoName() ); + setName( createAutoName() ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimBoxIntersection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimBoxIntersection.cpp index 7980edff87..6cc32f71c3 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimBoxIntersection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimBoxIntersection.cpp @@ -501,7 +501,7 @@ void RimBoxIntersection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrder uiOrdering.add( &m_show3DManipulator ); - this->defineSeparateDataSourceUi( uiConfigName, uiOrdering ); + defineSeparateDataSourceUi( uiConfigName, uiOrdering ); } //-------------------------------------------------------------------------------------------------- @@ -564,21 +564,21 @@ void RimBoxIntersection::updateVisibility() if ( m_singlePlaneState == PLANE_STATE_X ) { m_maxXCoord.uiCapability()->setUiReadOnly( true ); - this->setUiIconFromResourceString( QString( ":/IntersectionXPlane16x16.png" ) ); + setUiIconFromResourceString( QString( ":/IntersectionXPlane16x16.png" ) ); } else if ( m_singlePlaneState == PLANE_STATE_Y ) { m_maxYCoord.uiCapability()->setUiReadOnly( true ); - this->setUiIconFromResourceString( QString( ":/IntersectionYPlane16x16.png" ) ); + setUiIconFromResourceString( QString( ":/IntersectionYPlane16x16.png" ) ); } else if ( m_singlePlaneState == PLANE_STATE_Z ) { m_maxDepth.uiCapability()->setUiReadOnly( true ); - this->setUiIconFromResourceString( QString( ":/IntersectionZPlane16x16.png" ) ); + setUiIconFromResourceString( QString( ":/IntersectionZPlane16x16.png" ) ); } else { - this->setUiIconFromResourceString( QString( ":/IntersectionBox16x16.png" ) ); + setUiIconFromResourceString( QString( ":/IntersectionBox16x16.png" ) ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp index f4fe0d64fd..c3983e2d58 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp @@ -627,7 +627,7 @@ void RimExtrudedCurveIntersection::defineUiOrdering( QString uiConfigName, caf:: } } - this->defineSeparateDataSourceUi( uiConfigName, uiOrdering ); + defineSeparateDataSourceUi( uiConfigName, uiOrdering ); uiOrdering.skipRemainingFields( true ); } @@ -1161,7 +1161,7 @@ cvf::Vec3d RimExtrudedCurveIntersection::extrusionDirection() const if ( m_direction() == RimExtrudedCurveIntersection::CrossSectionDirEnum::CS_HORIZONTAL ) { - std::vector> lines = this->polyLines(); + std::vector> lines = polyLines(); if ( !lines.empty() && lines[0].size() > 1 ) { std::vector firstLine = lines[0]; diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp index 6ac5018ce5..9b50e389cc 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp @@ -146,7 +146,7 @@ caf::PdmFieldHandle* RimIntersection::objectToggleField() void RimIntersection::defineSeparateDataSourceUi( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { QString inactiveText; - if ( !this->activeSeparateResultDefinition() ) + if ( !activeSeparateResultDefinition() ) { inactiveText = " (Inactive)"; } @@ -199,7 +199,7 @@ cvf::ref RimIntersection::createHexGridInterfac return new RivEclipseIntersectionGrid( eclipseCase->eclipseCaseData()->mainGrid(), eclipseCase->eclipseCaseData()->activeCellInfo( resDef->eclipseResultDefinition()->porosityModel() ), - this->isInactiveCellsVisible() ); + isInactiveCellsVisible() ); } // Geomech case @@ -217,7 +217,7 @@ cvf::ref RimIntersection::createHexGridInterfac { RigMainGrid* grid = eclipseView->mainGrid(); - return new RivEclipseIntersectionGrid( grid, eclipseView->currentActiveCellInfo(), this->isInactiveCellsVisible() ); + return new RivEclipseIntersectionGrid( grid, eclipseView->currentActiveCellInfo(), isInactiveCellsVisible() ); } if ( geoView && geoView->femParts() ) diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp index 429e99001a..3a953ae8e8 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp @@ -125,7 +125,7 @@ void RimIntersectionCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& ui //-------------------------------------------------------------------------------------------------- void RimIntersectionCollection::applySingleColorEffect() { - if ( !this->isActive() ) return; + if ( !isActive() ) return; for ( RimExtrudedCurveIntersection* cs : m_intersections ) { @@ -149,7 +149,7 @@ void RimIntersectionCollection::applySingleColorEffect() //-------------------------------------------------------------------------------------------------- void RimIntersectionCollection::updateCellResultColor( bool hasGeneralCellResult, int timeStepIndex ) { - if ( !this->isActive() ) return; + if ( !isActive() ) return; for ( RimExtrudedCurveIntersection* cs : m_intersections ) { @@ -190,7 +190,7 @@ void RimIntersectionCollection::updateCellResultColor( bool hasGeneralCellResult //-------------------------------------------------------------------------------------------------- bool RimIntersectionCollection::hasAnyActiveSeparateResults() { - if ( !this->isActive() ) return false; + if ( !isActive() ) return false; for ( RimExtrudedCurveIntersection* cs : m_intersections ) { diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp index 7f8cfb3fbb..a0c19daddf 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp @@ -235,10 +235,10 @@ void RimIntersectionResultDefinition::updateLegendRangesTextAndVisibility( const { assignCaseIfMissing(); - if ( !this->isInAction() ) return; + if ( !isInAction() ) return; - if ( ( this->isEclipseResultDefinition() && m_eclipseResultDefinition()->hasCategoryResult() ) || - ( !this->isEclipseResultDefinition() && m_geomResultDefinition()->hasCategoryResult() ) ) + if ( ( isEclipseResultDefinition() && m_eclipseResultDefinition()->hasCategoryResult() ) || + ( !isEclipseResultDefinition() && m_geomResultDefinition()->hasCategoryResult() ) ) { regularLegendConfig()->setMappingMode( RimRegularLegendConfig::MappingType::CATEGORY_INTEGER ); regularLegendConfig()->setColorLegend( RimRegularLegendConfig::mapToColorLegend( RimRegularLegendConfig::ColorRangesType::CATEGORY ) ); @@ -257,31 +257,31 @@ void RimIntersectionResultDefinition::updateLegendRangesTextAndVisibility( const } } - if ( this->isEclipseResultDefinition() ) + if ( isEclipseResultDefinition() ) { - RimEclipseResultDefinition* eclResultDef = this->eclipseResultDefinition(); - eclResultDef->updateRangesForExplicitLegends( this->regularLegendConfig(), this->ternaryLegendConfig(), this->timeStep() ); + RimEclipseResultDefinition* eclResultDef = eclipseResultDefinition(); + eclResultDef->updateRangesForExplicitLegends( regularLegendConfig(), ternaryLegendConfig(), timeStep() ); - eclResultDef->updateLegendTitle( this->regularLegendConfig(), title ); + eclResultDef->updateLegendTitle( regularLegendConfig(), title ); - if ( this->regularLegendConfig()->showLegend() && eclResultDef->hasResult() ) + if ( regularLegendConfig()->showLegend() && eclResultDef->hasResult() ) { - nativeOrOverrideViewer->addColorLegendToBottomLeftCorner( this->regularLegendConfig()->titledOverlayFrame(), isUsingOverrideViewer ); + nativeOrOverrideViewer->addColorLegendToBottomLeftCorner( regularLegendConfig()->titledOverlayFrame(), isUsingOverrideViewer ); } else if ( eclResultDef->isTernarySaturationSelected() && eclResultDef->currentGridCellResults()->maxTimeStepCount() > 1 && - this->ternaryLegendConfig()->showLegend() && this->ternaryLegendConfig()->titledOverlayFrame() ) + ternaryLegendConfig()->showLegend() && ternaryLegendConfig()->titledOverlayFrame() ) { - this->ternaryLegendConfig()->setTitle( title ); - nativeOrOverrideViewer->addColorLegendToBottomLeftCorner( this->ternaryLegendConfig()->titledOverlayFrame(), isUsingOverrideViewer ); + ternaryLegendConfig()->setTitle( title ); + nativeOrOverrideViewer->addColorLegendToBottomLeftCorner( ternaryLegendConfig()->titledOverlayFrame(), isUsingOverrideViewer ); } } else { - this->geoMechResultDefinition()->updateLegendTextAndRanges( this->regularLegendConfig(), title, this->timeStep() ); + geoMechResultDefinition()->updateLegendTextAndRanges( regularLegendConfig(), title, timeStep() ); - if ( this->geoMechResultDefinition()->hasResult() && this->regularLegendConfig()->showLegend() ) + if ( geoMechResultDefinition()->hasResult() && regularLegendConfig()->showLegend() ) { - nativeOrOverrideViewer->addColorLegendToBottomLeftCorner( this->regularLegendConfig()->titledOverlayFrame(), isUsingOverrideViewer ); + nativeOrOverrideViewer->addColorLegendToBottomLeftCorner( regularLegendConfig()->titledOverlayFrame(), isUsingOverrideViewer ); } } } @@ -321,7 +321,7 @@ void RimIntersectionResultDefinition::fieldChangedByUi( const caf::PdmFieldHandl reDraw = true; } - this->updateConnectedEditors(); + updateConnectedEditors(); auto interResDefColl = firstAncestorOrThisOfType(); bool isInAction = isActive() && interResDefColl && interResDefColl->isActive(); @@ -345,7 +345,7 @@ void RimIntersectionResultDefinition::fieldChangedByUi( const caf::PdmFieldHandl update2dIntersectionViews(); } - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -374,8 +374,8 @@ void RimIntersectionResultDefinition::setDefaultEclipseLegendConfig() bool useDiscreteLogLevels = false; bool isCategoryResult = m_eclipseResultDefinition->hasCategoryResult(); - auto eclResultDef = this->eclipseResultDefinition(); - eclResultDef->updateRangesForExplicitLegends( this->regularLegendConfig(), this->ternaryLegendConfig(), this->timeStep() ); + auto eclResultDef = eclipseResultDefinition(); + eclResultDef->updateRangesForExplicitLegends( regularLegendConfig(), ternaryLegendConfig(), timeStep() ); m_legendConfig->setDefaultConfigForResultName( m_case->caseId(), m_eclipseResultDefinition->resultVariable(), @@ -456,7 +456,7 @@ void RimIntersectionResultDefinition::initAfterRead() { updateCaseInResultDefinitions(); - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp index 9e364abcaa..1e5f6c10bc 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp @@ -93,7 +93,7 @@ void RimIntersectionResultsDefinitionCollection::fieldChangedByUi( const caf::Pd const QVariant& oldValue, const QVariant& newValue ) { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); auto gridView = firstAncestorOrThisOfType(); if ( gridView ) gridView->scheduleCreateDisplayModelAndRedraw(); @@ -105,7 +105,7 @@ void RimIntersectionResultsDefinitionCollection::fieldChangedByUi( const caf::Pd //-------------------------------------------------------------------------------------------------- void RimIntersectionResultsDefinitionCollection::initAfterRead() { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp index 7be0afefed..75ac459c0e 100644 --- a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp @@ -53,11 +53,11 @@ RimPlotTemplateFileItem::~RimPlotTemplateFileItem() void RimPlotTemplateFileItem::setFilePath( const QString& filePath ) { QFileInfo fi( filePath ); - this->uiCapability()->setUiName( fi.baseName() ); + uiCapability()->setUiName( fi.baseName() ); m_absoluteFileName = filePath; - if ( isEnsembleTemplate() ) this->uiCapability()->setUiIcon( caf::IconProvider( ":/plot-template-ensemble.svg" ) ); + if ( isEnsembleTemplate() ) uiCapability()->setUiIcon( caf::IconProvider( ":/plot-template-ensemble.svg" ) ); } //-------------------------------------------------------------------------------------------------- @@ -81,7 +81,7 @@ bool RimPlotTemplateFileItem::isEnsembleTemplate() const //-------------------------------------------------------------------------------------------------- void RimPlotTemplateFileItem::updateIconState() { - caf::IconProvider iconProvider = this->uiIconProvider(); + caf::IconProvider iconProvider = uiIconProvider(); if ( !iconProvider.valid() ) return; if ( isDefaultTemplate() ) @@ -93,7 +93,7 @@ void RimPlotTemplateFileItem::updateIconState() iconProvider.setOverlayResourceString( "" ); } - this->setUiIcon( iconProvider ); + setUiIcon( iconProvider ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp index 0989ac6369..fd63167e95 100644 --- a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp @@ -131,7 +131,7 @@ void RimPlotTemplateFolderItem::setFolderPath( const QString& path ) m_folderName.v().setPath( path ); QFileInfo fi( path ); - this->uiCapability()->setUiName( fi.baseName() ); + uiCapability()->setUiName( fi.baseName() ); } //-------------------------------------------------------------------------------------------------- @@ -154,7 +154,7 @@ void RimPlotTemplateFolderItem::searchForFileAndFolderNames( int levelsLeft ) return; } - QDir myDir( this->m_folderName().path() ); + QDir myDir( m_folderName().path() ); if ( !myDir.isReadable() ) { return; diff --git a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.cpp index 7016aba9be..85a5306860 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.cpp @@ -136,7 +136,7 @@ void Rim2dIntersectionView::setIntersection( RimExtrudedCurveIntersection* inter m_intersection = intersection; - this->updateName(); + updateName(); } //-------------------------------------------------------------------------------------------------- @@ -348,7 +348,7 @@ void Rim2dIntersectionView::updateName() if ( m_intersection ) { Rim3dView* parentView = m_intersection->firstAncestorOrThisOfTypeAsserted(); - this->setName( parentView->name() + ": " + m_intersection->name() ); + setName( parentView->name() + ": " + m_intersection->name() ); } } @@ -471,7 +471,7 @@ size_t Rim2dIntersectionView::onTimeStepCountRequested() { if ( isTimeStepDependentDataVisible() ) { - return this->ownerCase()->timeStepStrings().size(); + return ownerCase()->timeStepStrings().size(); } return 0; @@ -528,7 +528,7 @@ void Rim2dIntersectionView::onCreateDisplayModel() nativeOrOverrideViewer()->removeAllFrames( isUsingOverrideViewer() ); - size_t tsCount = this->timeStepCount(); + size_t tsCount = timeStepCount(); for ( size_t i = 0; i < tsCount; ++i ) { @@ -563,9 +563,9 @@ void Rim2dIntersectionView::onCreateDisplayModel() { m_flatWellpathPartMgr = new RivWellPathPartMgr( m_intersection->wellPath(), settingsView ); m_flatWellpathPartMgr->appendFlattenedStaticGeometryPartsToModel( m_intersectionVizModel.p(), - this->displayCoordTransform().p(), - this->ownerCase()->characteristicCellSize(), - this->ownerCase()->activeCellsBoundingBox() ); + displayCoordTransform().p(), + ownerCase()->characteristicCellSize(), + ownerCase()->activeCellsBoundingBox() ); } } @@ -578,7 +578,7 @@ void Rim2dIntersectionView::onCreateDisplayModel() viewer()->setCurrentFrame( m_currentTimeStep ); if ( viewer()->mainCamera() && viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix ) { - this->zoomAll(); + zoomAll(); } } } @@ -607,7 +607,7 @@ void Rim2dIntersectionView::onUpdateDisplayModelForCurrentTimeStep() m_flatSimWellPipePartMgr->appendFlattenedDynamicGeometryPartsToModel( simWellModelBasicList.p(), m_currentTimeStep, - this->displayCoordTransform().p(), + displayCoordTransform().p(), m_intersection->extentLength(), m_intersection->branchIndex() ); @@ -615,7 +615,7 @@ void Rim2dIntersectionView::onUpdateDisplayModelForCurrentTimeStep() { m_flatWellHeadPartMgr->appendFlattenedDynamicGeometryPartsToModel( simWellModelBasicList.p(), m_currentTimeStep, - this->displayCoordTransform().p(), + displayCoordTransform().p(), offset ); } @@ -639,16 +639,16 @@ void Rim2dIntersectionView::onUpdateDisplayModelForCurrentTimeStep() m_flatWellpathPartMgr->appendFlattenedDynamicGeometryPartsToModel( dynWellPathModel.p(), m_currentTimeStep, - this->displayCoordTransform().p(), - this->ownerCase()->characteristicCellSize(), - this->ownerCase()->activeCellsBoundingBox() ); + displayCoordTransform().p(), + ownerCase()->characteristicCellSize(), + ownerCase()->activeCellsBoundingBox() ); dynWellPathModel->updateBoundingBoxesRecursive(); frameScene->addModel( dynWellPathModel.p() ); } } } - if ( m_flatIntersectionPartMgr.notNull() && this->hasResults() ) + if ( m_flatIntersectionPartMgr.notNull() && hasResults() ) { m_flatIntersectionPartMgr->updateCellResultColor( m_currentTimeStep, m_legendConfig->scalarMapper(), @@ -800,7 +800,7 @@ void Rim2dIntersectionView::onUpdateScaleTransform() cvf::Mat4d scale = cvf::Mat4d::IDENTITY; scale( 2, 2 ) = scaleZ(); - this->scaleTransform()->setLocalTransform( scale ); + scaleTransform()->setLocalTransform( scale ); if ( nativeOrOverrideViewer() ) nativeOrOverrideViewer()->updateCachedValuesInScene(); } @@ -820,7 +820,7 @@ void Rim2dIntersectionView::onLoadDataAndUpdate() { updateMdiWindowVisibility(); - this->scheduleCreateDisplayModelAndRedraw(); + scheduleCreateDisplayModelAndRedraw(); } //-------------------------------------------------------------------------------------------------- @@ -832,12 +832,12 @@ void Rim2dIntersectionView::fieldChangedByUi( const caf::PdmFieldHandle* changed if ( changedField == &m_intersection || changedField == &m_showDefiningPoints ) { - this->loadDataAndUpdate(); + loadDataAndUpdate(); } else if ( changedField == &m_showAxisLines ) { nativeOrOverrideViewer()->showEdgeTickMarksXZ( true, m_showAxisLines() ); - this->loadDataAndUpdate(); + loadDataAndUpdate(); } } diff --git a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp index f76542d155..6a0c0ab1ff 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp @@ -109,7 +109,7 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda } } - if ( doUpdate ) this->updateConnectedEditors(); + if ( doUpdate ) updateConnectedEditors(); auto rimCase = firstAncestorOrThisOfType(); diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 9eacf7b094..4486c73d56 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -132,7 +132,7 @@ void Rim3dOverlayInfoConfig::fieldChangedByUi( const caf::PdmFieldHandle* change } } - this->update3DInfo(); + update3DInfo(); if ( m_viewDef && m_viewDef->viewer() ) { @@ -691,12 +691,12 @@ void Rim3dOverlayInfoConfig::showStatisticsInfoDialog( bool raise ) //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::update3DInfo() { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); if ( !m_viewDef ) return; if ( !m_viewDef->viewer() ) return; - if ( !this->m_active() ) + if ( !m_active() ) { m_viewDef->viewer()->showInfoText( false ); m_viewDef->viewer()->showHistogram( false ); diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp index edc5d7844e..0636e4140f 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp @@ -164,7 +164,7 @@ Rim3dView::Rim3dView() m_cellfilterPartManager = new RivCellFilterPartMgr( this ); m_measurementPartManager = new RivMeasurementPartMgr( this ); - this->setAs3DViewMdiWindow(); + setAs3DViewMdiWindow(); // Every timer tick, send a signal for updating animations. // Any animation is supposed to connect to this signal @@ -198,9 +198,9 @@ Rim3dView::~Rim3dView() } } - if ( this->isMasterView() ) + if ( isMasterView() ) { - RimViewLinker* viewLinker = this->assosiatedViewLinker(); + RimViewLinker* viewLinker = assosiatedViewLinker(); viewLinker->setMasterView( nullptr ); delete proj->viewLinkerCollection->viewLinker(); @@ -209,7 +209,7 @@ Rim3dView::~Rim3dView() proj->uiCapability()->updateConnectedEditors(); } - RimViewController* vController = this->viewController(); + RimViewController* vController = viewController(); if ( vController ) { vController->setManagedView( nullptr ); @@ -359,7 +359,7 @@ QWidget* Rim3dView::createViewWidget( QWidget* mainWindowParent ) cvf::String yLabel; cvf::String zLabel; - this->defineAxisLabels( &xLabel, &yLabel, &zLabel ); + defineAxisLabels( &xLabel, &yLabel, &zLabel ); m_viewer->setAxisLabels( xLabel, yLabel, zLabel ); updateZScaleLabel(); @@ -375,7 +375,7 @@ void Rim3dView::updateViewWidgetAfterCreation() m_viewer->setDefaultPerspectiveNearPlaneDistance( 10 ); - this->onResetLegendsInViewer(); + onResetLegendsInViewer(); m_viewer->updateNavigationPolicy(); m_viewer->enablePerfInfoHud( RiaPreferencesSystem::current()->show3dInformation() ); @@ -386,9 +386,9 @@ void Rim3dView::updateViewWidgetAfterCreation() m_viewer->mainCamera()->viewport()->setClearColor( cvf::Color4f( backgroundColor() ) ); - this->updateGridBoxData(); - this->updateAnnotationItems(); - this->createHighlightAndGridBoxDisplayModel(); + updateGridBoxData(); + updateAnnotationItems(); + createHighlightAndGridBoxDisplayModel(); m_viewer->update(); } @@ -400,7 +400,7 @@ void Rim3dView::setId( int id ) { m_id = id; QString viewIdTooltip = QString( "View id: %1" ).arg( m_id ); - this->setUiToolTip( viewIdTooltip ); + setUiToolTip( viewIdTooltip ); } //-------------------------------------------------------------------------------------------------- @@ -441,7 +441,7 @@ void Rim3dView::updateMdiWindowTitle() //-------------------------------------------------------------------------------------------------- RimViewLinker* Rim3dView::assosiatedViewLinker() const { - RimViewLinker* viewLinker = this->viewLinkerIfMasterView(); + RimViewLinker* viewLinker = viewLinkerIfMasterView(); if ( !viewLinker ) { RimViewController* viewController = this->viewController(); @@ -502,7 +502,7 @@ void Rim3dView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOr caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup( "Grid Appearance" ); gridGroup->add( &m_scaleZ ); - m_scaleZ.uiCapability()->setUiReadOnly( !this->isScaleZEditable() ); + m_scaleZ.uiCapability()->setUiReadOnly( !isScaleZEditable() ); gridGroup->add( &meshMode ); gridGroup->add( &surfaceMode ); @@ -533,9 +533,9 @@ QImage Rim3dView::snapshotWindowContent() void Rim3dView::scheduleCreateDisplayModelAndRedraw() { RiaViewRedrawScheduler::instance()->scheduleDisplayModelUpdateAndRedraw( this ); - if ( this->isMasterView() ) + if ( isMasterView() ) { - RimViewLinker* viewLinker = this->assosiatedViewLinker(); + RimViewLinker* viewLinker = assosiatedViewLinker(); if ( viewLinker ) { viewLinker->scheduleCreateDisplayModelAndRedrawForDependentViews(); @@ -579,7 +579,7 @@ std::set Rim3dView::viewsUsingThisAsComparisonView() //-------------------------------------------------------------------------------------------------- bool Rim3dView::isScaleZEditable() { - return ( this->viewsUsingThisAsComparisonView().empty() || ( this->viewController() && this->viewController()->isCameraLinked() ) ); + return ( viewsUsingThisAsComparisonView().empty() || ( viewController() && viewController()->isCameraLinked() ) ); } //-------------------------------------------------------------------------------------------------- @@ -610,7 +610,7 @@ bool Rim3dView::isTimeStepDependentDataVisibleInThisOrComparisonView() const //-------------------------------------------------------------------------------------------------- size_t Rim3dView::timeStepCount() { - return this->onTimeStepCountRequested(); + return onTimeStepCountRequested(); } //-------------------------------------------------------------------------------------------------- @@ -618,9 +618,9 @@ size_t Rim3dView::timeStepCount() //-------------------------------------------------------------------------------------------------- QString Rim3dView::timeStepName( int frameIdx ) const { - if ( this->ownerCase() ) + if ( ownerCase() ) { - return this->ownerCase()->timeStepName( frameIdx ); + return ownerCase()->timeStepName( frameIdx ); } return QString( "" ); } @@ -638,7 +638,7 @@ void Rim3dView::setCurrentTimeStep( int frameIndex ) if ( m_currentTimeStep != oldTimeStep ) { RiuTimeStepChangedHandler::instance()->handleTimeStepChanged( this ); - this->onClearReservoirCellVisibilitiesIfNecessary(); + onClearReservoirCellVisibilitiesIfNecessary(); } } @@ -660,7 +660,7 @@ void Rim3dView::updateDisplayModelForCurrentTimeStepAndRedraw() if ( nativeOrOverrideViewer() ) { - this->onUpdateDisplayModelForCurrentTimeStep(); + onUpdateDisplayModelForCurrentTimeStep(); appendAnnotationsToModel(); appendMeasurementToModel(); appendCellFiltersToModel(); @@ -680,7 +680,7 @@ void Rim3dView::updateDisplayModelForCurrentTimeStepAndRedraw() m_isCallingUpdateDisplayModelForCurrentTimestepAndRedraw = true; - std::set containerViews = this->viewsUsingThisAsComparisonView(); + std::set containerViews = viewsUsingThisAsComparisonView(); if ( !containerViews.empty() && !isUsingOverrideViewer() ) { for ( auto view : containerViews ) @@ -701,7 +701,7 @@ void Rim3dView::createDisplayModelAndRedraw() { if ( nativeOrOverrideViewer() ) { - this->onClampCurrentTimestep(); + onClampCurrentTimestep(); onUpdateScaleTransform(); @@ -783,7 +783,7 @@ void Rim3dView::setDefaultView() //-------------------------------------------------------------------------------------------------- void Rim3dView::endAnimation() { - this->onUpdateStaticCellColors(); + onUpdateStaticCellColors(); } //-------------------------------------------------------------------------------------------------- @@ -936,7 +936,7 @@ void Rim3dView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const RiuMainWindow::instance()->updateScaleValue(); - RimViewLinker* viewLinker = this->assosiatedViewLinker(); + RimViewLinker* viewLinker = assosiatedViewLinker(); if ( viewLinker ) { viewLinker->updateScaleZ( this, scaleZ() ); @@ -995,8 +995,8 @@ void Rim3dView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const fontHolder->updateFonts(); } } - this->applyBackgroundColorAndFontChanges(); - this->updateConnectedEditors(); + applyBackgroundColorAndFontChanges(); + updateConnectedEditors(); } else if ( changedField == &maximumFrameRate ) { @@ -1026,13 +1026,13 @@ void Rim3dView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const //-------------------------------------------------------------------------------------------------- void Rim3dView::addWellPathsToModel( cvf::ModelBasicList* wellPathModelBasicList, const cvf::BoundingBox& wellPathClipBoundingBox ) { - if ( !this->ownerCase() ) return; + if ( !ownerCase() ) return; cvf::ref transForm = displayCoordTransform(); m_wellPathsPartManager->appendStaticGeometryPartsToModel( wellPathModelBasicList, transForm.p(), - this->ownerCase()->characteristicCellSize(), + ownerCase()->characteristicCellSize(), wellPathClipBoundingBox ); wellPathModelBasicList->updateBoundingBoxesRecursive(); @@ -1043,7 +1043,7 @@ void Rim3dView::addWellPathsToModel( cvf::ModelBasicList* wellPathModelBasicList //-------------------------------------------------------------------------------------------------- void Rim3dView::addDynamicWellPathsToModel( cvf::ModelBasicList* wellPathModelBasicList, const cvf::BoundingBox& wellPathClipBoundingBox ) { - if ( !this->ownerCase() ) return; + if ( !ownerCase() ) return; cvf::ref transForm = displayCoordTransform(); @@ -1051,7 +1051,7 @@ void Rim3dView::addDynamicWellPathsToModel( cvf::ModelBasicList* wellPathModelBa m_wellPathsPartManager->appendDynamicGeometryPartsToModel( wellPathModelBasicList, timeStepIndex, transForm.p(), - this->ownerCase()->characteristicCellSize(), + ownerCase()->characteristicCellSize(), wellPathClipBoundingBox ); wellPathModelBasicList->updateBoundingBoxesRecursive(); @@ -1062,7 +1062,7 @@ void Rim3dView::addDynamicWellPathsToModel( cvf::ModelBasicList* wellPathModelBa //-------------------------------------------------------------------------------------------------- void Rim3dView::addAnnotationsToModel( cvf::ModelBasicList* annotationsModel ) { - if ( !this->ownerCase() ) return; + if ( !ownerCase() ) return; auto annotationCollections = descendantsIncludingThisOfType(); @@ -1084,7 +1084,7 @@ void Rim3dView::addAnnotationsToModel( cvf::ModelBasicList* annotationsModel ) //-------------------------------------------------------------------------------------------------- void Rim3dView::addCellFiltersToModel( cvf::ModelBasicList* cellFilterModel ) { - if ( !this->ownerCase() ) return; + if ( !ownerCase() ) return; cvf::ref transForm = displayCoordTransform(); m_cellfilterPartManager->appendGeometryPartsToModel( cellFilterModel, transForm.p(), ownerCase()->allCellsBoundingBox() ); @@ -1097,7 +1097,7 @@ void Rim3dView::addCellFiltersToModel( cvf::ModelBasicList* cellFilterModel ) //-------------------------------------------------------------------------------------------------- void Rim3dView::addMeasurementToModel( cvf::ModelBasicList* measureModel ) { - if ( !this->ownerCase() ) return; + if ( !ownerCase() ) return; RimMeasurement* measurement = RimProject::current()->measurement(); @@ -1124,7 +1124,7 @@ void Rim3dView::addMeasurementToModel( cvf::ModelBasicList* measureModel ) //---------------------------------------------------- ---------------------------------------------- bool Rim3dView::isMasterView() const { - RimViewLinker* viewLinker = this->assosiatedViewLinker(); + RimViewLinker* viewLinker = assosiatedViewLinker(); return viewLinker && this == viewLinker->masterView(); } @@ -1197,7 +1197,7 @@ void Rim3dView::setScaleZAndUpdate( double scalingFactor ) { if ( scaleZ() != scalingFactor ) { - this->m_scaleZ.setValueWithFieldChanged( scalingFactor ); + m_scaleZ.setValueWithFieldChanged( scalingFactor ); } } @@ -1230,8 +1230,8 @@ void Rim3dView::updateScaling() dir = viewer()->mainCamera()->direction(); up = viewer()->mainCamera()->up(); - eye[2] = poi[2] * m_scaleZ() / this->scaleTransform()->worldTransform()( 2, 2 ) + ( eye[2] - poi[2] ); - poi[2] = poi[2] * m_scaleZ() / this->scaleTransform()->worldTransform()( 2, 2 ); + eye[2] = poi[2] * m_scaleZ() / scaleTransform()->worldTransform()( 2, 2 ) + ( eye[2] - poi[2] ); + poi[2] = poi[2] * m_scaleZ() / scaleTransform()->worldTransform()( 2, 2 ); viewer()->mainCamera()->setFromLookAt( eye, eye + dir, up ); viewer()->setPointOfInterest( poi ); @@ -1246,7 +1246,7 @@ void Rim3dView::updateScaling() updateGridBoxData(); updateZScaleLabel(); - this->scheduleCreateDisplayModelAndRedraw(); + scheduleCreateDisplayModelAndRedraw(); } //-------------------------------------------------------------------------------------------------- @@ -1319,7 +1319,7 @@ void Rim3dView::createHighlightAndGridBoxDisplayModel() nativeOrOverrideViewer()->addStaticModelOnce( m_highlightVizModel.p(), isUsingOverrideViewer() ); } - this->updateGridBoxData(); + updateGridBoxData(); if ( viewer() ) viewer()->showGridBox( m_showGridBox() ); } @@ -1355,7 +1355,7 @@ void Rim3dView::applyBackgroundColorAndFontChanges() updateConnectedEditors(); onUpdateLegends(); - this->scheduleCreateDisplayModelAndRedraw(); + scheduleCreateDisplayModelAndRedraw(); } //-------------------------------------------------------------------------------------------------- @@ -1431,7 +1431,7 @@ void Rim3dView::updateDisplayModelVisibility() viewer()->setEnableMask( mask, false ); viewer()->setEnableMask( mask, true ); - this->onUpdateDisplayModelVisibility(); + onUpdateDisplayModelVisibility(); viewer()->update(); } @@ -1627,7 +1627,7 @@ void Rim3dView::appendAnnotationsToModel() if ( frameScene ) { cvf::String name = "Annotations"; - this->removeModelByName( frameScene, name ); + removeModelByName( frameScene, name ); cvf::ref model = new cvf::ModelBasicList; model->setName( name ); @@ -1649,7 +1649,7 @@ void Rim3dView::appendCellFiltersToModel() if ( frameScene ) { cvf::String name = "CellFilters"; - this->removeModelByName( frameScene, name ); + removeModelByName( frameScene, name ); cvf::ref model = new cvf::ModelBasicList; model->setName( name ); @@ -1671,7 +1671,7 @@ void Rim3dView::appendMeasurementToModel() if ( frameScene ) { cvf::String name = "Measurement"; - this->removeModelByName( frameScene, name ); + removeModelByName( frameScene, name ); cvf::ref model = new cvf::ModelBasicList; model->setName( name ); diff --git a/ApplicationLibCode/ProjectDataModel/RimCase.cpp b/ApplicationLibCode/ProjectDataModel/RimCase.cpp index 463bf8b59c..36cbff7206 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCase.cpp @@ -123,8 +123,8 @@ void RimCase::setGridFileName( const QString& fileName ) { m_caseFileName.v().setPath( fileName ); - this->updateAutoShortName(); - this->updateTreeItemName(); + updateAutoShortName(); + updateTreeItemName(); } //-------------------------------------------------------------------------------------------------- @@ -167,7 +167,7 @@ std::vector RimCase::views() const { if ( m_isInActiveDestruction ) return std::vector(); - std::vector allViews = this->allSpecialViews(); + std::vector allViews = allSpecialViews(); std::vector isectViews = m_2dIntersectionViewCollection->views(); for ( auto view : isectViews ) diff --git a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp index fc53bd0bcc..5899a7e874 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp @@ -49,7 +49,7 @@ RimCaseCollection::~RimCaseCollection() //-------------------------------------------------------------------------------------------------- RimIdenticalGridCaseGroup* RimCaseCollection::parentCaseGroup() { - return dynamic_cast( this->parentField()->ownerObject() ); + return dynamic_cast( parentField()->ownerObject() ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp b/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp index e1a79c490e..8251eb5c22 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp @@ -184,7 +184,7 @@ void RimCellEdgeColors::loadResult() //-------------------------------------------------------------------------------------------------- void RimCellEdgeColors::initAfterRead() { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); if ( m_singleVarEdgeResultColors_OBSOLETE->resultVariableUiName() != RiaResultNames::undefinedResultName() ) { @@ -432,10 +432,10 @@ void RimCellEdgeColors::cellEdgeMetaData( std::vector* meta { CVF_ASSERT( metaDataVector ); - auto addresses = this->resultAddresses(); + auto addresses = resultAddresses(); std::vector resultNames; - this->gridScalarResultNames( &resultNames ); + gridScalarResultNames( &resultNames ); bool isStatic = true; diff --git a/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp b/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp index cb227f548d..ee3a470826 100644 --- a/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp @@ -127,7 +127,7 @@ void RimColorLegend::fieldChangedByUi( const caf::PdmFieldHandle* changedField, //-------------------------------------------------------------------------------------------------- void RimColorLegend::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) { - this->setUiIcon( paletteIconProvider() ); + setUiIcon( paletteIconProvider() ); } //-------------------------------------------------------------------------------------------------- @@ -181,7 +181,7 @@ caf::IconProvider RimColorLegend::paletteIconProvider() const //-------------------------------------------------------------------------------------------------- void RimColorLegend::onColorLegendItemHasChanged() { - this->updateConnectedEditors(); + updateConnectedEditors(); std::vector referringObjects = objectsWithReferringPtrFields(); diff --git a/ApplicationLibCode/ProjectDataModel/RimColorLegendCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimColorLegendCollection.cpp index 37521221d0..8004ccfa82 100644 --- a/ApplicationLibCode/ProjectDataModel/RimColorLegendCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimColorLegendCollection.cpp @@ -181,7 +181,7 @@ void RimColorLegendCollection::createStandardColorLegends() m_standardColorLegends.push_back( createRockTypeColorLegend() ); - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp b/ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp index 4ae3e224f8..902ea74c26 100644 --- a/ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp @@ -159,8 +159,8 @@ void RimColorLegendItem::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrd { QColor qcolor( m_color().rByte(), m_color().gByte(), m_color().bByte() ); - caf::IconProvider iconProvider = this->uiIconProvider(); + caf::IconProvider iconProvider = uiIconProvider(); iconProvider.setBackgroundColorString( qcolor.name() ); - this->setUiIcon( iconProvider ); + setUiIcon( iconProvider ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp b/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp index 46d0fec955..4b51937e9e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp @@ -89,7 +89,7 @@ void RimCommandExecuteScript::redo() QStringList arguments = app->octaveArguments(); arguments.append( "--eval" ); - arguments << this->scriptText(); + arguments << scriptText(); RiaApplication::instance()->launchProcess( octavePath, arguments, app->octaveProcessEnvironment() ); } @@ -210,11 +210,11 @@ void RimCommandIssueFieldChanged::redo() RiaApplication* app = RiaApplication::instance(); PdmObject* project = app->project(); - caf::PdmObjectHandle* pdmObject = findObjectByName( project, this->objectName ); + caf::PdmObjectHandle* pdmObject = findObjectByName( project, objectName ); if ( pdmObject ) { - caf::PdmFieldHandle* fieldHandle = findFieldByKeyword( pdmObject, this->fieldName ); + caf::PdmFieldHandle* fieldHandle = findFieldByKeyword( pdmObject, fieldName ); if ( fieldHandle && fieldHandle->uiCapability() ) { @@ -222,7 +222,7 @@ void RimCommandIssueFieldChanged::redo() CVF_ASSERT( valueField ); QVariant oldValue = valueField->toQVariant(); - QVariant newValue( this->fieldValueToApply ); + QVariant newValue( fieldValueToApply ); valueField->setFromQVariant( newValue ); diff --git a/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp index 228ed88279..cf1eb274a2 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp @@ -334,7 +334,7 @@ cvf::Vec2ui RimContourMapProjection::numberOfElementsIJ() const //-------------------------------------------------------------------------------------------------- cvf::Vec2ui RimContourMapProjection::numberOfVerticesIJ() const { - cvf::Vec2ui mapSize = this->numberOfElementsIJ(); + cvf::Vec2ui mapSize = numberOfElementsIJ(); mapSize.x() += 1u; mapSize.y() += 1u; return mapSize; @@ -1546,7 +1546,7 @@ double RimContourMapProjection::calculateValueAtVertex( uint vi, uint vj ) const //-------------------------------------------------------------------------------------------------- std::vector> RimContourMapProjection::cellsAtIJ( uint i, uint j ) const { - size_t cellIndex = this->cellIndexFromIJ( i, j ); + size_t cellIndex = cellIndexFromIJ( i, j ); if ( cellIndex < m_projected3dGridIndices.size() ) { return m_projected3dGridIndices[cellIndex]; diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp index 013ddb52b9..e569a2414b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp @@ -1265,7 +1265,7 @@ void RimDepthTrackPlot::updatePlots() { plot->loadDataAndUpdate(); } - this->updateZoom(); + updateZoom(); } } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp index f9c75e30dc..39afe7c0ea 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp @@ -129,7 +129,7 @@ RimEclipseCase::RimEclipseCase() m_fractureModelResults.uiCapability()->setUiTreeHidden( true ); m_fractureModelResults.uiCapability()->setUiTreeChildrenHidden( true ); - this->setReservoirData( nullptr ); + setReservoirData( nullptr ); } //-------------------------------------------------------------------------------------------------- @@ -151,15 +151,15 @@ RimEclipseCase::~RimEclipseCase() RimWellLogPlotCollection* plotCollection = project->mainPlotCollection()->wellLogPlotCollection(); if ( plotCollection ) { - plotCollection->removeExtractors( this->eclipseCaseData() ); + plotCollection->removeExtractors( eclipseCaseData() ); } } } - if ( this->eclipseCaseData() ) + if ( eclipseCaseData() ) { // At this point, we assume that memory should be released - CVF_ASSERT( this->eclipseCaseData()->refCount() == 1 ); + CVF_ASSERT( eclipseCaseData()->refCount() == 1 ); } } @@ -217,7 +217,7 @@ cvf::Color3f RimEclipseCase::defaultWellColor( const QString& wellName ) cvf::Color3ubArray wellColors = colorTable.color3ubArray(); cvf::Color3ubArray interpolatedWellColors = wellColors; - const cvf::Collection& simWellData = this->eclipseCaseData()->wellResults(); + const cvf::Collection& simWellData = eclipseCaseData()->wellResults(); if ( simWellData.size() > 1 ) { interpolatedWellColors = caf::ColorTable::interpolateColorArray( wellColors, simWellData.size() ); @@ -665,7 +665,7 @@ void RimEclipseCase::computeCachedData() //-------------------------------------------------------------------------------------------------- RimCaseCollection* RimEclipseCase::parentCaseCollection() { - return dynamic_cast( this->parentField()->ownerObject() ); + return dynamic_cast( parentField()->ownerObject() ); } //-------------------------------------------------------------------------------------------------- @@ -708,8 +708,8 @@ void RimEclipseCase::loadAndSynchronizeInputProperties( bool importGridOrFaultDa { // Make sure we actually have reservoir data - CVF_ASSERT( this->eclipseCaseData() ); - CVF_ASSERT( this->eclipseCaseData()->mainGrid()->gridPointDimensions() != cvf::Vec3st( 0, 0, 0 ) ); + CVF_ASSERT( eclipseCaseData() ); + CVF_ASSERT( eclipseCaseData()->mainGrid()->gridPointDimensions() != cvf::Vec3st( 0, 0, 0 ) ); // Then read the properties from all the files referenced by the InputReservoir @@ -778,7 +778,7 @@ void RimEclipseCase::createDisplayModelAndUpdateAllViews() void RimEclipseCase::setReservoirData( RigEclipseCaseData* eclipseCase ) { m_rigEclipseCase = eclipseCase; - if ( this->eclipseCaseData() ) + if ( eclipseCaseData() ) { m_fractureModelResults()->setCellResults( eclipseCaseData()->results( RiaDefines::PorosityModelType::FRACTURE_MODEL ) ); m_matrixModelResults()->setCellResults( eclipseCaseData()->results( RiaDefines::PorosityModelType::MATRIX_MODEL ) ); @@ -1092,7 +1092,7 @@ QStringList RimEclipseCase::timeStepStrings() const int timeStepCount = static_cast( cellResultData->maxTimeStepCount() ); for ( int i = 0; i < timeStepCount; i++ ) { - stringList += this->timeStepName( i ); + stringList += timeStepName( i ); } } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp index 3513b007d3..6f658f0a6e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -54,17 +54,17 @@ RimEclipseCellColors::RimEclipseCellColors() CAF_PDM_InitScriptableObjectWithNameAndComment( "Cell Result", ":/CellResult.png", "", "", "CellColors", "Eclipse Cell Colors class" ); CAF_PDM_InitFieldNoDefault( &obsoleteField_legendConfig, "LegendDefinition", "Color Legend" ); - this->obsoleteField_legendConfig.xmlCapability()->setIOWritable( false ); + obsoleteField_legendConfig.xmlCapability()->setIOWritable( false ); CAF_PDM_InitFieldNoDefault( &m_legendConfigData, "ResultVarLegendDefinitionList", "" ); CAF_PDM_InitFieldNoDefault( &m_ternaryLegendConfig, "TernaryLegendDefinition", "Ternary Color Legend" ); - this->m_ternaryLegendConfig = new RimTernaryLegendConfig(); + m_ternaryLegendConfig = new RimTernaryLegendConfig(); CAF_PDM_InitFieldNoDefault( &m_legendConfigPtrField, "LegendDefinitionPtrField", "Color Legend PtrField" ); // Make sure we have a created legend for the default/undefined result variable - changeLegendConfig( this->resultVariable() ); + changeLegendConfig( resultVariable() ); m_useDiscreteLogLevels = false; } @@ -89,21 +89,21 @@ void RimEclipseCellColors::fieldChangedByUi( const caf::PdmFieldHandle* changedF RimEclipseResultDefinition::fieldChangedByUi( changedField, oldValue, newValue ); // Update of legend config must happen after RimEclipseResultDefinition::fieldChangedByUi(), as this function - // modifies this->resultVariable() + // modifies resultVariable() if ( changedField == &m_resultVariableUiField ) { if ( oldValue != newValue ) { - changeLegendConfig( this->resultVariableUiName() ); + changeLegendConfig( resultVariableUiName() ); } - RimEclipseFaultColors* faultColors = dynamic_cast( this->parentField()->ownerObject() ); + RimEclipseFaultColors* faultColors = dynamic_cast( parentField()->ownerObject() ); if ( faultColors ) { faultColors->updateConnectedEditors(); } - RimCellEdgeColors* cellEdgeColors = dynamic_cast( this->parentField()->ownerObject() ); + RimCellEdgeColors* cellEdgeColors = dynamic_cast( parentField()->ownerObject() ); if ( cellEdgeColors ) { cellEdgeColors->updateConnectedEditors(); @@ -122,20 +122,20 @@ void RimEclipseCellColors::changeLegendConfig( QString resultVarNameOfNewLegend { QString legendResultVariable; - if ( this->m_legendConfigPtrField() ) + if ( m_legendConfigPtrField() ) { - legendResultVariable = this->m_legendConfigPtrField()->resultVariableName(); + legendResultVariable = m_legendConfigPtrField()->resultVariableName(); } - if ( !this->m_legendConfigPtrField() || legendResultVariable != resultVarNameOfNewLegend ) + if ( !m_legendConfigPtrField() || legendResultVariable != resultVarNameOfNewLegend ) { bool found = false; for ( size_t i = 0; i < m_legendConfigData.size(); i++ ) { if ( m_legendConfigData[i]->resultVariableName() == resultVarNameOfNewLegend ) { - this->m_legendConfigPtrField = m_legendConfigData[i]; - found = true; + m_legendConfigPtrField = m_legendConfigData[i]; + found = true; break; } } @@ -145,14 +145,13 @@ void RimEclipseCellColors::changeLegendConfig( QString resultVarNameOfNewLegend int caseId = 0; if ( eclipseCase() ) caseId = eclipseCase()->caseId(); - auto newLegend = - createLegendForResult( caseId, resultVarNameOfNewLegend, this->m_useDiscreteLogLevels, this->hasCategoryResult() ); + auto newLegend = createLegendForResult( caseId, resultVarNameOfNewLegend, m_useDiscreteLogLevels, hasCategoryResult() ); newLegend->changed.connect( this, &RimEclipseCellColors::onLegendConfigChanged ); m_legendConfigData.push_back( newLegend ); - this->m_legendConfigPtrField = newLegend; + m_legendConfigPtrField = newLegend; } } } @@ -187,9 +186,9 @@ void RimEclipseCellColors::initAfterRead() { RimEclipseResultDefinition::initAfterRead(); - if ( this->m_legendConfigPtrField() && this->m_legendConfigPtrField()->resultVariableName() == "" ) + if ( m_legendConfigPtrField() && m_legendConfigPtrField()->resultVariableName() == "" ) { - this->m_legendConfigPtrField()->resultVariableName = this->resultVariable(); + m_legendConfigPtrField()->resultVariableName = resultVariable(); } if ( obsoleteField_legendConfig ) @@ -206,7 +205,7 @@ void RimEclipseCellColors::initAfterRead() m_legendConfigPtrField = obsoleteLegend; } - changeLegendConfig( this->resultVariable() ); + changeLegendConfig( resultVariable() ); updateIconState(); } @@ -229,7 +228,7 @@ void RimEclipseCellColors::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd //-------------------------------------------------------------------------------------------------- void RimEclipseCellColors::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ ) { - if ( this->resultVariable() == RiaResultNames::ternarySaturationResultName() ) + if ( resultVariable() == RiaResultNames::ternarySaturationResultName() ) { uiTreeOrdering.add( m_ternaryLegendConfig() ); } @@ -251,7 +250,7 @@ void RimEclipseCellColors::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeO //-------------------------------------------------------------------------------------------------- void RimEclipseCellColors::updateLegendCategorySettings() { - changeLegendConfig( this->resultVariableUiName() ); + changeLegendConfig( resultVariableUiName() ); } //-------------------------------------------------------------------------------------------------- @@ -286,7 +285,7 @@ void RimEclipseCellColors::setReservoirView( RimEclipseView* ownerReservoirView m_reservoirView = ownerReservoirView; if ( ownerReservoirView ) { - this->setEclipseCase( ownerReservoirView->eclipseCase() ); + setEclipseCase( ownerReservoirView->eclipseCase() ); } } @@ -303,7 +302,7 @@ RimEclipseView* RimEclipseCellColors::reservoirView() //-------------------------------------------------------------------------------------------------- void RimEclipseCellColors::updateRangesForEmbeddedLegends( int currentTimeStep ) { - this->updateRangesForExplicitLegends( legendConfig(), m_ternaryLegendConfig(), currentTimeStep ); + updateRangesForExplicitLegends( legendConfig(), m_ternaryLegendConfig(), currentTimeStep ); } //-------------------------------------------------------------------------------------------------- @@ -313,7 +312,7 @@ void RimEclipseCellColors::setResultVariable( const QString& val ) { RimEclipseResultDefinition::setResultVariable( val ); - this->changeLegendConfig( val ); + changeLegendConfig( val ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp index a5f16a453e..207adb36e3 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp @@ -165,10 +165,10 @@ double RimEclipseContourMapProjection::sampleSpacing() const //-------------------------------------------------------------------------------------------------- void RimEclipseContourMapProjection::clearGridMappingAndRedraw() { - this->clearGridMapping(); - this->updateConnectedEditors(); - this->generateResultsIfNecessary( view()->currentTimeStep() ); - this->updateLegend(); + clearGridMapping(); + updateConnectedEditors(); + generateResultsIfNecessary( view()->currentTimeStep() ); + updateLegend(); RimEclipseView* parentView = firstAncestorOrThisOfTypeAsserted(); parentView->scheduleCreateDisplayModelAndRedraw(); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp index 031fffa5bc..67e3b0f960 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp @@ -191,15 +191,15 @@ void RimEclipseContourMapView::onCreateDisplayModel() { RimEclipseView::onCreateDisplayModel(); - if ( !this->isTimeStepDependentDataVisible() ) + if ( !isTimeStepDependentDataVisible() ) { // Need to add geometry even if it hasn't happened during dynamic time step update. updateGeometry(); } - if ( this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix ) + if ( viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix ) { - this->zoomAll(); + zoomAll(); } } @@ -209,8 +209,8 @@ void RimEclipseContourMapView::onCreateDisplayModel() void RimEclipseContourMapView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup( "Viewer" ); - viewGroup->add( this->userDescriptionField() ); - viewGroup->add( this->backgroundColorField() ); + viewGroup->add( userDescriptionField() ); + viewGroup->add( backgroundColorField() ); viewGroup->add( &m_showAxisLines ); viewGroup->add( &m_showScaleLegend ); @@ -325,7 +325,7 @@ void RimEclipseContourMapView::appendContourMapProjectionToModel() cvf::ref contourMapProjectionModelBasicList = new cvf::ModelBasicList; contourMapProjectionModelBasicList->setName( name ); - cvf::ref transForm = this->displayCoordTransform(); + cvf::ref transForm = displayCoordTransform(); m_contourMapProjectionPartMgr->appendProjectionToModel( contourMapProjectionModelBasicList.p(), transForm.p() ); contourMapProjectionModelBasicList->updateBoundingBoxesRecursive(); @@ -350,7 +350,7 @@ void RimEclipseContourMapView::appendContourLinesToModel() cvf::ref contourMapLabelModelBasicList = new cvf::ModelBasicList; contourMapLabelModelBasicList->setName( name ); - cvf::ref transForm = this->displayCoordTransform(); + cvf::ref transForm = displayCoordTransform(); m_contourMapProjectionPartMgr->appendContourLinesToModel( viewer()->mainCamera(), contourMapLabelModelBasicList.p(), transForm.p() ); contourMapLabelModelBasicList->updateBoundingBoxesRecursive(); @@ -375,7 +375,7 @@ void RimEclipseContourMapView::appendPickPointVisToModel() cvf::ref contourMapProjectionModelBasicList = new cvf::ModelBasicList; contourMapProjectionModelBasicList->setName( name ); - cvf::ref transForm = this->displayCoordTransform(); + cvf::ref transForm = displayCoordTransform(); m_contourMapProjectionPartMgr->appendPickPointVisToModel( contourMapProjectionModelBasicList.p(), transForm.p() ); contourMapProjectionModelBasicList->updateBoundingBoxesRecursive(); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp index c1d08313ac..6fdfc2c668 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp @@ -69,7 +69,7 @@ void RimEclipseFaultColors::setReservoirView( RimEclipseView* ownerReservoirView //-------------------------------------------------------------------------------------------------- void RimEclipseFaultColors::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); if ( m_reservoirView ) m_reservoirView->scheduleCreateDisplayModelAndRedraw(); } @@ -81,7 +81,7 @@ void RimEclipseFaultColors::initAfterRead() { m_customFaultResultColors->initAfterRead(); - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -89,7 +89,7 @@ void RimEclipseFaultColors::initAfterRead() //-------------------------------------------------------------------------------------------------- RimEclipseCellColors* RimEclipseFaultColors::customFaultResult() { - return this->m_customFaultResultColors(); + return m_customFaultResultColors(); } //-------------------------------------------------------------------------------------------------- @@ -127,7 +127,7 @@ void RimEclipseFaultColors::defineUiOrdering( QString uiConfigName, caf::PdmUiOr //-------------------------------------------------------------------------------------------------- bool RimEclipseFaultColors::hasValidCustomResult() { - if ( this->showCustomFaultResult() ) + if ( showCustomFaultResult() ) { if ( m_customFaultResultColors->hasResult() || m_customFaultResultColors->isTernarySaturationSelected() ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp index 3a69d74b26..b9319f1c0f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp @@ -86,7 +86,7 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) { if ( fileNames.contains( RiaDefines::mockModelBasicInputCase() ) ) { - cvf::ref readerInterface = this->createMockModel( fileNames[0] ); + cvf::ref readerInterface = createMockModel( fileNames[0] ); results( RiaDefines::PorosityModelType::MATRIX_MODEL )->setReaderInterface( readerInterface.p() ); results( RiaDefines::PorosityModelType::FRACTURE_MODEL )->setReaderInterface( readerInterface.p() ); @@ -95,16 +95,16 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) QFileInfo gridFileName( fileNames[0] ); QString caseName = gridFileName.completeBaseName(); - this->setCaseUserDescription( caseName ); + setCaseUserDescription( caseName ); computeCachedData(); return true; } - if ( this->eclipseCaseData() == nullptr ) + if ( eclipseCaseData() == nullptr ) { - this->setReservoirData( new RigEclipseCaseData( this ) ); + setReservoirData( new RigEclipseCaseData( this ) ); } bool importFaults = RiaPreferences::current()->readerSettings()->importFaults(); @@ -114,12 +114,12 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) QString gridFileName; // First find and read the grid data - if ( this->eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st( 0, 0, 0 ) ) + if ( eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st( 0, 0, 0 ) ) { for ( int i = 0; i < fileNames.size(); i++ ) { QString errorMessages; - if ( RifEclipseInputFileTools::openGridFile( fileNames[i], this->eclipseCaseData(), importFaults, &errorMessages ) ) + if ( RifEclipseInputFileTools::openGridFile( fileNames[i], eclipseCaseData(), importFaults, &errorMessages ) ) { setGridFileName( fileNames[i] ); gridFileName = fileNames[i]; @@ -127,9 +127,9 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) QFileInfo gridFileName( fileNames[i] ); QString caseName = gridFileName.completeBaseName(); - this->setCaseUserDescription( caseName ); + setCaseUserDescription( caseName ); - this->eclipseCaseData()->mainGrid()->setFlipAxis( m_flipXAxis, m_flipYAxis ); + eclipseCaseData()->mainGrid()->setFlipAxis( m_flipXAxis, m_flipYAxis ); computeCachedData(); @@ -142,7 +142,7 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) } } - if ( this->eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st( 0, 0, 0 ) ) + if ( eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st( 0, 0, 0 ) ) { for ( QString errorMessages : allErrorMessages ) { @@ -173,12 +173,12 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) if ( !filesToRead.empty() ) { - RifInputPropertyLoader::loadAndSynchronizeInputProperties( m_inputPropertyCollection, this->eclipseCaseData(), filesToRead, importFaults ); + RifInputPropertyLoader::loadAndSynchronizeInputProperties( m_inputPropertyCollection, eclipseCaseData(), filesToRead, importFaults ); } if ( importFaults ) { - this->ensureFaultDataIsComputed(); + ensureFaultDataIsComputed(); } results( RiaDefines::PorosityModelType::MATRIX_MODEL )->createPlaceholderResultEntries(); @@ -192,13 +192,13 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames ) bool RimEclipseInputCase::openEclipseGridFile() { // Early exit if reservoir data is created - if ( this->eclipseCaseData() == nullptr ) + if ( eclipseCaseData() == nullptr ) { cvf::ref readerInterface; if ( gridFileName().contains( RiaDefines::mockModelBasicInputCase() ) ) { - readerInterface = this->createMockModel( gridFileName() ); + readerInterface = createMockModel( gridFileName() ); } else { @@ -210,16 +210,16 @@ bool RimEclipseInputCase::openEclipseGridFile() return false; } - this->setReservoirData( eclipseCase.p() ); + setReservoirData( eclipseCase.p() ); } - CVF_ASSERT( this->eclipseCaseData() ); + CVF_ASSERT( eclipseCaseData() ); CVF_ASSERT( readerInterface.notNull() ); results( RiaDefines::PorosityModelType::MATRIX_MODEL )->setReaderInterface( readerInterface.p() ); results( RiaDefines::PorosityModelType::FRACTURE_MODEL )->setReaderInterface( readerInterface.p() ); - this->eclipseCaseData()->mainGrid()->setFlipAxis( m_flipXAxis, m_flipYAxis ); + eclipseCaseData()->mainGrid()->setFlipAxis( m_flipXAxis, m_flipYAxis ); loadAndSynchronizeInputProperties( true ); computeCachedData(); @@ -286,7 +286,7 @@ cvf::ref RimEclipseInputCase::createMockModel( QString model m_inputPropertyCollection->inputProperties.push_back( inputProperty ); } - this->setReservoirData( reservoir.p() ); + setReservoirData( reservoir.p() ); return mockFileInterface.p(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp index ce479cf7e4..4bb0144d65 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp @@ -52,7 +52,7 @@ std::vector RimEclipseInputPropertyCollection::findInp { QFileInfo fileInfo( fileName ); std::vector result; - for ( size_t i = 0; i < this->inputProperties.size(); ++i ) + for ( size_t i = 0; i < inputProperties.size(); ++i ) { if ( !inputProperties[i] ) continue; @@ -68,7 +68,7 @@ std::vector RimEclipseInputPropertyCollection::findInp //-------------------------------------------------------------------------------------------------- RimEclipseInputProperty* RimEclipseInputPropertyCollection::findInputProperty( QString resultName ) { - for ( size_t i = 0; i < this->inputProperties.size(); i++ ) + for ( size_t i = 0; i < inputProperties.size(); i++ ) { if ( inputProperties[i] && inputProperties[i]->resultName() == resultName ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp index 3fa3cad1c4..1501faad59 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -124,7 +124,7 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter if ( gridFileName().contains( "Result Mock Debug Model" ) ) { - readerInterface = this->createMockModel( this->gridFileName() ); + readerInterface = createMockModel( gridFileName() ); } else { @@ -134,7 +134,7 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter } cvf::ref readerEclipseOutput = new RifReaderEclipseOutput; - readerEclipseOutput->setFilenamesWithFaults( this->filesContainingFaults() ); + readerEclipseOutput->setFilenamesWithFaults( filesContainingFaults() ); readerEclipseOutput->setReaderSettings( m_readerSettings ); cvf::ref restartDataAccess = RifEclipseOutputFileTools::createDynamicResultAccess( gridFileName() ); @@ -182,9 +182,9 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter return false; } - this->setFilesContainingFaults( readerEclipseOutput->filenamesWithFaults() ); + setFilesContainingFaults( readerEclipseOutput->filenamesWithFaults() ); - this->setReservoirData( eclipseCase.p() ); + setReservoirData( eclipseCase.p() ); readerInterface = readerEclipseOutput; } @@ -196,7 +196,7 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter m_flowDagSolverInterface = new RigFlowDiagSolverInterface( this ); - CVF_ASSERT( this->eclipseCaseData() ); + CVF_ASSERT( eclipseCaseData() ); CVF_ASSERT( readerInterface.notNull() ); progInfo.setProgressDescription( "Computing Case Cache" ); @@ -237,7 +237,7 @@ bool RimEclipseResultCase::importAsciiInputProperties( const QStringList& fileNa { bool importFaults = false; RifInputPropertyLoader::loadAndSynchronizeInputProperties( m_inputPropertyCollection, - this->eclipseCaseData(), + eclipseCaseData(), std::vector( fileNames.begin(), fileNames.end() ), importFaults ); @@ -266,7 +266,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData( RigEclipseCaseData* mainEc cvf::ref readerInterface; if ( gridFileName().contains( "Result Mock Debug Model" ) ) { - readerInterface = this->createMockModel( this->gridFileName() ); + readerInterface = createMockModel( gridFileName() ); } else { @@ -287,7 +287,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData( RigEclipseCaseData* mainEc return false; } - this->setReservoirData( eclipseCase.p() ); + setReservoirData( eclipseCase.p() ); readerInterface = readerEclipseOutput; } @@ -295,7 +295,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData( RigEclipseCaseData* mainEc results( RiaDefines::PorosityModelType::MATRIX_MODEL )->setReaderInterface( readerInterface.p() ); results( RiaDefines::PorosityModelType::FRACTURE_MODEL )->setReaderInterface( readerInterface.p() ); - CVF_ASSERT( this->eclipseCaseData() ); + CVF_ASSERT( eclipseCaseData() ); CVF_ASSERT( readerInterface.notNull() ); eclipseCaseData()->computeActiveCellBoundingBoxes(); @@ -468,7 +468,7 @@ cvf::ref RimEclipseResultCase::createMockModel( QString mode QApplication::restoreOverrideCursor(); } - this->setReservoirData( reservoir.p() ); + setReservoirData( reservoir.p() ); return mockFileInterface.p(); } @@ -551,7 +551,7 @@ RifReaderRftInterface* RimEclipseResultCase::rftReader() //-------------------------------------------------------------------------------------------------- void RimEclipseResultCase::setCaseInfo( const QString& userDescription, const QString& fileName ) { - this->setCaseUserDescription( userDescription ); + setCaseUserDescription( userDescription ); setGridFileName( fileName ); RimProject* proj = RimProject::current(); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 17009dd37f..2ea97198b0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -188,13 +188,13 @@ RimEclipseResultDefinition::~RimEclipseResultDefinition() //-------------------------------------------------------------------------------------------------- void RimEclipseResultDefinition::simpleCopy( const RimEclipseResultDefinition* other ) { - this->setResultVariable( other->resultVariable() ); - this->setPorosityModel( other->porosityModel() ); - this->setResultType( other->resultType() ); - this->setFlowSolution( other->m_flowSolution() ); - this->setSelectedInjectorTracers( other->m_selectedInjectorTracers() ); - this->setSelectedProducerTracers( other->m_selectedProducerTracers() ); - this->setSelectedSouringTracers( other->m_selectedSouringTracers() ); + setResultVariable( other->resultVariable() ); + setPorosityModel( other->porosityModel() ); + setResultType( other->resultType() ); + setFlowSolution( other->m_flowSolution() ); + setSelectedInjectorTracers( other->m_selectedInjectorTracers() ); + setSelectedProducerTracers( other->m_selectedProducerTracers() ); + setSelectedSouringTracers( other->m_selectedSouringTracers() ); m_flowTracerSelectionMode = other->m_flowTracerSelectionMode(); m_phaseSelection = other->m_phaseSelection; @@ -249,8 +249,7 @@ void RimEclipseResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch // If the user are seeing the list with the actually selected result, // select that result in the list. Otherwise select nothing. - QStringList varList = - RimEclipseResultDefinitionTools::getResultNamesForResultType( m_resultTypeUiField(), this->currentGridCellResults() ); + QStringList varList = RimEclipseResultDefinitionTools::getResultNamesForResultType( m_resultTypeUiField(), currentGridCellResults() ); bool isFlowDiagFieldsRelevant = ( m_resultType() == RiaDefines::ResultCatType::FLOW_DIAGNOSTICS ); @@ -545,7 +544,7 @@ void RimEclipseResultDefinition::loadDataAndUpdate() RimEclipseCellColors* cellColors = firstAncestorOrThisOfType(); if ( cellColors ) { - this->updateLegendCategorySettings(); + updateLegendCategorySettings(); if ( view ) { @@ -633,7 +632,7 @@ QList RimEclipseResultDefinition::calculateValueOptions( #ifdef USE_HDF5 if ( m_eclipseCase.notNull() ) { - RigCaseCellResultsData* cellResultsData = m_eclipseCase->results( this->porosityModel() ); + RigCaseCellResultsData* cellResultsData = m_eclipseCase->results( porosityModel() ); if ( cellResultsData && cellResultsData->hasFlowDiagUsableFluxes() ) { @@ -761,7 +760,7 @@ QList RimEclipseResultDefinition::calculateValueOptions( if ( fieldNeedingOptions == &m_resultVariableUiField ) { options = calcOptionsForVariableUiFieldStandard( m_resultTypeUiField(), - this->currentGridCellResults(), + currentGridCellResults(), showDerivedResultsFirstInVariableUiField(), addPerCellFaceOptionsForVariableUiField(), m_ternaryEnabled ); @@ -825,7 +824,7 @@ RigEclipseResultAddress RimEclipseResultDefinition::eclipseResultAddress() const if ( !isChecked() ) return RigEclipseResultAddress(); if ( isFlowDiagOrInjectionFlooding() ) return RigEclipseResultAddress(); - const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); + const RigCaseCellResultsData* gridCellResults = currentGridCellResults(); if ( gridCellResults ) { int timelapseTimeStep = RigEclipseResultAddress::noTimeLapseValue(); @@ -856,7 +855,7 @@ void RimEclipseResultDefinition::setFromEclipseResultAddress( const RigEclipseRe { RigEclipseResultAddress canonizedAddress = address; - const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); + const RigCaseCellResultsData* gridCellResults = currentGridCellResults(); if ( gridCellResults ) { auto rinfo = gridCellResults->resultInfo( address ); @@ -880,7 +879,7 @@ void RimEclipseResultDefinition::setFromEclipseResultAddress( const RigEclipseRe } } - this->updateUiFieldsFromActiveResult(); + updateUiFieldsFromActiveResult(); } //-------------------------------------------------------------------------------------------------- @@ -1017,7 +1016,7 @@ QString RimEclipseResultDefinition::additionalResultText() const if ( isDeltaTimeStepActive() ) { std::vector stepDates; - const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); + const RigCaseCellResultsData* gridCellResults = currentGridCellResults(); if ( gridCellResults ) { stepDates = gridCellResults->timeStepDates(); @@ -1101,12 +1100,12 @@ void RimEclipseResultDefinition::loadResult() } } - RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); + RigCaseCellResultsData* gridCellResults = currentGridCellResults(); if ( gridCellResults ) { if ( isDeltaTimeStepActive() || isDeltaCaseActive() || isDivideByCellFaceAreaActive() ) { - gridCellResults->createResultEntry( this->eclipseResultAddress(), false ); + gridCellResults->createResultEntry( eclipseResultAddress(), false ); } QString resultName = m_resultVariable(); @@ -1122,7 +1121,7 @@ void RimEclipseResultDefinition::loadResult() } } - gridCellResults->ensureKnownResultLoaded( this->eclipseResultAddress() ); + gridCellResults->ensureKnownResultLoaded( eclipseResultAddress() ); } } @@ -1134,8 +1133,8 @@ bool RimEclipseResultDefinition::hasStaticResult() const { if ( isFlowDiagOrInjectionFlooding() ) return false; - const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); - RigEclipseResultAddress gridScalarResultIndex = this->eclipseResultAddress(); + const RigCaseCellResultsData* gridCellResults = currentGridCellResults(); + RigEclipseResultAddress gridScalarResultIndex = eclipseResultAddress(); return hasResult() && gridCellResults->timeStepCount( gridScalarResultIndex ) == 1; } @@ -1149,11 +1148,11 @@ bool RimEclipseResultDefinition::hasResult() const { if ( m_flowSolution() && !m_resultVariable().isEmpty() ) return true; } - else if ( this->currentGridCellResults() ) + else if ( currentGridCellResults() ) { - const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); + const RigCaseCellResultsData* gridCellResults = currentGridCellResults(); - return gridCellResults->hasResultEntry( this->eclipseResultAddress() ); + return gridCellResults->hasResultEntry( eclipseResultAddress() ); } return false; @@ -1184,10 +1183,10 @@ bool RimEclipseResultDefinition::hasDynamicResult() const return true; } - if ( this->currentGridCellResults() ) + if ( currentGridCellResults() ) { - const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); - RigEclipseResultAddress gridScalarResultIndex = this->eclipseResultAddress(); + const RigCaseCellResultsData* gridCellResults = currentGridCellResults(); + RigEclipseResultAddress gridScalarResultIndex = eclipseResultAddress(); if ( gridCellResults->timeStepCount( gridScalarResultIndex ) > 1 ) { return true; @@ -1226,7 +1225,7 @@ void RimEclipseResultDefinition::initAfterRead() m_flowSolutionUiField = m_flowSolution(); m_selectedInjectorTracersUiField = m_selectedInjectorTracers; - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -1308,8 +1307,8 @@ RimFlowDiagSolution* RimEclipseResultDefinition::flowDiagSolution() const //-------------------------------------------------------------------------------------------------- void RimEclipseResultDefinition::setFlowSolution( RimFlowDiagSolution* flowSol ) { - this->m_flowSolution = flowSol; - this->m_flowSolutionUiField = flowSol; + m_flowSolution = flowSol; + m_flowSolutionUiField = flowSol; } //-------------------------------------------------------------------------------------------------- @@ -1353,8 +1352,8 @@ void RimEclipseResultDefinition::setSelectedTracers( const std::vector& //-------------------------------------------------------------------------------------------------- void RimEclipseResultDefinition::setSelectedInjectorTracers( const std::vector& selectedTracers ) { - this->m_selectedInjectorTracers = selectedTracers; - this->m_selectedInjectorTracersUiField = selectedTracers; + m_selectedInjectorTracers = selectedTracers; + m_selectedInjectorTracersUiField = selectedTracers; } //-------------------------------------------------------------------------------------------------- @@ -1362,8 +1361,8 @@ void RimEclipseResultDefinition::setSelectedInjectorTracers( const std::vector& selectedTracers ) { - this->m_selectedProducerTracers = selectedTracers; - this->m_selectedProducerTracersUiField = selectedTracers; + m_selectedProducerTracers = selectedTracers; + m_selectedProducerTracersUiField = selectedTracers; } //-------------------------------------------------------------------------------------------------- @@ -1371,8 +1370,8 @@ void RimEclipseResultDefinition::setSelectedProducerTracers( const std::vector& selectedTracers ) { - this->m_selectedSouringTracers = selectedTracers; - this->m_selectedSouringTracersUiField = selectedTracers; + m_selectedSouringTracers = selectedTracers; + m_selectedSouringTracersUiField = selectedTracers; } //-------------------------------------------------------------------------------------------------- @@ -1433,19 +1432,17 @@ bool RimEclipseResultDefinition::hasCategoryResult() const } } - if ( this->m_resultType() == RiaDefines::ResultCatType::FORMATION_NAMES && m_eclipseCase && m_eclipseCase->eclipseCaseData() && + if ( m_resultType() == RiaDefines::ResultCatType::FORMATION_NAMES && m_eclipseCase && m_eclipseCase->eclipseCaseData() && !m_eclipseCase->eclipseCaseData()->formationNames().empty() ) return true; - if ( this->m_resultType() == RiaDefines::ResultCatType::DYNAMIC_NATIVE && - this->resultVariable() == RiaResultNames::completionTypeResultName() ) + if ( m_resultType() == RiaDefines::ResultCatType::DYNAMIC_NATIVE && resultVariable() == RiaResultNames::completionTypeResultName() ) return true; - if ( this->m_resultType() == RiaDefines::ResultCatType::FLOW_DIAGNOSTICS && m_resultVariable() == RIG_FLD_MAX_FRACTION_TRACER_RESNAME ) + if ( m_resultType() == RiaDefines::ResultCatType::FLOW_DIAGNOSTICS && m_resultVariable() == RIG_FLD_MAX_FRACTION_TRACER_RESNAME ) return true; - if ( this->resultVariable() == RiaResultNames::formationAllanResultName() || - this->resultVariable() == RiaResultNames::formationBinaryAllanResultName() ) + if ( resultVariable() == RiaResultNames::formationAllanResultName() || resultVariable() == RiaResultNames::formationBinaryAllanResultName() ) { return true; } @@ -1458,8 +1455,7 @@ bool RimEclipseResultDefinition::hasCategoryResult() const //-------------------------------------------------------------------------------------------------- bool RimEclipseResultDefinition::isFlowDiagOrInjectionFlooding() const { - return this->m_resultType() == RiaDefines::ResultCatType::FLOW_DIAGNOSTICS || - this->m_resultType() == RiaDefines::ResultCatType::INJECTION_FLOODING; + return m_resultType() == RiaDefines::ResultCatType::FLOW_DIAGNOSTICS || m_resultType() == RiaDefines::ResultCatType::INJECTION_FLOODING; } //-------------------------------------------------------------------------------------------------- @@ -1535,7 +1531,7 @@ void RimEclipseResultDefinition::defineUiOrdering( QString uiConfigName, caf::Pd if ( eclView ) { - if ( eclView->cellResult() == this && this->hasCategoryResult() ) showOnlyVisibleCategoriesOption = true; + if ( eclView->cellResult() == this && hasCategoryResult() ) showOnlyVisibleCategoriesOption = true; } if ( m_resultTypeUiField() == RiaDefines::ResultCatType::FLOW_DIAGNOSTICS && @@ -1600,7 +1596,7 @@ void RimEclipseResultDefinition::assignFlowSolutionFromCase() { defaultFlowDiagSolution = eclCase->defaultFlowDiagSolution(); } - this->setFlowSolution( defaultFlowDiagSolution ); + setFlowSolution( defaultFlowDiagSolution ); } //-------------------------------------------------------------------------------------------------- @@ -1678,9 +1674,9 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen int currentTimeStep ) { - if ( this->hasResult() ) + if ( hasResult() ) { - if ( this->isFlowDiagOrInjectionFlooding() ) + if ( isFlowDiagOrInjectionFlooding() ) { if ( currentTimeStep >= 0 ) { @@ -1704,15 +1700,15 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen //-------------------------------------------------------------------------------------------------- void RimEclipseResultDefinition::updateLegendTitle( RimRegularLegendConfig* legendConfig, const QString& legendHeading ) { - QString title = legendHeading + this->resultVariableUiName(); - if ( !this->additionalResultTextShort().isEmpty() ) + QString title = legendHeading + resultVariableUiName(); + if ( !additionalResultTextShort().isEmpty() ) { title += additionalResultTextShort(); } - if ( this->hasDualPorFractureResult() ) + if ( hasDualPorFractureResult() ) { - QString porosityModelText = caf::AppEnum::uiText( this->porosityModel() ); + QString porosityModelText = caf::AppEnum::uiText( porosityModel() ); title += QString( "\nDual Por : %1" ).arg( porosityModelText ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index e50836cc85..fbc6f76ef3 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -135,7 +135,7 @@ RimEclipseStatisticsCase::~RimEclipseStatisticsCase() void RimEclipseStatisticsCase::setMainGrid( RigMainGrid* mainGrid ) { CVF_ASSERT( mainGrid ); - CVF_ASSERT( this->eclipseCaseData() ); + CVF_ASSERT( eclipseCaseData() ); eclipseCaseData()->setMainGrid( mainGrid ); } @@ -145,7 +145,7 @@ void RimEclipseStatisticsCase::setMainGrid( RigMainGrid* mainGrid ) //-------------------------------------------------------------------------------------------------- bool RimEclipseStatisticsCase::openEclipseGridFile() { - if ( this->eclipseCaseData() ) return true; + if ( eclipseCaseData() ) return true; cvf::ref eclipseCase = new RigEclipseCaseData( this ); @@ -163,13 +163,13 @@ bool RimEclipseStatisticsCase::openEclipseGridFile() eclipseCase->setActiveCellInfo( RiaDefines::PorosityModelType::FRACTURE_MODEL, gridCaseGroup->unionOfActiveCells( RiaDefines::PorosityModelType::FRACTURE_MODEL ) ); - this->setReservoirData( eclipseCase.p() ); + setReservoirData( eclipseCase.p() ); loadSimulationWellDataFromSourceCase(); if ( m_populateSelectionAfterLoadingGrid ) { - this->populateResultSelection(); + populateResultSelection(); m_populateSelectionAfterLoadingGrid = false; } @@ -191,7 +191,7 @@ void RimEclipseStatisticsCase::reloadEclipseGridFile() //-------------------------------------------------------------------------------------------------- RimCaseCollection* RimEclipseStatisticsCase::parentStatisticsCaseCollection() const { - return dynamic_cast( this->parentField()->ownerObject() ); + return dynamic_cast( parentField()->ownerObject() ); } //-------------------------------------------------------------------------------------------------- @@ -245,7 +245,7 @@ void RimEclipseStatisticsCase::setSourceProperties( RiaDefines::ResultCatType pr //-------------------------------------------------------------------------------------------------- void RimEclipseStatisticsCase::computeStatistics() { - if ( this->eclipseCaseData() == nullptr ) + if ( eclipseCaseData() == nullptr ) { openEclipseGridFile(); } @@ -606,13 +606,13 @@ void RimEclipseStatisticsCase::loadSimulationWellDataFromSourceCase() { const cvf::Collection& sourceCaseSimWellData = sourceResultCase->eclipseCaseData()->wellResults(); - this->eclipseCaseData()->setSimWellData( sourceCaseSimWellData ); + eclipseCaseData()->setSimWellData( sourceCaseSimWellData ); } } else { cvf::Collection sourceCaseWellResults; - this->eclipseCaseData()->setSimWellData( sourceCaseWellResults ); + eclipseCaseData()->setSimWellData( sourceCaseWellResults ); } } @@ -774,7 +774,7 @@ void RimEclipseStatisticsCase::updateConnectedEditorsAndReservoirViews() } } - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp index f8bc5af851..77942cd549 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp @@ -50,6 +50,6 @@ RimEclipseStatisticsCaseCollection::~RimEclipseStatisticsCaseCollection() //-------------------------------------------------------------------------------------------------- RimIdenticalGridCaseGroup* RimEclipseStatisticsCaseCollection::parentCaseGroup() { - RimIdenticalGridCaseGroup* parentObject = dynamic_cast( this->parentField()->ownerObject() ); + RimIdenticalGridCaseGroup* parentObject = dynamic_cast( parentField()->ownerObject() ); return parentObject; } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp index 00a405d1a3..cb5b5fe691 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp @@ -193,12 +193,12 @@ RimEclipseView::RimEclipseView() m_cellResultData.registerGetMethod( this, &RimEclipseView::currentCellResultData ); m_cellResultData.registerSetMethod( this, &RimEclipseView::setCurrentCellResultData ); - this->cellResult()->setReservoirView( this ); - this->cellEdgeResult()->setReservoirView( this ); - this->cellEdgeResult()->legendConfig()->setColorLegend( + cellResult()->setReservoirView( this ); + cellEdgeResult()->setReservoirView( this ); + cellEdgeResult()->legendConfig()->setColorLegend( RimRegularLegendConfig::mapToColorLegend( RimRegularLegendConfig::ColorRangesType::PINK_WHITE ) ); - this->faultResultSettings()->setReservoirView( this ); + faultResultSettings()->setReservoirView( this ); m_reservoirGridPartManager = new RivReservoirViewPartMgr( this ); m_simWellsPartManager = new RivReservoirSimWellsPartMgr( this ); @@ -219,7 +219,7 @@ RimEclipseView::RimEclipseView() setDeletable( true ); - this->updateAnimations.connect( this, &RimEclipseView::onAnimationsUpdate ); + updateAnimations.connect( this, &RimEclipseView::onAnimationsUpdate ); } //-------------------------------------------------------------------------------------------------- @@ -227,10 +227,10 @@ RimEclipseView::RimEclipseView() //-------------------------------------------------------------------------------------------------- RimEclipseView::~RimEclipseView() { - delete this->faultResultSettings(); - delete this->cellResult(); - delete this->cellEdgeResult(); - delete this->elementVectorResult(); + delete faultResultSettings(); + delete cellResult(); + delete cellEdgeResult(); + delete elementVectorResult(); delete m_propertyFilterCollection; delete wellCollection(); @@ -319,11 +319,11 @@ RimVirtualPerforationResults* RimEclipseView::virtualPerforationResult() const //-------------------------------------------------------------------------------------------------- void RimEclipseView::onClampCurrentTimestep() { - if ( this->currentGridCellResults() ) + if ( currentGridCellResults() ) { - if ( m_currentTimeStep() >= static_cast( this->currentGridCellResults()->maxTimeStepCount() ) ) + if ( m_currentTimeStep() >= static_cast( currentGridCellResults()->maxTimeStepCount() ) ) { - m_currentTimeStep = static_cast( this->currentGridCellResults()->maxTimeStepCount() ) - 1; + m_currentTimeStep = static_cast( currentGridCellResults()->maxTimeStepCount() ) - 1; } } @@ -335,9 +335,9 @@ void RimEclipseView::onClampCurrentTimestep() //-------------------------------------------------------------------------------------------------- size_t RimEclipseView::onTimeStepCountRequested() { - if ( this->currentGridCellResults() ) + if ( currentGridCellResults() ) { - return this->currentGridCellResults()->maxTimeStepCount(); + return currentGridCellResults()->maxTimeStepCount(); } return 0; @@ -371,30 +371,30 @@ void RimEclipseView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, if ( changedField == &m_showInvalidCells ) { - this->scheduleGeometryRegen( INACTIVE ); - this->scheduleGeometryRegen( RANGE_FILTERED_INACTIVE ); + scheduleGeometryRegen( INACTIVE ); + scheduleGeometryRegen( RANGE_FILTERED_INACTIVE ); scheduleCreateDisplayModelAndRedraw(); } else if ( changedField == &m_showInactiveCells ) { - this->updateGridBoxData(); + updateGridBoxData(); - this->scheduleGeometryRegen( INACTIVE ); - this->scheduleGeometryRegen( RANGE_FILTERED_INACTIVE ); + scheduleGeometryRegen( INACTIVE ); + scheduleGeometryRegen( RANGE_FILTERED_INACTIVE ); scheduleCreateDisplayModelAndRedraw(); } else if ( changedField == &m_cellFilterCollection ) { - this->scheduleGeometryRegen( RANGE_FILTERED ); - this->scheduleGeometryRegen( RANGE_FILTERED_INACTIVE ); + scheduleGeometryRegen( RANGE_FILTERED ); + scheduleGeometryRegen( RANGE_FILTERED_INACTIVE ); scheduleCreateDisplayModelAndRedraw(); } else if ( changedField == &m_propertyFilterCollection ) { - this->scheduleGeometryRegen( PROPERTY_FILTERED ); + scheduleGeometryRegen( PROPERTY_FILTERED ); scheduleCreateDisplayModelAndRedraw(); } @@ -414,8 +414,8 @@ void RimEclipseView::onUpdateScaleTransform() cvf::Mat4d scale = cvf::Mat4d::IDENTITY; scale( 2, 2 ) = scaleZ(); - this->scaleTransform()->setLocalTransform( scale ); - m_simWellsPartManager->setScaleTransform( this->scaleTransform() ); + scaleTransform()->setLocalTransform( scale ); + m_simWellsPartManager->setScaleTransform( scaleTransform() ); if ( nativeOrOverrideViewer() ) nativeOrOverrideViewer()->updateCachedValuesInScene(); } @@ -741,14 +741,14 @@ void RimEclipseView::onUpdateDisplayModelForCurrentTimeStep() //-------------------------------------------------------------------------------------------------- void RimEclipseView::updateVisibleGeometries() { - if ( this->viewController() && this->viewController()->isVisibleCellsOveridden() ) return; + if ( viewController() && viewController()->isVisibleCellsOveridden() ) return; - if ( this->eclipsePropertyFilterCollection()->hasActiveFilters() ) + if ( eclipsePropertyFilterCollection()->hasActiveFilters() ) { cvf::ref frameParts = new cvf::ModelBasicList; frameParts->setName( "GridModel" ); - std::vector gridIndices = this->indicesToVisibleGrids(); + std::vector gridIndices = indicesToVisibleGrids(); if ( isGridVisualizationMode() ) { @@ -797,15 +797,15 @@ void RimEclipseView::updateVisibleGeometries() } // Set the transparency on all the Wellcell parts before setting the result color - float opacity = static_cast( 1 - std::clamp( this->wellCollection()->wellCellTransparencyLevel(), 0.0, 1.0 ) ); + float opacity = static_cast( 1 - std::clamp( wellCollection()->wellCellTransparencyLevel(), 0.0, 1.0 ) ); m_reservoirGridPartManager->updateCellColor( PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep, cvf::Color4f( cvf::Color3f( cvf::Color3::WHITE ), opacity ) ); - if ( this->showInactiveCells() ) + if ( showInactiveCells() ) { - if ( this->cellFilterCollection()->hasActiveFilters() ) // Wells not considered, because we do not have a - // INACTIVE_WELL_CELLS group yet. + if ( cellFilterCollection()->hasActiveFilters() ) // Wells not considered, because we do not have a + // INACTIVE_WELL_CELLS group yet. { m_reservoirGridPartManager->appendStaticGeometryPartsToModel( frameParts.p(), RANGE_FILTERED_INACTIVE, gridIndices ); @@ -845,28 +845,28 @@ void RimEclipseView::updateVisibleCellColors() { std::vector geometriesToRecolor; - if ( this->viewController() && this->viewController()->isVisibleCellsOveridden() ) + if ( viewController() && viewController()->isVisibleCellsOveridden() ) { geometriesToRecolor.push_back( OVERRIDDEN_CELL_VISIBILITY ); } - else if ( this->eclipsePropertyFilterCollection()->hasActiveFilters() ) + else if ( eclipsePropertyFilterCollection()->hasActiveFilters() ) { geometriesToRecolor.push_back( PROPERTY_FILTERED ); geometriesToRecolor.push_back( PROPERTY_FILTERED_WELL_CELLS ); } - else if ( this->cellFilterCollection()->hasActiveFilters() && this->wellCollection()->hasVisibleWellCells() ) + else if ( cellFilterCollection()->hasActiveFilters() && wellCollection()->hasVisibleWellCells() ) { geometriesToRecolor.push_back( RANGE_FILTERED ); geometriesToRecolor.push_back( RANGE_FILTERED_WELL_CELLS ); geometriesToRecolor.push_back( VISIBLE_WELL_CELLS_OUTSIDE_RANGE_FILTER ); geometriesToRecolor.push_back( VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER ); } - else if ( !this->cellFilterCollection()->hasActiveFilters() && this->wellCollection()->hasVisibleWellCells() ) + else if ( !cellFilterCollection()->hasActiveFilters() && wellCollection()->hasVisibleWellCells() ) { geometriesToRecolor.push_back( VISIBLE_WELL_CELLS ); geometriesToRecolor.push_back( VISIBLE_WELL_FENCE_CELLS ); } - else if ( this->cellFilterCollection()->hasActiveFilters() && !this->wellCollection()->hasVisibleWellCells() ) + else if ( cellFilterCollection()->hasActiveFilters() && !wellCollection()->hasVisibleWellCells() ) { geometriesToRecolor.push_back( RANGE_FILTERED ); geometriesToRecolor.push_back( RANGE_FILTERED_WELL_CELLS ); @@ -879,26 +879,23 @@ void RimEclipseView::updateVisibleCellColors() for ( size_t i = 0; i < geometriesToRecolor.size(); ++i ) { - if ( this->cellEdgeResult()->hasResult() ) + if ( cellEdgeResult()->hasResult() ) { - m_reservoirGridPartManager->updateCellEdgeResultColor( geometriesToRecolor[i], - m_currentTimeStep, - this->cellResult(), - this->cellEdgeResult() ); + m_reservoirGridPartManager->updateCellEdgeResultColor( geometriesToRecolor[i], m_currentTimeStep, cellResult(), cellEdgeResult() ); } - else if ( this->cellResult()->hasResult() || this->cellResult()->isTernarySaturationSelected() ) + else if ( cellResult()->hasResult() || cellResult()->isTernarySaturationSelected() ) { - m_reservoirGridPartManager->updateCellResultColor( geometriesToRecolor[i], m_currentTimeStep, this->cellResult() ); + m_reservoirGridPartManager->updateCellResultColor( geometriesToRecolor[i], m_currentTimeStep, cellResult() ); } else { - this->updateStaticCellColors( geometriesToRecolor[i] ); + updateStaticCellColors( geometriesToRecolor[i] ); } } - this->updateFaultColors(); + updateFaultColors(); - bool hasGeneralCellResult = this->cellResult()->hasResult() || this->cellResult()->isTernarySaturationSelected(); + bool hasGeneralCellResult = cellResult()->hasResult() || cellResult()->isTernarySaturationSelected(); m_intersectionCollection->updateCellResultColor( hasGeneralCellResult, m_currentTimeStep ); if ( surfaceInViewCollection() ) surfaceInViewCollection()->updateCellResultColor( hasGeneralCellResult, m_currentTimeStep ); @@ -952,9 +949,9 @@ void RimEclipseView::appendWellsAndFracturesToModel() cvf::ref simWellFracturesModelBasicList = new cvf::ModelBasicList; simWellFracturesModelBasicList->setName( name ); - cvf::ref transForm = this->displayCoordTransform(); + cvf::ref transForm = displayCoordTransform(); - std::vector fractures = this->descendantsIncludingThisOfType(); + std::vector fractures = descendantsIncludingThisOfType(); for ( RimFracture* f : fractures ) { RimSimWellInView* simWell = f->firstAncestorOrThisOfType(); @@ -1037,7 +1034,7 @@ void RimEclipseView::appendStreamlinesToModel() //-------------------------------------------------------------------------------------------------- void RimEclipseView::onLoadDataAndUpdate() { - this->updateSurfacesInViewTreeItems(); + updateSurfacesInViewTreeItems(); onUpdateScaleTransform(); @@ -1046,29 +1043,29 @@ void RimEclipseView::onLoadDataAndUpdate() if ( !m_eclipseCase->openReserviorCase() ) { RiaLogging::warning( "Could not open the Eclipse Grid file: \n" + m_eclipseCase->gridFileName() ); - this->setEclipseCase( nullptr ); + setEclipseCase( nullptr ); return; } } - CVF_ASSERT( this->cellResult() != nullptr ); - this->cellResult()->loadResult(); + CVF_ASSERT( cellResult() != nullptr ); + cellResult()->loadResult(); - CVF_ASSERT( this->cellEdgeResult() != nullptr ); - this->cellEdgeResult()->loadResult(); + CVF_ASSERT( cellEdgeResult() != nullptr ); + cellEdgeResult()->loadResult(); - this->faultResultSettings()->customFaultResult()->loadResult(); - this->fractureColors()->loadDataAndUpdate(); + faultResultSettings()->customFaultResult()->loadResult(); + fractureColors()->loadDataAndUpdate(); updateMdiWindowVisibility(); - this->m_propertyFilterCollection()->loadAndInitializePropertyFilters(); + m_propertyFilterCollection()->loadAndInitializePropertyFilters(); - this->faultCollection()->syncronizeFaults(); + faultCollection()->syncronizeFaults(); - this->m_wellCollection->scaleWellDisks(); + m_wellCollection->scaleWellDisks(); - if ( this->m_surfaceCollection ) this->m_surfaceCollection->loadData(); + if ( m_surfaceCollection ) m_surfaceCollection->loadData(); scheduleReservoirGridGeometryRegen(); m_simWellsPartManager->clearGeometryCache(); @@ -1087,14 +1084,14 @@ void RimEclipseView::onLoadDataAndUpdate() } } - if ( this->isVirtualConnectionFactorGeometryVisible() ) + if ( isVirtualConnectionFactorGeometryVisible() ) { m_virtualPerforationResult->loadData(); } m_wellMeasurementCollection->syncWithChangesInWellMeasurementCollection(); - this->scheduleCreateDisplayModelAndRedraw(); + scheduleCreateDisplayModelAndRedraw(); } //-------------------------------------------------------------------------------------------------- @@ -1112,11 +1109,11 @@ void RimEclipseView::initAfterRead() { RimGridView::initAfterRead(); - this->faultResultSettings()->setReservoirView( this ); - this->cellResult()->setReservoirView( this ); - this->cellEdgeResult()->setReservoirView( this ); + faultResultSettings()->setReservoirView( this ); + cellResult()->setReservoirView( this ); + cellEdgeResult()->setReservoirView( this ); - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -1161,7 +1158,7 @@ void RimEclipseView::updateStaticCellColors( RivCellSetEnum geometryType ) //-------------------------------------------------------------------------------------------------- cvf::Color4f RimEclipseView::colorFromCellCategory( RivCellSetEnum geometryType ) const { - float opacity = static_cast( 1 - std::clamp( this->wellCollection()->wellCellTransparencyLevel(), 0.0, 1.0 ) ); + float opacity = static_cast( 1 - std::clamp( wellCollection()->wellCellTransparencyLevel(), 0.0, 1.0 ) ); cvf::Color4f color( cvf::Color3::ORANGE ); switch ( geometryType ) @@ -1283,9 +1280,9 @@ void RimEclipseView::scheduleGeometryRegen( RivCellSetEnum geometryType ) { m_reservoirGridPartManager->scheduleGeometryRegen( geometryType ); - if ( this->isMasterView() ) + if ( isMasterView() ) { - RimViewLinker* viewLinker = this->assosiatedViewLinker(); + RimViewLinker* viewLinker = assosiatedViewLinker(); if ( viewLinker ) { viewLinker->scheduleGeometryRegenForDepViews( geometryType ); @@ -1335,7 +1332,7 @@ void RimEclipseView::onUpdateLegends() } else { - std::vector legendConfs = this->legendConfigs(); + std::vector legendConfs = legendConfigs(); for ( auto legendConf : legendConfs ) { @@ -1355,66 +1352,65 @@ void RimEclipseView::onUpdateLegends() RigCaseCellResultsData* results = eclipseCase->results( cellResult()->porosityModel() ); CVF_ASSERT( results ); - updateLegendRangesTextAndVisibility( this->cellResult()->legendConfig(), - this->cellResult()->ternaryLegendConfig(), + updateLegendRangesTextAndVisibility( cellResult()->legendConfig(), + cellResult()->ternaryLegendConfig(), QString( "Cell Results: \n" ), - this->cellResult(), + cellResult(), m_currentTimeStep ); - if ( this->faultResultSettings()->showCustomFaultResult() && this->faultResultSettings()->hasValidCustomResult() ) + if ( faultResultSettings()->showCustomFaultResult() && faultResultSettings()->hasValidCustomResult() ) { updateLegendRangesTextAndVisibility( currentFaultResultColors()->legendConfig(), currentFaultResultColors()->ternaryLegendConfig(), QString( "Fault Results: \n" ), - this->currentFaultResultColors(), + currentFaultResultColors(), m_currentTimeStep ); } - for ( RimIntersectionResultDefinition* sepInterResDef : this->separateIntersectionResultsCollection()->intersectionResultsDefinitions() ) + for ( RimIntersectionResultDefinition* sepInterResDef : separateIntersectionResultsCollection()->intersectionResultsDefinitions() ) { sepInterResDef->updateLegendRangesTextAndVisibility( "Intersection Results:\n", nativeOrOverrideViewer(), isUsingOverrideViewer() ); } - for ( RimIntersectionResultDefinition* sepInterResDef : this->separateSurfaceResultsCollection()->intersectionResultsDefinitions() ) + for ( RimIntersectionResultDefinition* sepInterResDef : separateSurfaceResultsCollection()->intersectionResultsDefinitions() ) { sepInterResDef->updateLegendRangesTextAndVisibility( "Surface Results:\n", nativeOrOverrideViewer(), isUsingOverrideViewer() ); } - if ( this->cellEdgeResult()->legendConfig()->showLegend() ) + if ( cellEdgeResult()->legendConfig()->showLegend() ) { - if ( this->cellEdgeResult()->hasResult() ) + if ( cellEdgeResult()->hasResult() ) { { double globalMin, globalMax; double globalPosClosestToZero, globalNegClosestToZero; - this->cellEdgeResult()->minMaxCellEdgeValues( globalMin, globalMax ); - this->cellEdgeResult()->posNegClosestToZero( globalPosClosestToZero, globalNegClosestToZero ); + cellEdgeResult()->minMaxCellEdgeValues( globalMin, globalMax ); + cellEdgeResult()->posNegClosestToZero( globalPosClosestToZero, globalNegClosestToZero ); - this->cellEdgeResult()->legendConfig()->setClosestToZeroValues( globalPosClosestToZero, - globalNegClosestToZero, - globalPosClosestToZero, - globalNegClosestToZero ); - this->cellEdgeResult()->legendConfig()->setAutomaticRanges( globalMin, globalMax, globalMin, globalMax ); + cellEdgeResult()->legendConfig()->setClosestToZeroValues( globalPosClosestToZero, + globalNegClosestToZero, + globalPosClosestToZero, + globalNegClosestToZero ); + cellEdgeResult()->legendConfig()->setAutomaticRanges( globalMin, globalMax, globalMin, globalMax ); } - this->cellEdgeResult()->legendConfig()->setTitle( QString( "Edge Results: \n" ) + - this->cellEdgeResult()->resultVariableUiShortName() ); - nativeOrOverrideViewer()->addColorLegendToBottomLeftCorner( this->cellEdgeResult()->legendConfig()->titledOverlayFrame(), + cellEdgeResult()->legendConfig()->setTitle( QString( "Edge Results: \n" ) + cellEdgeResult()->resultVariableUiShortName() ); + nativeOrOverrideViewer()->addColorLegendToBottomLeftCorner( cellEdgeResult()->legendConfig()->titledOverlayFrame(), isUsingOverrideViewer() ); } else { - this->cellEdgeResult()->legendConfig()->setClosestToZeroValues( 0, 0, 0, 0 ); - this->cellEdgeResult()->legendConfig()->setAutomaticRanges( cvf::UNDEFINED_DOUBLE, - cvf::UNDEFINED_DOUBLE, - cvf::UNDEFINED_DOUBLE, - cvf::UNDEFINED_DOUBLE ); + cellEdgeResult()->legendConfig()->setClosestToZeroValues( 0, 0, 0, 0 ); + cellEdgeResult()->legendConfig()->setAutomaticRanges( cvf::UNDEFINED_DOUBLE, + cvf::UNDEFINED_DOUBLE, + cvf::UNDEFINED_DOUBLE, + cvf::UNDEFINED_DOUBLE ); } } - if ( this->elementVectorResult()->showResult() ) + if ( elementVectorResult()->showResult() ) { - this->elementVectorResult()->updateLegendRangesTextAndVisibility( nativeOrOverrideViewer(), isUsingOverrideViewer() ); + elementVectorResult()->updateLegendRangesTextAndVisibility( nativeOrOverrideViewer(), isUsingOverrideViewer() ); } { @@ -1549,9 +1545,9 @@ void RimEclipseView::syncronizeWellsWithResults() std::vector> newWells; // Clear the possible well results data present - for ( size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx ) + for ( size_t wIdx = 0; wIdx < wellCollection()->wells().size(); ++wIdx ) { - RimSimWellInView* well = this->wellCollection()->wells()[wIdx]; + RimSimWellInView* well = wellCollection()->wells()[wIdx]; well->setSimWellData( nullptr, -1 ); } @@ -1561,7 +1557,7 @@ void RimEclipseView::syncronizeWellsWithResults() for ( size_t wIdx = 0; wIdx < wellResults.size(); ++wIdx ) { - RimSimWellInView* well = this->wellCollection()->findWell( wellResults[wIdx]->m_wellName ); + RimSimWellInView* well = wellCollection()->findWell( wellResults[wIdx]->m_wellName ); if ( !well ) { @@ -1577,29 +1573,29 @@ void RimEclipseView::syncronizeWellsWithResults() // Delete all wells that does not have a result - for ( size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx ) + for ( size_t wIdx = 0; wIdx < wellCollection()->wells().size(); ++wIdx ) { - RimSimWellInView* well = this->wellCollection()->wells()[wIdx]; + RimSimWellInView* well = wellCollection()->wells()[wIdx]; RigSimWellData* simWellData = well->simWellData(); if ( simWellData == nullptr ) { delete well; } } - this->wellCollection()->wells().clearWithoutDelete(); + wellCollection()->wells().clearWithoutDelete(); // Set the new wells into the field. - this->wellCollection()->wells().insert( 0, newWells ); + wellCollection()->wells().insert( 0, newWells ); // Make sure all the wells have their reservoirView ptr setup correctly - this->wellCollection()->setReservoirView( this ); + wellCollection()->setReservoirView( this ); // Sort wells before assigning colors, as the colors are distributed based on sorting - this->wellCollection()->sortWellsByName(); + wellCollection()->sortWellsByName(); if ( isAnyWellCreated ) { - this->wellCollection()->assignDefaultWellColors(); + wellCollection()->assignDefaultWellColors(); } } @@ -1665,14 +1661,14 @@ void RimEclipseView::calculateVisibleWellCellsIncFence( cvf::UByteArray* visible } visibleCells->setAll( false ); - const RigActiveCellInfo* activeCellInfo = this->currentActiveCellInfo(); + const RigActiveCellInfo* activeCellInfo = currentActiveCellInfo(); CVF_ASSERT( activeCellInfo ); // Loop over the wells and find their contribution - for ( size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx ) + for ( size_t wIdx = 0; wIdx < wellCollection()->wells().size(); ++wIdx ) { - RimSimWellInView* well = this->wellCollection()->wells()[wIdx]; + RimSimWellInView* well = wellCollection()->wells()[wIdx]; if ( well->isWellCellsVisible() ) { RigSimWellData* simWellData = well->simWellData(); @@ -1708,17 +1704,17 @@ void RimEclipseView::calculateVisibleWellCellsIncFence( cvf::UByteArray* visible size_t cellCountFenceDirection = 0; size_t fIdx = 0; - if ( this->wellCollection()->wellCellFenceType == RimSimWellInViewCollection::K_DIRECTION ) + if ( wellCollection()->wellCellFenceType == RimSimWellInViewCollection::K_DIRECTION ) { cellCountFenceDirection = grid->cellCountK(); pK = &fIdx; } - else if ( this->wellCollection()->wellCellFenceType == RimSimWellInViewCollection::J_DIRECTION ) + else if ( wellCollection()->wellCellFenceType == RimSimWellInViewCollection::J_DIRECTION ) { cellCountFenceDirection = grid->cellCountJ(); pJ = &fIdx; } - else if ( this->wellCollection()->wellCellFenceType == RimSimWellInViewCollection::I_DIRECTION ) + else if ( wellCollection()->wellCellFenceType == RimSimWellInViewCollection::I_DIRECTION ) { cellCountFenceDirection = grid->cellCountI(); pI = &fIdx; @@ -1804,7 +1800,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired() if ( isDependingOnCompletionType ) { - this->loadDataAndUpdate(); + loadDataAndUpdate(); std::vector intersections = m_intersectionCollection->intersections(); for ( auto intersection : intersections ) @@ -1849,7 +1845,7 @@ bool RimEclipseView::isMainGridVisible() const if ( !isMainGridVisible ) return false; - return this->m_gridCollection->isActive(); + return m_gridCollection->isActive(); } //-------------------------------------------------------------------------------------------------- @@ -1958,9 +1954,9 @@ void RimEclipseView::updateFaultColors() for ( RivCellSetEnum cellSetType : faultGeometriesToRecolor ) { - if ( this->cellEdgeResult()->hasResult() ) + if ( cellEdgeResult()->hasResult() ) { - m_reservoirGridPartManager->updateFaultCellEdgeResultColor( cellSetType, m_currentTimeStep, faultResultColors, this->cellEdgeResult() ); + m_reservoirGridPartManager->updateFaultCellEdgeResultColor( cellSetType, m_currentTimeStep, faultResultColors, cellEdgeResult() ); } else { @@ -1974,36 +1970,36 @@ void RimEclipseView::updateFaultColors() //-------------------------------------------------------------------------------------------------- bool RimEclipseView::isTimeStepDependentDataVisible() const { - if ( this->cellResult()->hasDynamicResult() ) return true; + if ( cellResult()->hasDynamicResult() ) return true; - if ( this->eclipsePropertyFilterCollection()->hasActiveDynamicFilters() ) return true; + if ( eclipsePropertyFilterCollection()->hasActiveDynamicFilters() ) return true; - if ( this->wellCollection()->hasVisibleWellPipes() ) return true; + if ( wellCollection()->hasVisibleWellPipes() ) return true; - if ( this->cellResult()->isTernarySaturationSelected() ) return true; + if ( cellResult()->isTernarySaturationSelected() ) return true; - if ( this->faultResultSettings()->showCustomFaultResult() ) + if ( faultResultSettings()->showCustomFaultResult() ) { - if ( this->faultResultSettings()->customFaultResult()->hasDynamicResult() ) return true; + if ( faultResultSettings()->customFaultResult()->hasDynamicResult() ) return true; - if ( this->faultResultSettings()->customFaultResult()->isTernarySaturationSelected() ) return true; + if ( faultResultSettings()->customFaultResult()->isTernarySaturationSelected() ) return true; } - if ( this->intersectionCollection()->hasAnyActiveSeparateResults() ) + if ( intersectionCollection()->hasAnyActiveSeparateResults() ) { return true; } - if ( this->surfaceInViewCollection() && this->surfaceInViewCollection()->hasAnyActiveSeparateResults() ) + if ( surfaceInViewCollection() && surfaceInViewCollection()->hasAnyActiveSeparateResults() ) { return true; } - if ( this->wellPathCollection() && this->wellPathCollection()->anyWellsContainingPerforationIntervals() ) return true; + if ( wellPathCollection() && wellPathCollection()->anyWellsContainingPerforationIntervals() ) return true; - if ( this->hasVisibleTimeStepDependent3dWellLogCurves() ) return true; + if ( hasVisibleTimeStepDependent3dWellLogCurves() ) return true; - if ( this->wellPathCollection() && this->wellCollection()->isWellDisksVisible() ) return true; + if ( wellPathCollection() && wellCollection()->isWellDisksVisible() ) return true; return false; } @@ -2013,11 +2009,11 @@ bool RimEclipseView::isTimeStepDependentDataVisible() const //-------------------------------------------------------------------------------------------------- RimEclipseCellColors* RimEclipseView::currentFaultResultColors() { - RimEclipseCellColors* faultResultColors = this->cellResult(); + RimEclipseCellColors* faultResultColors = cellResult(); - if ( this->faultResultSettings()->showCustomFaultResult() ) + if ( faultResultSettings()->showCustomFaultResult() ) { - faultResultColors = this->faultResultSettings()->customFaultResult(); + faultResultColors = faultResultSettings()->customFaultResult(); } return faultResultColors; @@ -2036,7 +2032,7 @@ std::vector RimEclipseView::currentCellResultData() const int timeStep = 0; if ( cellResult()->hasDynamicResult() ) { - timeStep = this->currentTimeStep(); + timeStep = currentTimeStep(); } resultData = currentGridCellResults()->cellScalarResults( cellResult()->eclipseResultAddress() )[timeStep]; } @@ -2053,7 +2049,7 @@ void RimEclipseView::setCurrentCellResultData( const std::vector& values int timeStep = 0; if ( cellResult()->hasDynamicResult() ) { - timeStep = this->currentTimeStep(); + timeStep = currentTimeStep(); } std::vector* modResult = currentGridCellResults()->modifiableCellScalarResult( cellResult()->eclipseResultAddress(), timeStep ); if ( modResult->size() == values.size() ) @@ -2174,8 +2170,8 @@ void RimEclipseView::setOverridePropertyFilterCollection( RimEclipsePropertyFilt m_propertyFilterCollection->isActive = m_overridePropertyFilterCollection->isActive; } uiCapability()->updateConnectedEditors(); - this->scheduleGeometryRegen( PROPERTY_FILTERED ); - this->scheduleCreateDisplayModelAndRedraw(); + scheduleGeometryRegen( PROPERTY_FILTERED ); + scheduleCreateDisplayModelAndRedraw(); } //-------------------------------------------------------------------------------------------------- @@ -2183,16 +2179,16 @@ void RimEclipseView::setOverridePropertyFilterCollection( RimEclipsePropertyFilt //-------------------------------------------------------------------------------------------------- void RimEclipseView::calculateCurrentTotalCellVisibility( cvf::UByteArray* totalVisibility, int timeStep ) { - size_t cellCount = this->mainGrid()->globalCellArray().size(); + size_t cellCount = mainGrid()->globalCellArray().size(); totalVisibility->resize( cellCount ); totalVisibility->setAll( false ); - std::vector gridIndices = this->indicesToVisibleGrids(); + std::vector gridIndices = indicesToVisibleGrids(); for ( auto gridIdx : gridIndices ) { - RigGridBase* grid = this->eclipseCase()->eclipseCaseData()->grid( gridIdx ); + RigGridBase* grid = eclipseCase()->eclipseCaseData()->grid( gridIdx ); int gridCellCount = static_cast( grid->cellCount() ); for ( size_t gpIdx = 0; gpIdx < m_visibleGridParts.size(); ++gpIdx ) @@ -2212,18 +2208,18 @@ void RimEclipseView::calculateCurrentTotalCellVisibility( cvf::UByteArray* total //-------------------------------------------------------------------------------------------------- void RimEclipseView::calculateCellVisibility( cvf::UByteArray* visibility, std::vector geomTypes, int timeStep ) { - size_t cellCount = this->mainGrid()->globalCellArray().size(); + size_t cellCount = mainGrid()->globalCellArray().size(); visibility->resize( cellCount ); visibility->setAll( false ); - std::vector gridIndices = this->indicesToVisibleGrids(); + std::vector gridIndices = indicesToVisibleGrids(); - const auto gridCount = this->eclipseCase()->eclipseCaseData()->gridCount(); + const auto gridCount = eclipseCase()->eclipseCaseData()->gridCount(); for ( size_t gridIdx = 0; gridIdx < gridCount; gridIdx++ ) { - RigGridBase* grid = this->eclipseCase()->eclipseCaseData()->grid( gridIdx ); + RigGridBase* grid = eclipseCase()->eclipseCaseData()->grid( gridIdx ); int gridCellCount = static_cast( grid->cellCount() ); for ( auto vizType : geomTypes ) @@ -2253,13 +2249,13 @@ std::vector RimEclipseView::legendConfigs() const absLegends.push_back( fractureColors()->activeLegend() ); absLegends.push_back( virtualPerforationResult()->legendConfig() ); - for ( RimIntersectionResultDefinition* sepInterResDef : this->separateIntersectionResultsCollection()->intersectionResultsDefinitions() ) + for ( RimIntersectionResultDefinition* sepInterResDef : separateIntersectionResultsCollection()->intersectionResultsDefinitions() ) { absLegends.push_back( sepInterResDef->regularLegendConfig() ); absLegends.push_back( sepInterResDef->ternaryLegendConfig() ); } - for ( RimIntersectionResultDefinition* sepInterResDef : this->separateSurfaceResultsCollection()->intersectionResultsDefinitions() ) + for ( RimIntersectionResultDefinition* sepInterResDef : separateSurfaceResultsCollection()->intersectionResultsDefinitions() ) { absLegends.push_back( sepInterResDef->regularLegendConfig() ); absLegends.push_back( sepInterResDef->ternaryLegendConfig() ); diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp b/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp index ab8e578aac..debba092d5 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp @@ -159,5 +159,5 @@ QString RimFormationNames::layerZoneTableFileName() //-------------------------------------------------------------------------------------------------- void RimFormationNames::updateUiTreeName() { - this->uiCapability()->setUiName( fileNameWoPath() ); + uiCapability()->setUiName( fileNameWoPath() ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp index a5bc94f011..d988fa9262 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp @@ -360,7 +360,7 @@ caf::PdmFieldHandle* RimGridCollection::objectToggleField() //-------------------------------------------------------------------------------------------------- void RimGridCollection::syncFromMainEclipseGrid() { - auto mainGrid = this->mainEclipseGrid(); + auto mainGrid = mainEclipseGrid(); if ( mainGrid ) { m_mainGrid->setName( "Main Grid" ); @@ -490,7 +490,7 @@ const RigMainGrid* RimGridCollection::mainEclipseGrid() const //-------------------------------------------------------------------------------------------------- bool RimGridCollection::hasPersistentLgrs() const { - auto mainGrid = this->mainEclipseGrid(); + auto mainGrid = mainEclipseGrid(); if ( !mainGrid ) return false; for ( size_t i = 1; i < mainGrid->gridCount(); i++ ) @@ -506,7 +506,7 @@ bool RimGridCollection::hasPersistentLgrs() const //-------------------------------------------------------------------------------------------------- bool RimGridCollection::hasTemporaryLgrs() const { - auto mainGrid = this->mainEclipseGrid(); + auto mainGrid = mainEclipseGrid(); if ( !mainGrid ) return false; for ( size_t i = 1; i < mainGrid->gridCount(); i++ ) diff --git a/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp index eb5568e5a0..92aa241fc4 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp @@ -379,7 +379,7 @@ void RimGridTimeHistoryCurve::updateZoomInParentPlot() //-------------------------------------------------------------------------------------------------- void RimGridTimeHistoryCurve::onLoadDataAndUpdate( bool updateParentPlot ) { - this->RimPlotCurve::updateCurvePresentation( updateParentPlot ); + RimPlotCurve::updateCurvePresentation( updateParentPlot ); if ( isChecked() && m_plotCurve ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimGridView.cpp b/ApplicationLibCode/ProjectDataModel/RimGridView.cpp index 1c5ee5ca66..1fb994045b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridView.cpp @@ -142,8 +142,8 @@ cvf::ref RimGridView::currentTotalCellVisibility() if ( m_currentReservoirCellVisibility.isNull() ) { m_currentReservoirCellVisibility = new cvf::UByteArray; - this->calculateCurrentTotalCellVisibility( m_currentReservoirCellVisibility.p(), m_currentTimeStep() ); - this->cellVisibilityChanged.send(); + calculateCurrentTotalCellVisibility( m_currentReservoirCellVisibility.p(), m_currentTimeStep() ); + cellVisibilityChanged.send(); } return m_currentReservoirCellVisibility; @@ -210,7 +210,7 @@ void RimGridView::cellFiltersUpdated() //-------------------------------------------------------------------------------------------------- RimCellFilterCollection* RimGridView::cellFilterCollection() { - if ( this->viewController() && this->viewController()->isCellFiltersControlled() && m_overrideCellFilterCollection ) + if ( viewController() && viewController()->isCellFiltersControlled() && m_overrideCellFilterCollection ) { return m_overrideCellFilterCollection; } @@ -225,7 +225,7 @@ RimCellFilterCollection* RimGridView::cellFilterCollection() //-------------------------------------------------------------------------------------------------- const RimCellFilterCollection* RimGridView::cellFilterCollection() const { - if ( this->viewController() && this->viewController()->isCellFiltersControlled() && m_overrideCellFilterCollection ) + if ( viewController() && viewController()->isCellFiltersControlled() && m_overrideCellFilterCollection ) { return m_overrideCellFilterCollection; } @@ -266,10 +266,10 @@ void RimGridView::setOverrideCellFilterCollection( RimCellFilterCollection* rfc m_cellFilterCollection()->uiCapability()->updateConnectedEditors(); } - this->scheduleGeometryRegen( RANGE_FILTERED ); - this->scheduleGeometryRegen( RANGE_FILTERED_INACTIVE ); + scheduleGeometryRegen( RANGE_FILTERED ); + scheduleGeometryRegen( RANGE_FILTERED_INACTIVE ); - this->scheduleCreateDisplayModelAndRedraw(); + scheduleCreateDisplayModelAndRedraw(); } //-------------------------------------------------------------------------------------------------- /// @@ -291,7 +291,7 @@ void RimGridView::replaceCellFilterCollectionWithOverride() m_cellFilterCollection = overrideRfc; - this->uiCapability()->updateConnectedEditors(); + uiCapability()->updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- @@ -299,7 +299,7 @@ void RimGridView::replaceCellFilterCollectionWithOverride() //-------------------------------------------------------------------------------------------------- bool RimGridView::isGridVisualizationMode() const { - return this->m_gridCollection->isActive(); + return m_gridCollection->isActive(); } //-------------------------------------------------------------------------------------------------- @@ -368,10 +368,10 @@ void RimGridView::onCreatePartCollectionFromSelection( cvf::Collectionm_resultDefinition->geoMechCase(), geomSelItem->m_gridIndex, geomSelItem->m_cellIndex, - this->ownerCase()->displayModelOffset() ); + ownerCase()->displayModelOffset() ); cvf::ref part = partGen.createPart( geomSelItem->m_color ); - part->setTransform( this->scaleTransform() ); + part->setTransform( scaleTransform() ); parts->push_back( part.p() ); } @@ -389,10 +389,10 @@ void RimGridView::onCreatePartCollectionFromSelection( cvf::Collectionm_resultDefinition->eclipseCase()->eclipseCaseData(), eclipseSelItem->m_gridIndex, eclipseSelItem->m_gridLocalCellIndex, - this->ownerCase()->displayModelOffset() ); + ownerCase()->displayModelOffset() ); cvf::ref part = partGen.createPart( eclipseSelItem->m_color ); - part->setTransform( this->scaleTransform() ); + part->setTransform( scaleTransform() ); parts->push_back( part.p() ); } @@ -405,7 +405,7 @@ void RimGridView::onCreatePartCollectionFromSelection( cvf::CollectionpropertyFilterCollection() && this->propertyFilterCollection()->hasActiveDynamicFilters() ) + if ( propertyFilterCollection() && propertyFilterCollection()->hasActiveDynamicFilters() ) { m_currentReservoirCellVisibility = nullptr; } @@ -495,7 +495,7 @@ void RimGridView::updateSurfacesInViewTreeItems() delete m_surfaceCollection; } - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp b/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp index a7e629707e..23ed4c61a5 100644 --- a/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp @@ -343,7 +343,7 @@ RigHistogramData } else if ( cellRange == StatisticsCellRangeType::VISIBLE_CELLS ) { - this->updateVisCellStatsIfNeeded( geoMechView ); + updateVisCellStatsIfNeeded( geoMechView ); if ( timeRange == StatisticsTimeRangeType::ALL_TIMESTEPS ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index face568ee2..3375117abe 100644 --- a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -264,7 +264,7 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells() if ( caseCollection->reservoirs.size() == 0 || !m_mainGrid ) { - this->clearActiveCellUnions(); + clearActiveCellUnions(); return; } @@ -371,7 +371,7 @@ void RimIdenticalGridCaseGroup::updateMainGridAndActiveCellsForStatisticsCases() if ( rimStaticsCase->eclipseCaseData() ) { - rimStaticsCase->eclipseCaseData()->setMainGrid( this->mainGrid() ); + rimStaticsCase->eclipseCaseData()->setMainGrid( mainGrid() ); if ( i == 0 ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp b/ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp index 5a1b6c98d4..53b7bbb5d7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp @@ -139,7 +139,7 @@ void RimMdiWindowController::setupBeforeSave() { if ( viewWidget() && getMainWindow() ) { - this->setMdiWindowGeometry( getMainWindow()->windowGeometryForViewer( viewWidget() ) ); + setMdiWindowGeometry( getMainWindow()->windowGeometryForViewer( viewWidget() ) ); } } @@ -157,7 +157,7 @@ void RimMdiWindowController::updateViewerWidget() { QMdiSubWindow* viewWindow = mainWindow->createViewWindow(); QWidget* viewWidget = viewPdmObject()->createViewWidget( viewWindow ); - mainWindow->initializeViewer( viewWindow, viewWidget, this->mdiWindowGeometry() ); + mainWindow->initializeViewer( viewWindow, viewWidget, mdiWindowGeometry() ); viewPdmObject()->updateViewWidgetAfterCreation(); } @@ -168,7 +168,7 @@ void RimMdiWindowController::updateViewerWidget() { if ( viewWidget() ) { - this->setMdiWindowGeometry( mainWindow->windowGeometryForViewer( viewWidget() ) ); + setMdiWindowGeometry( mainWindow->windowGeometryForViewer( viewWidget() ) ); mainWindow->removeViewer( viewWidget() ); diff --git a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp index 9fb4dbd56b..0012c8f1dd 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp @@ -269,16 +269,16 @@ void RimMultiPlot::movePlotsToThis( const std::vector& plotsToMove, in { if ( insertAtPosition >= 0 ) { - this->insertPlot( plotsToMove[tIdx], (size_t)insertAtPosition + tIdx ); + insertPlot( plotsToMove[tIdx], (size_t)insertAtPosition + tIdx ); } else { - this->addPlot( plotsToMove[tIdx] ); + addPlot( plotsToMove[tIdx] ); } } - this->updateLayout(); - this->updateAllRequiredEditors(); + updateLayout(); + updateAllRequiredEditors(); } //-------------------------------------------------------------------------------------------------- @@ -841,7 +841,7 @@ void RimMultiPlot::updatePlots() { plot->loadDataAndUpdate(); } - this->updateZoom(); + updateZoom(); } } diff --git a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp index 6ebb9a0cbd..a102ea9b40 100644 --- a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp @@ -164,7 +164,7 @@ RimObservedSummaryData* RimObservedDataCollection::createAndAddRsmObservedSummar RimObservedEclipseUserData* columnBasedUserData = new RimObservedEclipseUserData(); observedData = columnBasedUserData; - this->m_observedDataArray.push_back( observedData ); + m_observedDataArray.push_back( observedData ); observedData->setSummaryHeaderFileName( fileName ); observedData->createSummaryReaderInterface(); observedData->updateMetaData(); @@ -177,7 +177,7 @@ RimObservedSummaryData* RimObservedDataCollection::createAndAddRsmObservedSummar RimProject::current()->assignCaseIdToSummaryCase( observedData ); updateNewObservedDataCreated( observedData ); - this->updateConnectedEditors(); + updateConnectedEditors(); return observedData; } @@ -231,7 +231,7 @@ RimObservedSummaryData* RimObservedDataCollection::createAndAddCvsObservedSummar if ( userData->summaryReader() ) { - this->m_observedDataArray.push_back( userData ); + m_observedDataArray.push_back( userData ); observedData = userData; } else @@ -243,7 +243,7 @@ RimObservedSummaryData* RimObservedDataCollection::createAndAddCvsObservedSummar RimProject::current()->assignCaseIdToSummaryCase( observedData ); updateNewObservedDataCreated( observedData ); - this->updateConnectedEditors(); + updateConnectedEditors(); return observedData; } @@ -262,7 +262,7 @@ RimObservedFmuRftData* RimObservedDataCollection::createAndAddFmuRftDataFromPath m_observedFmuRftArray.push_back( fmuRftData ); updateNewObservedDataCreated( fmuRftData ); - this->updateConnectedEditors(); + updateConnectedEditors(); return fmuRftData; } @@ -281,7 +281,7 @@ RimPressureDepthData* RimObservedDataCollection::createAndAddPressureDepthDataFr m_observedPressureDepthArray.push_back( data ); updateNewObservedDataCreated( data ); - this->updateConnectedEditors(); + updateConnectedEditors(); return data; } diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp index 20c93f7ecc..a0a4bc9902 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp @@ -270,10 +270,10 @@ void RimPlotAxisProperties::setNameAndAxis( const QString& objectName, const QSt m_plotAxis = axis; m_plotAxisIndex = axisIndex; - if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_LEFT ) this->setUiIconFromResourceString( ":/LeftAxis16x16.png" ); - if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) this->setUiIconFromResourceString( ":/RightAxis16x16.png" ); - if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) this->setUiIconFromResourceString( ":/BottomAxis16x16.png" ); - if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_TOP ) this->setUiIconFromResourceString( ":/TopAxis16x16.png" ); + if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_LEFT ) setUiIconFromResourceString( ":/LeftAxis16x16.png" ); + if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT ) setUiIconFromResourceString( ":/RightAxis16x16.png" ); + if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM ) setUiIconFromResourceString( ":/BottomAxis16x16.png" ); + if ( axis == RiaDefines::PlotAxis::PLOT_AXIS_TOP ) setUiIconFromResourceString( ":/TopAxis16x16.png" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp index 64d9dae769..74d25a588a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp @@ -162,7 +162,7 @@ void RimPlotCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, co { if ( changedField == &m_showCurve ) { - this->updateCurveVisibility(); + updateCurveVisibility(); if ( m_showCurve() ) loadDataAndUpdate( false ); visibilityChanged.send( m_showCurve() ); } @@ -282,16 +282,16 @@ void RimPlotCurve::initAfterRead() //-------------------------------------------------------------------------------------------------- void RimPlotCurve::updateCurvePresentation( bool updatePlotLegendAndTitle ) { - this->updateCurveVisibility(); + updateCurveVisibility(); if ( updatePlotLegendAndTitle ) { - this->updateCurveNameAndUpdatePlotLegendAndTitle(); - this->updatePlotTitle(); + updateCurveNameAndUpdatePlotLegendAndTitle(); + updatePlotTitle(); } else { - this->updateCurveNameNoLegendUpdate(); + updateCurveNameNoLegendUpdate(); } updateCurveAppearance(); @@ -330,7 +330,7 @@ QList RimPlotCurve::calculateValueOptions( const caf::Pd { // Find all plot windows above this object upwards in the object hierarchy. Use the top most plot window as the // root to find all plot curves. - auto parentPlots = this->allAncestorsOfType(); + auto parentPlots = allAncestorsOfType(); if ( !parentPlots.empty() ) { @@ -405,11 +405,11 @@ void RimPlotCurve::updateCurveName() { if ( m_namingMethod == RiaDefines::ObjectNamingMethod::AUTO ) { - m_curveName = this->createCurveAutoName(); + m_curveName = createCurveAutoName(); } else if ( m_namingMethod == RiaDefines::ObjectNamingMethod::TEMPLATE ) { - m_curveName = this->createCurveNameFromTemplate( m_curveNameTemplateText ); + m_curveName = createCurveNameFromTemplate( m_curveNameTemplateText ); } if ( !m_legendEntryText().isEmpty() ) @@ -588,7 +588,7 @@ bool RimPlotCurve::isCrossPlotCurve() const //-------------------------------------------------------------------------------------------------- void RimPlotCurve::loadDataAndUpdate( bool updateParentPlot ) { - this->onLoadDataAndUpdate( updateParentPlot ); + onLoadDataAndUpdate( updateParentPlot ); if ( updateParentPlot ) { dataChanged.send(); diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp index dd050bc2a9..bbd5868589 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp @@ -410,7 +410,7 @@ void RimPlotWindow::setId( int id ) { m_id = id; QString viewIdTooltip = QString( "Plot id: %1" ).arg( m_id ); - this->setUiToolTip( viewIdTooltip ); + setUiToolTip( viewIdTooltip ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimProject.cpp b/ApplicationLibCode/ProjectDataModel/RimProject.cpp index 8fbda5b57c..5d1d3539fc 100644 --- a/ApplicationLibCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimProject.cpp @@ -234,7 +234,7 @@ RimProject::RimProject() // For now, create a default first oilfield that contains the rest of the project oilFields.push_back( new RimOilField ); - this->setUiHidden( true ); + setUiHidden( true ); } //-------------------------------------------------------------------------------------------------- @@ -305,7 +305,7 @@ void RimProject::close() //-------------------------------------------------------------------------------------------------- void RimProject::beforeInitAfterRead() { - this->distributePathsFromGlobalPathList(); + distributePathsFromGlobalPathList(); // Create an empty oil field in case the project did not contain one if ( oilFields.size() < 1 ) @@ -406,9 +406,9 @@ RimMainPlotCollection* RimProject::mainPlotCollection() const //-------------------------------------------------------------------------------------------------- bool RimProject::writeProjectFile() { - this->transferPathsToGlobalPathList(); - bool couldOpenFile = this->writeFile(); - this->distributePathsFromGlobalPathList(); + transferPathsToGlobalPathList(); + bool couldOpenFile = writeFile(); + distributePathsFromGlobalPathList(); return couldOpenFile; } @@ -475,9 +475,9 @@ bool RimProject::isProjectFileVersionEqualOrOlderThan( const QString& otherProje void RimProject::setProjectFileNameAndUpdateDependencies( const QString& projectFileName ) { // Extract the filename of the project file when it was saved - QString oldProjectFileName = this->fileName; + QString oldProjectFileName = fileName; // Replace with the new actual filename - this->fileName = projectFileName; + fileName = projectFileName; QFileInfo fileInfo( projectFileName ); QString newProjectPath = fileInfo.path(); @@ -565,7 +565,7 @@ void RimProject::assignCaseIdToCase( RimCase* reservoirCase ) { if ( reservoirCase ) { - std::vector cases = this->descendantsIncludingThisOfType(); + std::vector cases = descendantsIncludingThisOfType(); for ( RimCase* rimCase : cases ) { m_nextValidCaseId = std::max( m_nextValidCaseId, rimCase->caseId() + 1 ); @@ -582,7 +582,7 @@ void RimProject::assignIdToCaseGroup( RimIdenticalGridCaseGroup* caseGroup ) { if ( caseGroup ) { - std::vector identicalCaseGroups = this->descendantsIncludingThisOfType(); + std::vector identicalCaseGroups = descendantsIncludingThisOfType(); for ( RimIdenticalGridCaseGroup* existingCaseGroup : identicalCaseGroups ) { @@ -602,7 +602,7 @@ void RimProject::assignViewIdToView( Rim3dView* view ) { if ( m_nextValidViewId < 0 ) { - std::vector views = this->descendantsIncludingThisOfType(); + std::vector views = descendantsIncludingThisOfType(); for ( Rim3dView* existingView : views ) { @@ -623,7 +623,7 @@ void RimProject::assignPlotIdToPlotWindow( RimPlotWindow* plotWindow ) { if ( m_nextValidPlotId < 0 ) { - std::vector plotWindows = this->descendantsIncludingThisOfType(); + std::vector plotWindows = descendantsIncludingThisOfType(); for ( RimPlotWindow* existingPlotWindow : plotWindows ) { @@ -843,7 +843,7 @@ void RimProject::allVisibleViews( std::vector& views ) const void RimProject::allVisibleGridViews( std::vector& views ) const { std::vector visibleViews; - this->allVisibleViews( visibleViews ); + allVisibleViews( visibleViews ); for ( Rim3dView* view : visibleViews ) { RimGridView* gridView = dynamic_cast( view ); @@ -877,7 +877,7 @@ void RimProject::scheduleCreateDisplayModelAndRedrawAllViews() void RimProject::allOilFields( std::vector& allOilFields ) const { allOilFields.clear(); - for ( const auto& oilField : this->oilFields ) + for ( const auto& oilField : oilFields ) { allOilFields.push_back( oilField ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp index b9dfba1c6f..c65f0986e5 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp @@ -337,7 +337,7 @@ void RimRegularLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change rftPlot->onLegendDefinitionChanged(); } - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -667,7 +667,7 @@ void RimRegularLegendConfig::initAfterRead() updateFieldVisibility(); - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -755,7 +755,7 @@ void RimRegularLegendConfig::onRecreateLegend() // has been removed, (and thus the opengl resources has been deleted) The text in // the legend disappeared because of this, so workaround: recreate the legend when needed: - cvf::Font* font = RiaApplication::instance()->sceneFont( this->fontSize() ); + cvf::Font* font = RiaApplication::instance()->sceneFont( fontSize() ); m_scalarMapperLegend = new caf::OverlayScalarMapperLegend( font ); m_categoryLegend = new caf::CategoryLegend( font, m_categoryMapper.p() ); @@ -1068,9 +1068,9 @@ RimLegendConfig::RangeModeType RimRegularLegendConfig::rangeMode() const void RimRegularLegendConfig::setUiValuesFromLegendConfig( const RimRegularLegendConfig* otherLegendConfig ) { QString serializedObjectString = otherLegendConfig->writeObjectToXmlString(); - this->readObjectFromXmlString( serializedObjectString, caf::PdmDefaultObjectFactory::instance() ); - this->resolveReferencesRecursively(); - this->updateLegend(); + readObjectFromXmlString( serializedObjectString, caf::PdmDefaultObjectFactory::instance() ); + resolveReferencesRecursively(); + updateLegend(); } //-------------------------------------------------------------------------------------------------- @@ -1143,7 +1143,7 @@ RimColorLegend* RimRegularLegendConfig::mapToColorLegend( ColorRangesType colorT //-------------------------------------------------------------------------------------------------- void RimRegularLegendConfig::updateFonts() { - int pointSize = this->fontSize(); + int pointSize = fontSize(); auto font = RiaApplication::instance()->sceneFont( pointSize ); m_scalarMapperLegend = new caf::OverlayScalarMapperLegend( font ); diff --git a/ApplicationLibCode/ProjectDataModel/RimRoffCase.cpp b/ApplicationLibCode/ProjectDataModel/RimRoffCase.cpp index 06eb8acf0c..0a662892d0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRoffCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimRoffCase.cpp @@ -75,7 +75,7 @@ bool RimRoffCase::openEclipseGridFile() if ( eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st( 0, 0, 0 ) ) { QString errorMessages; - if ( RifRoffFileTools::openGridFile( fileName, this->eclipseCaseData(), &errorMessages ) ) + if ( RifRoffFileTools::openGridFile( fileName, eclipseCaseData(), &errorMessages ) ) { QFileInfo gridFileInfo( fileName ); QString caseName = gridFileInfo.completeBaseName(); @@ -153,7 +153,7 @@ bool RimRoffCase::importAsciiInputProperties( const QStringList& fileNames ) { bool importFaults = false; RifInputPropertyLoader::loadAndSynchronizeInputProperties( m_inputPropertyCollection, - this->eclipseCaseData(), + eclipseCaseData(), std::vector( fileNames.begin(), fileNames.end() ), importFaults ); diff --git a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp index 05cc8c0dee..053af15e30 100644 --- a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp @@ -76,7 +76,7 @@ void RimScriptCollection::readContentFromDisc( int folderLevelsLeft ) return; } - QDir myDir( this->directory() ); + QDir myDir( directory() ); if ( !myDir.isReadable() ) { return; diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp index 45972e9799..6a74d22f7f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp @@ -179,11 +179,11 @@ std::vector RimSimWellInView::wellPipeBranches() const { RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData(); - bool includeCellCenters = this->isUsingCellCenterForPipe(); + bool includeCellCenters = isUsingCellCenterForPipe(); auto simWellCollection = firstAncestorOrThisOfTypeAsserted(); bool detectBrances = simWellCollection->isAutoDetectingBranches; - return caseData->simulationWellBranches( this->name(), includeCellCenters, detectBrances ); + return caseData->simulationWellBranches( name(), includeCellCenters, detectBrances ); } return std::vector(); } @@ -207,14 +207,14 @@ void RimSimWellInView::wellHeadTopBottomPosition( int frameIndex, cvf::Vec3d* to if ( frameIndex >= 0 ) { - if ( !this->simWellData()->hasAnyValidCells( frameIndex ) ) return; + if ( !simWellData()->hasAnyValidCells( frameIndex ) ) return; - wellResultFramePtr = this->simWellData()->wellResultFrame( frameIndex ); + wellResultFramePtr = simWellData()->wellResultFrame( frameIndex ); whCellPtr = &( rigReservoir->cellFromWellResultCell( wellResultFramePtr->wellHeadOrStartCell() ) ); } else { - wellResultFramePtr = this->simWellData()->staticWellResultFrame(); + wellResultFramePtr = simWellData()->staticWellResultFrame(); whCellPtr = &( rigReservoir->cellFromWellResultCell( wellResultFramePtr->wellHeadOrStartCell() ) ); } @@ -273,7 +273,7 @@ double RimSimWellInView::pipeRadius() double characteristicCellSize = rigReservoir->mainGrid()->characteristicIJCellSize(); - double pipeRadius = reservoirView->wellCollection()->pipeScaleFactor() * this->pipeScaleFactor() * characteristicCellSize; + double pipeRadius = reservoirView->wellCollection()->pipeScaleFactor() * pipeScaleFactor() * characteristicCellSize; return pipeRadius; } @@ -292,11 +292,11 @@ int RimSimWellInView::pipeCrossSectionVertexCount() //-------------------------------------------------------------------------------------------------- bool RimSimWellInView::intersectsDynamicWellCellsFilteredCells( size_t frameIndex ) const { - if ( this->simWellData() == nullptr ) return false; + if ( simWellData() == nullptr ) return false; if ( !simWellData()->hasWellResult( frameIndex ) ) return false; - const RigWellResultFrame* wrsf = this->simWellData()->wellResultFrame( frameIndex ); + const RigWellResultFrame* wrsf = simWellData()->wellResultFrame( frameIndex ); return intersectsWellCellsFilteredCells( wrsf, frameIndex ); } @@ -377,10 +377,10 @@ void RimSimWellInView::schedule2dIntersectionViewUpdate() //-------------------------------------------------------------------------------------------------- bool RimSimWellInView::intersectsStaticWellCellsFilteredCells() const { - if ( this->simWellData() == nullptr ) return false; + if ( simWellData() == nullptr ) return false; // NOTE: Read out static well cells, union of well cells across all time steps - const RigWellResultFrame* wrsf = this->simWellData()->staticWellResultFrame(); + const RigWellResultFrame* wrsf = simWellData()->staticWellResultFrame(); // NOTE: Use first time step for visibility evaluation size_t frameIndex = 0; @@ -432,7 +432,7 @@ void RimSimWellInView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrder if ( reservoirView->cellFilterCollection() && !reservoirView->cellFilterCollection()->hasActiveFilters() ) { - this->uiCapability()->setUiReadOnly( false ); + uiCapability()->setUiReadOnly( false ); return; } @@ -441,15 +441,15 @@ void RimSimWellInView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrder if ( !wellColl ) return; if ( wellColl->showWellsIntersectingVisibleCells() && - !this->intersectsDynamicWellCellsFilteredCells( static_cast( reservoirView->currentTimeStep() ) ) ) + !intersectsDynamicWellCellsFilteredCells( static_cast( reservoirView->currentTimeStep() ) ) ) { // Mark well as read only if well is not intersecting visible cells - this->uiCapability()->setUiReadOnly( true ); + uiCapability()->setUiReadOnly( true ); } else { - this->uiCapability()->setUiReadOnly( false ); + uiCapability()->setUiReadOnly( false ); } } @@ -461,13 +461,13 @@ bool RimSimWellInView::isWellCellsVisible() const const auto reservoirView = firstAncestorOrThisOfType(); if ( reservoirView == nullptr ) return false; - if ( this->simWellData() == nullptr ) return false; + if ( simWellData() == nullptr ) return false; if ( !reservoirView->wellCollection()->isActive() ) return false; - if ( !this->showWell() ) return false; + if ( !showWell() ) return false; - if ( !this->showWellCells() ) return false; + if ( !showWellCells() ) return false; if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true; @@ -489,14 +489,14 @@ bool RimSimWellInView::isWellPipeVisible( size_t frameIndex ) const const auto reservoirView = firstAncestorOrThisOfType(); if ( reservoirView == nullptr ) return false; - if ( this->simWellData() == nullptr ) return false; + if ( simWellData() == nullptr ) return false; - if ( frameIndex >= this->simWellData()->m_resultTimeStepIndexToWellTimeStepIndex.size() ) + if ( frameIndex >= simWellData()->m_resultTimeStepIndexToWellTimeStepIndex.size() ) { return false; } - size_t wellTimeStepIndex = this->simWellData()->m_resultTimeStepIndexToWellTimeStepIndex[frameIndex]; + size_t wellTimeStepIndex = simWellData()->m_resultTimeStepIndexToWellTimeStepIndex[frameIndex]; if ( wellTimeStepIndex == cvf::UNDEFINED_SIZE_T ) { return false; @@ -504,9 +504,9 @@ bool RimSimWellInView::isWellPipeVisible( size_t frameIndex ) const if ( !reservoirView->wellCollection()->isActive() ) return false; - if ( !this->showWell() ) return false; + if ( !showWell() ) return false; - if ( !this->showWellPipe() ) return false; + if ( !showWellPipe() ) return false; if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true; @@ -529,14 +529,14 @@ bool RimSimWellInView::isWellSpheresVisible( size_t frameIndex ) const const auto reservoirView = firstAncestorOrThisOfType(); if ( reservoirView == nullptr ) return false; - if ( this->simWellData() == nullptr ) return false; + if ( simWellData() == nullptr ) return false; - if ( frameIndex >= this->simWellData()->m_resultTimeStepIndexToWellTimeStepIndex.size() ) + if ( frameIndex >= simWellData()->m_resultTimeStepIndexToWellTimeStepIndex.size() ) { return false; } - size_t wellTimeStepIndex = this->simWellData()->m_resultTimeStepIndexToWellTimeStepIndex[frameIndex]; + size_t wellTimeStepIndex = simWellData()->m_resultTimeStepIndexToWellTimeStepIndex[frameIndex]; if ( wellTimeStepIndex == cvf::UNDEFINED_SIZE_T ) { return false; @@ -544,9 +544,9 @@ bool RimSimWellInView::isWellSpheresVisible( size_t frameIndex ) const if ( !reservoirView->wellCollection()->isActive() ) return false; - if ( !this->showWell() ) return false; + if ( !showWell() ) return false; - if ( !this->showWellSpheres() ) return false; + if ( !showWellSpheres() ) return false; if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true; @@ -568,20 +568,20 @@ bool RimSimWellInView::isWellValvesVisible( size_t frameIndex ) const const auto reservoirView = firstAncestorOrThisOfType(); if ( reservoirView == nullptr ) return false; - if ( this->simWellData() == nullptr ) return false; + if ( simWellData() == nullptr ) return false; - if ( frameIndex >= this->simWellData()->m_resultTimeStepIndexToWellTimeStepIndex.size() ) + if ( frameIndex >= simWellData()->m_resultTimeStepIndexToWellTimeStepIndex.size() ) { return false; } - size_t wellTimeStepIndex = this->simWellData()->m_resultTimeStepIndexToWellTimeStepIndex[frameIndex]; + size_t wellTimeStepIndex = simWellData()->m_resultTimeStepIndexToWellTimeStepIndex[frameIndex]; if ( wellTimeStepIndex == cvf::UNDEFINED_SIZE_T ) { return false; } - if ( !this->showWell() ) return false; + if ( !showWell() ) return false; if ( !reservoirView->wellCollection()->isActive() ) return false; if ( !reservoirView->wellCollection()->showValves() ) return false; @@ -655,14 +655,14 @@ bool RimSimWellInView::isWellDiskVisible() const const auto reservoirView = firstAncestorOrThisOfType(); if ( reservoirView == nullptr ) return false; - if ( this->simWellData() == nullptr ) return false; + if ( simWellData() == nullptr ) return false; if ( !reservoirView->wellCollection()->isActive() ) return false; if ( !reservoirView->wellCollection()->isWellDisksVisible() ) return false; - if ( !this->showWell() ) return false; + if ( !showWell() ) return false; - if ( !this->showWellDisks() ) return false; + if ( !showWellDisks() ) return false; return true; } diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index 26dbbdf59b..477a5179d1 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -274,11 +274,11 @@ bool RimSimWellInViewCollection::showWellCells() //-------------------------------------------------------------------------------------------------- RimSimWellInView* RimSimWellInViewCollection::findWell( QString name ) { - for ( size_t i = 0; i < this->wells().size(); ++i ) + for ( size_t i = 0; i < wells().size(); ++i ) { - if ( this->wells()[i]->name() == name ) + if ( wells()[i]->name() == name ) { - return this->wells()[i]; + return wells()[i]; } } return nullptr; @@ -289,13 +289,13 @@ RimSimWellInView* RimSimWellInViewCollection::findWell( QString name ) //-------------------------------------------------------------------------------------------------- bool RimSimWellInViewCollection::hasVisibleWellCells() { - if ( !this->isActive() ) return false; - if ( this->wells().size() == 0 ) return false; + if ( !isActive() ) return false; + if ( wells().size() == 0 ) return false; bool hasCells = false; - for ( size_t i = 0; !hasCells && i < this->wells().size(); ++i ) + for ( size_t i = 0; !hasCells && i < wells().size(); ++i ) { - RimSimWellInView* well = this->wells()[i]; + RimSimWellInView* well = wells()[i]; if ( well && well->simWellData() && ( ( well->showWell() && well->showWellCells() ) ) ) { for ( size_t tIdx = 0; !hasCells && tIdx < well->simWellData()->m_wellCellsTimeSteps.size(); ++tIdx ) @@ -321,8 +321,8 @@ bool RimSimWellInViewCollection::hasVisibleWellCells() //-------------------------------------------------------------------------------------------------- bool RimSimWellInViewCollection::hasVisibleWellPipes() { - if ( !this->isActive() ) return false; - if ( this->wells().size() == 0 ) return false; + if ( !isActive() ) return false; + if ( wells().size() == 0 ) return false; return true; } @@ -334,7 +334,7 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch { if ( &isActive == changedField ) { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } if ( &m_showWellLabel == changedField ) diff --git a/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp index 7fce27e136..80e4a81d42 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp @@ -81,7 +81,7 @@ void RimStackablePlotCurve::assignStackColor( size_t index, size_t count ) m_curveAppearance->setColor( RiaColorTools::fromQColorTo3f( moreSaturatedColor ) ); } - this->updateCurveAppearance(); + updateCurveAppearance(); } //-------------------------------------------------------------------------------------------------- @@ -143,7 +143,7 @@ void RimStackablePlotCurve::fieldChangedByUi( const caf::PdmFieldHandle* changed void RimStackablePlotCurve::onFillColorChanged( const caf::SignalEmitter* emitter ) { m_isStackedWithPhaseColors = false; - this->updateConnectedEditors(); + updateConnectedEditors(); stackingColorsChanged.send( m_isStackedWithPhaseColors() ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp b/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp index 2af611b949..5541fb98ff 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp @@ -64,7 +64,7 @@ RimTensorResults::RimTensorResults() CAF_PDM_InitObject( "Element Tensor Results", ":/CellResult.png" ); CAF_PDM_InitFieldNoDefault( &arrowColorLegendConfig, "LegendDefinition", "Color Legend" ); - this->arrowColorLegendConfig = new RimRegularLegendConfig(); + arrowColorLegendConfig = new RimRegularLegendConfig(); arrowColorLegendConfig.uiCapability()->setUiTreeHidden( true ); CAF_PDM_InitField( &m_resultFieldName, "ResultVariable", QString( "ST" ), "Value" ); diff --git a/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp index 666f0e31b3..d622886ba8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp @@ -242,8 +242,8 @@ void RimTernaryLegendConfig::onRecreateLegend() void RimTernaryLegendConfig::setUiValuesFromLegendConfig( const RimTernaryLegendConfig* otherLegendConfig ) { QString serializedObjectString = otherLegendConfig->writeObjectToXmlString(); - this->readObjectFromXmlString( serializedObjectString, caf::PdmDefaultObjectFactory::instance() ); - this->updateLegend(); + readObjectFromXmlString( serializedObjectString, caf::PdmDefaultObjectFactory::instance() ); + updateLegend(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp index 1619418055..945aa337c2 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp @@ -63,7 +63,7 @@ void RimTimeAxisAnnotation::setTime( time_t time ) m_name = RiaQDateTimeTools::toStringUsingApplicationLocale( RiaQDateTimeTools::fromTime_t( time ), dateTimeFormatString ); - this->setAnnotationType( AnnotationType::LINE ); + setAnnotationType( AnnotationType::LINE ); } //-------------------------------------------------------------------------------------------------- @@ -86,7 +86,7 @@ void RimTimeAxisAnnotation::setTimeRange( time_t startTime, time_t endTime ) .arg( RiaQDateTimeTools::toStringUsingApplicationLocale( RiaQDateTimeTools::fromTime_t( startTime ), dateTimeFormatString ) ) .arg( RiaQDateTimeTools::toStringUsingApplicationLocale( RiaQDateTimeTools::fromTime_t( endTime ), dateTimeFormatString ) ); - this->setAnnotationType( AnnotationType::RANGE ); + setAnnotationType( AnnotationType::RANGE ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp b/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp index c95a83e7c3..a21c4dcc8d 100644 --- a/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp @@ -234,7 +234,7 @@ bool RimUserDefinedCalculation::parseExpression() { if ( !findByName( variableName ) ) { - this->addVariable( variableName ); + addVariable( variableName ); } } } diff --git a/ApplicationLibCode/ProjectDataModel/RimViewController.cpp b/ApplicationLibCode/ProjectDataModel/RimViewController.cpp index eca6bb5515..3e0f249dc2 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewController.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewController.cpp @@ -92,7 +92,7 @@ RimViewController::RimViewController() //-------------------------------------------------------------------------------------------------- RimViewController::~RimViewController() { - this->removeOverrides(); + removeOverrides(); auto managedView = m_managedView(); m_managedView = nullptr; @@ -113,9 +113,9 @@ QList RimViewController::calculateValueOptions( const ca proj->allNotLinkedViews( views ); // Add currently linked view to list - if ( this->managedView() ) + if ( managedView() ) { - views.push_back( this->managedView() ); + views.push_back( managedView() ); } RimViewLinker* viewLinker = firstAncestorOrThisOfTypeAsserted(); @@ -299,7 +299,7 @@ void RimViewController::updateOverrides() } } - this->updateCellFilterOverrides( nullptr ); + updateCellFilterOverrides( nullptr ); if ( manGeoView ) { @@ -382,44 +382,44 @@ void RimViewController::updateOptionSensitivity() if ( isMasterAndDependentViewDifferentType ) { - this->m_syncCellResult.uiCapability()->setUiReadOnly( true ); - this->m_syncCellResult = false; + m_syncCellResult.uiCapability()->setUiReadOnly( true ); + m_syncCellResult = false; - this->m_syncLegendDefinitions.uiCapability()->setUiReadOnly( true ); - this->m_syncLegendDefinitions = false; + m_syncLegendDefinitions.uiCapability()->setUiReadOnly( true ); + m_syncLegendDefinitions = false; } else { - this->m_syncCellResult.uiCapability()->setUiReadOnly( false ); + m_syncCellResult.uiCapability()->setUiReadOnly( false ); - if ( this->m_syncCellResult ) + if ( m_syncCellResult ) { - this->m_syncLegendDefinitions.uiCapability()->setUiReadOnly( false ); + m_syncLegendDefinitions.uiCapability()->setUiReadOnly( false ); } else { - this->m_syncLegendDefinitions.uiCapability()->setUiReadOnly( true ); + m_syncLegendDefinitions.uiCapability()->setUiReadOnly( true ); } } if ( isPropertyFilterControlPossible() ) { - this->m_syncPropertyFilters.uiCapability()->setUiReadOnly( false ); + m_syncPropertyFilters.uiCapability()->setUiReadOnly( false ); } else { - this->m_syncPropertyFilters.uiCapability()->setUiReadOnly( true ); - this->m_syncPropertyFilters = false; + m_syncPropertyFilters.uiCapability()->setUiReadOnly( true ); + m_syncPropertyFilters = false; } if ( m_syncCamera ) { - this->m_showCursor.uiCapability()->setUiReadOnly( false ); + m_showCursor.uiCapability()->setUiReadOnly( false ); } else { - this->m_showCursor.uiCapability()->setUiReadOnly( true ); - this->m_showCursor = false; + m_showCursor.uiCapability()->setUiReadOnly( true ); + m_showCursor = false; } } @@ -552,10 +552,10 @@ void RimViewController::updateDuplicatedPropertyFilters() //-------------------------------------------------------------------------------------------------- void RimViewController::updateCameraLink() { - if ( !this->isCameraLinked() ) return; + if ( !isCameraLinked() ) return; if ( m_managedView ) { - RimViewLinker* viewLinker = this->ownerViewLinker(); + RimViewLinker* viewLinker = ownerViewLinker(); viewLinker->updateScaleZ( viewLinker->masterView(), viewLinker->masterView()->scaleZ() ); viewLinker->updateCamera( viewLinker->masterView() ); @@ -567,11 +567,11 @@ void RimViewController::updateCameraLink() //-------------------------------------------------------------------------------------------------- void RimViewController::updateTimeStepLink() { - if ( !this->isTimeStepLinked() ) return; + if ( !isTimeStepLinked() ) return; if ( m_managedView ) { - RimViewLinker* viewLinker = this->ownerViewLinker(); + RimViewLinker* viewLinker = ownerViewLinker(); viewLinker->updateTimeStep( viewLinker->masterView(), viewLinker->masterView()->currentTimeStep() ); } @@ -582,7 +582,7 @@ void RimViewController::updateTimeStepLink() //-------------------------------------------------------------------------------------------------- void RimViewController::updateResultColorsControl() { - if ( !this->isResultColorControlled() ) return; + if ( !isResultColorControlled() ) return; RimViewLinker* viewLinker = ownerViewLinker(); viewLinker->updateCellResult(); @@ -593,7 +593,7 @@ void RimViewController::updateResultColorsControl() //-------------------------------------------------------------------------------------------------- void RimViewController::updateLegendDefinitions() { - if ( !this->isLegendDefinitionsControlled() ) return; + if ( !isLegendDefinitionsControlled() ) return; RimViewLinker* viewLinker = ownerViewLinker(); viewLinker->updateCellResult(); @@ -713,20 +713,19 @@ bool RimViewController::isMasterAndDepViewDifferentType() const //-------------------------------------------------------------------------------------------------- void RimViewController::scheduleCreateDisplayModelAndRedrawForDependentView() const { - if ( !this->isActive() ) return; + if ( !isActive() ) return; - if ( this->isVisibleCellsOveridden() || this->isCellFiltersControlled() || this->isPropertyFilterOveridden() || - this->isResultColorControlled() ) + if ( isVisibleCellsOveridden() || isCellFiltersControlled() || isPropertyFilterOveridden() || isResultColorControlled() ) { - if ( this->managedView() ) + if ( managedView() ) { - this->managedView()->scheduleCreateDisplayModelAndRedraw(); + managedView()->scheduleCreateDisplayModelAndRedraw(); } } - if ( this->isResultColorControlled() && this->managedView() ) + if ( isResultColorControlled() && managedView() ) { - auto gridView = dynamic_cast( this->managedView() ); + auto gridView = dynamic_cast( managedView() ); if ( gridView ) gridView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews(); } } @@ -736,19 +735,18 @@ void RimViewController::scheduleCreateDisplayModelAndRedrawForDependentView() co //-------------------------------------------------------------------------------------------------- void RimViewController::scheduleGeometryRegenForDepViews( RivCellSetEnum geometryType ) const { - if ( !this->isActive() ) return; + if ( !isActive() ) return; - if ( this->isVisibleCellsOveridden() || this->isCellFiltersControlled() || this->isPropertyFilterOveridden() || - this->isResultColorControlled() ) + if ( isVisibleCellsOveridden() || isCellFiltersControlled() || isPropertyFilterOveridden() || isResultColorControlled() ) { - if ( this->managedView() ) + if ( managedView() ) { - if ( this->isVisibleCellsOveridden() ) + if ( isVisibleCellsOveridden() ) { - this->managedView()->scheduleGeometryRegen( OVERRIDDEN_CELL_VISIBILITY ); + managedView()->scheduleGeometryRegen( OVERRIDDEN_CELL_VISIBILITY ); } - this->managedView()->scheduleGeometryRegen( geometryType ); + managedView()->scheduleGeometryRegen( geometryType ); } } } @@ -758,7 +756,7 @@ void RimViewController::scheduleGeometryRegenForDepViews( RivCellSetEnum geometr //-------------------------------------------------------------------------------------------------- bool RimViewController::isActive() const { - return ownerViewLinker()->isActive() && this->m_isActive(); + return ownerViewLinker()->isActive() && m_isActive(); } //-------------------------------------------------------------------------------------------------- @@ -766,7 +764,7 @@ bool RimViewController::isActive() const //-------------------------------------------------------------------------------------------------- bool RimViewController::isCameraLinked() const { - if ( ownerViewLinker()->isActive() && this->m_isActive() ) + if ( ownerViewLinker()->isActive() && m_isActive() ) { return m_syncCamera; } @@ -787,7 +785,7 @@ bool RimViewController::showCursor() const //-------------------------------------------------------------------------------------------------- bool RimViewController::isTimeStepLinked() const { - if ( ownerViewLinker()->isActive() && this->m_isActive() ) + if ( ownerViewLinker()->isActive() && m_isActive() ) { return m_syncTimeStep; } @@ -800,7 +798,7 @@ bool RimViewController::isTimeStepLinked() const //-------------------------------------------------------------------------------------------------- bool RimViewController::isResultColorControlled() const { - if ( ownerViewLinker()->isActive() && this->m_isActive() ) + if ( ownerViewLinker()->isActive() && m_isActive() ) { return m_syncCellResult; } @@ -813,7 +811,7 @@ bool RimViewController::isResultColorControlled() const //-------------------------------------------------------------------------------------------------- bool RimViewController::isLegendDefinitionsControlled() const { - if ( ownerViewLinker()->isActive() && this->m_isActive() ) + if ( ownerViewLinker()->isActive() && m_isActive() ) { return m_syncLegendDefinitions; } @@ -897,7 +895,7 @@ bool RimViewController::isPropertyFilterControlAdvisable() const //-------------------------------------------------------------------------------------------------- bool RimViewController::isCellFiltersControlled() const { - if ( ownerViewLinker() && ownerViewLinker()->isActive() && this->m_isActive() ) + if ( ownerViewLinker() && ownerViewLinker()->isActive() && m_isActive() ) { return m_syncCellFilters; } @@ -942,7 +940,7 @@ bool RimViewController::isPropertyFilterOveridden() const { if ( !isPropertyFilterControlPossible() ) return false; - if ( ownerViewLinker()->isActive() && this->m_isActive() ) + if ( ownerViewLinker()->isActive() && m_isActive() ) { return m_syncPropertyFilters; } diff --git a/ApplicationLibCode/ProjectDataModel/RimViewLinker.cpp b/ApplicationLibCode/ProjectDataModel/RimViewLinker.cpp index 4d2493f8f2..23f3db1f7a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewLinker.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewLinker.cpp @@ -355,10 +355,10 @@ void RimViewLinker::setMasterView( Rim3dView* view ) if ( previousViewController ) { delete previousViewController; - this->m_viewControllers.removeChild( nullptr ); + m_viewControllers.removeChild( nullptr ); } - this->removeOverrides(); + removeOverrides(); m_masterView = view; @@ -623,7 +623,7 @@ void RimViewLinker::addDependentView( Rim3dView* view ) if ( !view->viewController() ) { RimViewController* viewContr = new RimViewController; - this->m_viewControllers.push_back( viewContr ); + m_viewControllers.push_back( viewContr ); viewContr->setManagedView( view ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp index b52eff4784..171cbece93 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp @@ -82,7 +82,7 @@ void RimViewLinkerCollection::fieldChangedByUi( const caf::PdmFieldHandle* chang } } - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -90,7 +90,7 @@ void RimViewLinkerCollection::fieldChangedByUi( const caf::PdmFieldHandle* chang //-------------------------------------------------------------------------------------------------- void RimViewLinkerCollection::initAfterRead() { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp index e542bb5b28..2d579c3009 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp @@ -103,9 +103,9 @@ void RimViewWindow::removeMdiWindowFromMdiArea() //-------------------------------------------------------------------------------------------------- QString RimViewWindow::windowTitle() { - if ( this->userDescriptionField() ) + if ( userDescriptionField() ) { - caf::PdmUiFieldHandle* uiFieldHandle = this->userDescriptionField()->uiCapability(); + caf::PdmUiFieldHandle* uiFieldHandle = userDescriptionField()->uiCapability(); if ( uiFieldHandle ) { QVariant v = uiFieldHandle->uiValue(); diff --git a/ApplicationLibCode/ProjectDataModel/RimWbsParameters.cpp b/ApplicationLibCode/ProjectDataModel/RimWbsParameters.cpp index 0a11b46db9..f6933ec291 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWbsParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWbsParameters.cpp @@ -335,7 +335,7 @@ void RimWbsParameters::loadDataAndUpdate() assignValidSource( field, supportedSources( parameter ) ); } } - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimWellBoreStabilityPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimWellBoreStabilityPlot.cpp index 390113a226..af5b06032a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWellBoreStabilityPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWellBoreStabilityPlot.cpp @@ -157,7 +157,7 @@ void RimWellBoreStabilityPlot::childFieldChangedByUi( const caf::PdmFieldHandle* } else if ( changedChildField == &m_wbsParameters ) { - this->loadDataAndUpdate(); + loadDataAndUpdate(); } } @@ -205,5 +205,5 @@ void RimWellBoreStabilityPlot::applyDataSource() m_wbsParameters->setTimeStep( m_commonDataSource->timeStepToApply() ); m_wbsParameters->setFrameIndex( -1 ); - this->updateConnectedEditors(); + updateConnectedEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicSection.cpp b/ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicSection.cpp index 94eedbd75a..32ffe7c986 100644 --- a/ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicSection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicSection.cpp @@ -117,7 +117,7 @@ RimSeismicSection::RimSeismicSection() CAF_PDM_InitField( &m_zLowerThreshold, "LowerThreshold", -1, "Lower Threshold" ); m_zLowerThreshold.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - this->setUi3dEditorTypeName( RicPolyline3dEditor::uiEditorTypeName() ); + setUi3dEditorTypeName( RicPolyline3dEditor::uiEditorTypeName() ); setDeletable( true ); } @@ -748,7 +748,7 @@ void RimSeismicSection::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel { if ( changedField == &m_enablePicking ) { - this->updateConnectedEditors(); + updateConnectedEditors(); } else if ( changedField == &m_showImage ) { diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp index fe0edd1f72..beb3094742 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp @@ -162,14 +162,7 @@ void RimStimPlanModelCurve::performDataExtraction( bool* isUsingPseudoLength ) // TOOD: Consider rewrite, as RigWellLogCurveData can do logarithmic filtering bool useLogarithmicScale = false; - this->setPropertyValuesWithMdAndTVD( values, - measuredDepthValues, - tvDepthValues, - rkbDiff, - depthUnit, - !performDataSmoothing, - useLogarithmicScale, - xUnits ); + setPropertyValuesWithMdAndTVD( values, measuredDepthValues, tvDepthValues, rkbDiff, depthUnit, !performDataSmoothing, useLogarithmicScale, xUnits ); } } diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp index 986fde0b4d..8fdba73925 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp @@ -170,7 +170,7 @@ void RimStimPlanModelPlot::onLoadDataAndUpdate() //-------------------------------------------------------------------------------------------------- void RimStimPlanModelPlot::applyDataSource() { - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp index 371fe61201..650c74236a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp @@ -126,15 +126,15 @@ void RimAsciiDataCurve::updateZoomInParentPlot() //-------------------------------------------------------------------------------------------------- void RimAsciiDataCurve::onLoadDataAndUpdate( bool updateParentPlot ) { - this->RimPlotCurve::updateCurvePresentation( updateParentPlot ); + RimPlotCurve::updateCurvePresentation( updateParentPlot ); if ( isChecked() ) { - std::vector dateTimes = this->timeSteps(); - std::vector values = this->yValues(); + std::vector dateTimes = timeSteps(); + std::vector values = yValues(); auto plot = firstAncestorOrThisOfType(); - bool useLogarithmicScale = plot->isLogarithmicScaleEnabled( this->yAxis() ); + bool useLogarithmicScale = plot->isLogarithmicScaleEnabled( yAxis() ); if ( dateTimes.size() > 0 && dateTimes.size() == values.size() ) { @@ -197,7 +197,7 @@ void RimAsciiDataCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderi //-------------------------------------------------------------------------------------------------- void RimAsciiDataCurve::updateQwtPlotAxis() { - if ( m_plotCurve ) updateAxisInPlot( this->yAxis() ); + if ( m_plotCurve ) updateAxisInPlot( yAxis() ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCsvSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimCsvSummaryCase.cpp index 6c5e3c2b12..649ca7da56 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimCsvSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCsvSummaryCase.cpp @@ -59,7 +59,7 @@ RimCsvSummaryCase::RimCsvSummaryCase() //-------------------------------------------------------------------------------------------------- QString RimCsvSummaryCase::caseName() const { - QFileInfo caseFileName( this->summaryHeaderFilename() ); + QFileInfo caseFileName( summaryHeaderFilename() ); return caseFileName.completeBaseName(); } @@ -70,7 +70,7 @@ void RimCsvSummaryCase::createSummaryReaderInterface() { m_summaryReader = nullptr; - if ( caf::Utils::fileExists( this->summaryHeaderFilename() ) ) + if ( caf::Utils::fileExists( summaryHeaderFilename() ) ) { if ( m_fileType == FileType::REVEAL ) { diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp index e71afd28ed..6717d067ab 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp @@ -65,10 +65,10 @@ void RimCsvUserData::createSummaryReaderInterface() { m_multiSummaryReader = nullptr; - if ( caf::Utils::fileExists( this->summaryHeaderFilename() ) ) + if ( caf::Utils::fileExists( summaryHeaderFilename() ) ) { RifCsvUserData* csvUserData = new RifCsvUserData(); - if ( csvUserData->parse( this->summaryHeaderFilename(), m_parseOptions->parseOptions(), &m_errorText ) ) + if ( csvUserData->parse( summaryHeaderFilename(), m_parseOptions->parseOptions(), &m_errorText ) ) { m_summaryReader = csvUserData; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp index 6331e02b58..008002902b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp @@ -394,7 +394,7 @@ void RimEnsembleCurveFilter::fieldChangedByUi( const caf::PdmFieldHandle* change summaryAddress->setAddress( address.summaryAddress() ); m_objectiveValuesSummaryAddresses.push_back( summaryAddress ); } - this->loadDataAndUpdate(); + loadDataAndUpdate(); } } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index 1882ac9d8e..f2d9857284 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -745,7 +745,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi { m_selectedTimeSteps.v().clear(); - this->updateConnectedEditors(); + updateConnectedEditors(); } else if ( changedField == &m_selectedTimeSteps ) { @@ -810,7 +810,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi m_yValuesSummaryCaseCollection = curveSelection[0].ensemble(); m_yValuesSummaryAddress->setAddress( curveSelection[0].summaryAddress() ); - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); plot->updateAxes(); plot->updatePlotTitle(); @@ -849,7 +849,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi summaryAddress->setAddress( address.summaryAddress() ); m_objectiveValuesSummaryAddresses.push_back( summaryAddress ); } - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } } @@ -1142,7 +1142,7 @@ void RimEnsembleCurveSet::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOr uiTreeOrdering.skipRemainingChildren( true ); - caf::IconProvider iconProvider = this->uiIconProvider(); + caf::IconProvider iconProvider = uiIconProvider(); if ( !iconProvider.valid() ) return; auto coll = firstAncestorOrThisOfType(); @@ -1151,7 +1151,7 @@ void RimEnsembleCurveSet::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOr iconProvider.setOverlayResourceString( ":/StepUpDownCorner16x16.png" ); } - this->setUiIcon( iconProvider ); + setUiIcon( iconProvider ); } //-------------------------------------------------------------------------------------------------- @@ -1391,7 +1391,7 @@ RiaSummaryCurveDefinitionAnalyser* RimEnsembleCurveSet::getOrCreateSelectedCurve { m_analyserOfSelectedCurveDefs = std::unique_ptr( new RiaSummaryCurveDefinitionAnalyser ); } - m_analyserOfSelectedCurveDefs->setCurveDefinitions( this->curveDefinitions() ); + m_analyserOfSelectedCurveDefs->setCurveDefinitions( curveDefinitions() ); return m_analyserOfSelectedCurveDefs.get(); } @@ -1937,7 +1937,7 @@ void RimEnsembleCurveSet::updateStatisticsCurves() RimEnsembleCurveSet* RimEnsembleCurveSet::clone() const { RimEnsembleCurveSet* copy = - dynamic_cast( this->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) ); + dynamic_cast( xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) ); copy->setSummaryCaseCollection( m_yValuesSummaryCaseCollection() ); // Update summary case references diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp index 3bee49b6e5..550fb6bf63 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp @@ -92,7 +92,7 @@ QString RimFileSummaryCase::summaryHeaderFilename() const //-------------------------------------------------------------------------------------------------- QString RimFileSummaryCase::caseName() const { - QFileInfo caseFileName( this->summaryHeaderFilename() ); + QFileInfo caseFileName( summaryHeaderFilename() ); return caseFileName.completeBaseName(); } @@ -103,7 +103,7 @@ QString RimFileSummaryCase::caseName() const void RimFileSummaryCase::createSummaryReaderInterfaceThreadSafe( RiaThreadSafeLogger* threadSafeLogger ) { m_fileSummaryReader = - RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(), m_includeRestartFiles, threadSafeLogger ); + RimFileSummaryCase::findRelatedFilesAndCreateReader( summaryHeaderFilename(), m_includeRestartFiles, threadSafeLogger ); m_multiSummaryReader = new RifMultipleSummaryReaders; m_multiSummaryReader->addReader( m_fileSummaryReader.p() ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp index 0ae551aece..e5450b3154 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp @@ -103,8 +103,8 @@ void RimGridSummaryCase_obsolete::setAssociatedEclipseCase( RimEclipseCase* ecli m_summaryHeaderFilename = summaryHeaderFilenameFromEclipseCase( eclipseCase ); m_cachedCaseName = caseNameFromEclipseCase( eclipseCase ); - this->updateAutoShortName(); - this->updateTreeItemName(); + updateAutoShortName(); + updateTreeItemName(); } //-------------------------------------------------------------------------------------------------- @@ -128,8 +128,8 @@ RimEclipseCase* RimGridSummaryCase_obsolete::associatedEclipseCase() if ( sumHeaderFileName == m_summaryHeaderFilename().path() ) { m_eclipseCase = eclCase; - this->updateAutoShortName(); - this->updateTreeItemName(); + updateAutoShortName(); + updateTreeItemName(); break; } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp index 41ee3e739b..dcf49b677e 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp @@ -211,7 +211,7 @@ QString RimObjectiveFunction::formulaString( std::vectorshortName() < other.shortName(); + return shortName() < other.shortName(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp index 701c3c868f..1dedf17471 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp @@ -61,12 +61,12 @@ void RimObservedEclipseUserData::createSummaryReaderInterface() m_multiSummaryReader = nullptr; m_summaryReader = nullptr; - if ( caf::Utils::fileExists( this->summaryHeaderFilename() ) ) + if ( caf::Utils::fileExists( summaryHeaderFilename() ) ) { - QFile file( this->summaryHeaderFilename() ); + QFile file( summaryHeaderFilename() ); if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) ) { - RiaLogging::error( QString( "Failed to open %1" ).arg( this->summaryHeaderFilename() ) ); + RiaLogging::error( QString( "Failed to open %1" ).arg( summaryHeaderFilename() ) ); return; } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp index 7312eb6873..138ea4ad7b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp @@ -55,7 +55,7 @@ RimObservedSummaryData::RimObservedSummaryData() //-------------------------------------------------------------------------------------------------- QString RimObservedSummaryData::caseName() const { - QFileInfo caseFileName( this->summaryHeaderFilename() ); + QFileInfo caseFileName( summaryHeaderFilename() ); return caseFileName.completeBaseName(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp index df34bbea0e..dd301f6d83 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp @@ -101,8 +101,8 @@ void RimSummaryCase::setSummaryHeaderFileName( const QString& fileName ) { m_summaryHeaderFilename = fileName; - this->updateAutoShortName(); - this->updateTreeItemName(); + updateAutoShortName(); + updateTreeItemName(); } //-------------------------------------------------------------------------------------------------- @@ -173,7 +173,7 @@ void RimSummaryCase::copyFrom( const RimSummaryCase& rhs ) m_summaryHeaderFilename = rhs.m_summaryHeaderFilename; m_isObservedData = rhs.m_isObservedData; - this->updateTreeItemName(); + updateTreeItemName(); } //-------------------------------------------------------------------------------------------------- @@ -181,7 +181,7 @@ void RimSummaryCase::copyFrom( const RimSummaryCase& rhs ) //-------------------------------------------------------------------------------------------------- bool RimSummaryCase::operator<( const RimSummaryCase& rhs ) const { - return this->caseName() < rhs.caseName(); + return caseName() < rhs.caseName(); } //-------------------------------------------------------------------------------------------------- @@ -280,7 +280,7 @@ void RimSummaryCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin //-------------------------------------------------------------------------------------------------- void RimSummaryCase::updateTreeItemName() { - this->setUiName( displayCaseName() ); + setUiName( displayCaseName() ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index 241b054c41..0a9354fc81 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp @@ -422,7 +422,7 @@ std::vector RimSummaryCaseCollection::variationSortedEnsem if ( m_cachedSortedEnsembleParameters.empty() ) { std::set paramSet; - for ( RimSummaryCase* rimCase : this->allSummaryCases() ) + for ( RimSummaryCase* rimCase : allSummaryCases() ) { if ( rimCase->caseRealizationParameters() != nullptr ) { @@ -437,7 +437,7 @@ std::vector RimSummaryCaseCollection::variationSortedEnsem m_cachedSortedEnsembleParameters.reserve( paramSet.size() ); for ( const QString& parameterName : paramSet ) { - auto ensembleParameter = this->createEnsembleParameter( parameterName ); + auto ensembleParameter = createEnsembleParameter( parameterName ); m_cachedSortedEnsembleParameters.push_back( ensembleParameter ); } RimSummaryCaseCollection::sortByBinnedVariation( m_cachedSortedEnsembleParameters ); @@ -620,7 +620,7 @@ std::vector> std::vector RimSummaryCaseCollection::alphabeticEnsembleParameters() const { std::set paramSet; - for ( RimSummaryCase* rimCase : this->allSummaryCases() ) + for ( RimSummaryCase* rimCase : allSummaryCases() ) { if ( rimCase->caseRealizationParameters() != nullptr ) { @@ -636,7 +636,7 @@ std::vector RimSummaryCaseCollection::alphabeticEnsemblePa sortedEnsembleParameters.reserve( paramSet.size() ); for ( const QString& parameterName : paramSet ) { - sortedEnsembleParameters.push_back( this->createEnsembleParameter( parameterName ) ); + sortedEnsembleParameters.push_back( createEnsembleParameter( parameterName ) ); } return sortedEnsembleParameters; } @@ -1145,7 +1145,7 @@ int RimSummaryCaseCollection::ensembleId() const //-------------------------------------------------------------------------------------------------- bool RimSummaryCaseCollection::hasEnsembleParameters() const { - for ( RimSummaryCase* rimCase : this->allSummaryCases() ) + for ( RimSummaryCase* rimCase : allSummaryCases() ) { if ( rimCase->caseRealizationParameters() != nullptr ) { diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index e483d0e58d..7a37e300f6 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -229,7 +229,7 @@ void RimSummaryCurve::setSummaryAddressY( const RifEclipseSummaryAddress& addres std::string RimSummaryCurve::unitNameY() const { RifSummaryReaderInterface* reader = valuesSummaryReaderY(); - if ( reader ) return reader->unitName( this->summaryAddressY() ); + if ( reader ) return reader->unitName( summaryAddressY() ); return ""; } @@ -240,7 +240,7 @@ std::string RimSummaryCurve::unitNameY() const std::string RimSummaryCurve::unitNameX() const { RifSummaryReaderInterface* reader = valuesSummaryReaderX(); - if ( reader ) return reader->unitName( this->summaryAddressX() ); + if ( reader ) return reader->unitName( summaryAddressX() ); return ""; } @@ -467,7 +467,7 @@ void RimSummaryCurve::setIsEnsembleCurve( bool isEnsembleCurve ) //-------------------------------------------------------------------------------------------------- QList RimSummaryCurve::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) { - QList options = this->RimPlotCurve::calculateValueOptions( fieldNeedingOptions ); + QList options = RimPlotCurve::calculateValueOptions( fieldNeedingOptions ); if ( !options.isEmpty() ) return options; auto createOptionsForSummaryCase = []( RimSummaryCase* summaryCase, QList& options ) @@ -594,16 +594,16 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot ) if ( isChecked() ) { - std::vector curveValuesY = this->valuesY(); + std::vector curveValuesY = valuesY(); auto plot = firstAncestorOrThisOfTypeAsserted(); - bool useLogarithmicScale = plot->isLogarithmicScaleEnabled( this->axisY() ); + bool useLogarithmicScale = plot->isLogarithmicScaleEnabled( axisY() ); bool shouldPopulateViewWithEmptyData = false; if ( isCrossPlotCurve() ) { - auto curveValuesX = this->valuesX(); + auto curveValuesX = valuesX(); auto curveTimeStepsX = timeStepsX(); auto curveTimeStepsY = timeStepsY(); @@ -621,9 +621,9 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot ) if ( curveMerger.allXValues().size() > 0 ) { - this->setSamplesFromXYValues( curveMerger.interpolatedYValuesForAllXValues( 0 ), - curveMerger.interpolatedYValuesForAllXValues( 1 ), - useLogarithmicScale ); + setSamplesFromXYValues( curveMerger.interpolatedYValuesForAllXValues( 0 ), + curveMerger.interpolatedYValuesForAllXValues( 1 ), + useLogarithmicScale ); } else { @@ -633,7 +633,7 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot ) } else { - std::vector curveTimeStepsY = this->timeStepsY(); + std::vector curveTimeStepsY = timeStepsY(); if ( curveTimeStepsY.size() > 0 && curveTimeStepsY.size() == curveValuesY.size() ) { if ( plot->timeAxisProperties()->timeMode() == RimSummaryTimeAxisProperties::DATE ) @@ -651,11 +651,11 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot ) if ( !errValues.empty() ) { - this->setSamplesFromXYErrorValues( timeSteps, curveValuesY, errValues, useLogarithmicScale ); + setSamplesFromXYErrorValues( timeSteps, curveValuesY, errValues, useLogarithmicScale ); } else { - this->setSamplesFromXYValues( timeSteps, curveValuesY, useLogarithmicScale ); + setSamplesFromXYValues( timeSteps, curveValuesY, useLogarithmicScale ); } } else @@ -677,12 +677,12 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot ) resampledTimeSteps.insert( resampledTimeSteps.begin(), curveTimeStepsY.front() ); resampledValues.insert( resampledValues.begin(), resampledValues.front() ); - this->setSamplesFromTimeTAndYValues( resampledTimeSteps, resampledValues, useLogarithmicScale ); + setSamplesFromTimeTAndYValues( resampledTimeSteps, resampledValues, useLogarithmicScale ); } } else { - this->setSamplesFromTimeTAndYValues( curveTimeStepsY, curveValuesY, useLogarithmicScale ); + setSamplesFromTimeTAndYValues( curveTimeStepsY, curveValuesY, useLogarithmicScale ); } } } @@ -701,7 +701,7 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot ) } } - this->setSamplesFromXYValues( timeFromSimulationStart, curveValuesY, useLogarithmicScale ); + setSamplesFromXYValues( timeFromSimulationStart, curveValuesY, useLogarithmicScale ); } } else @@ -714,7 +714,7 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot ) if ( shouldPopulateViewWithEmptyData ) { - this->setSamplesFromXYValues( std::vector(), std::vector(), useLogarithmicScale ); + setSamplesFromXYValues( std::vector(), std::vector(), useLogarithmicScale ); } if ( updateParentPlot && hasParentPlot() ) @@ -747,7 +747,7 @@ void RimSummaryCurve::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderi { RimPlotCurve::defineUiTreeOrdering( uiTreeOrdering, uiConfigName ); - caf::IconProvider iconProvider = this->uiIconProvider(); + caf::IconProvider iconProvider = uiIconProvider(); if ( !iconProvider.valid() ) return; RimSummaryCurveCollection* coll = firstAncestorOrThisOfType(); @@ -1055,7 +1055,7 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, { m_yValuesSummaryAddress->setAddress( m_yValuesSummaryAddressUiField() ); - this->calculateCurveInterpolationFromAddress(); + calculateCurveInterpolationFromAddress(); loadAndUpdate = true; } @@ -1063,7 +1063,7 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, { m_xValuesSummaryAddress->setAddress( m_xValuesSummaryAddressUiField() ); - this->calculateCurveInterpolationFromAddress(); + calculateCurveInterpolationFromAddress(); loadAndUpdate = true; } @@ -1097,7 +1097,7 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, plot->updateCaseNameHasChanged(); // TODO: is it not ok to just set loadAndUpdate = true? - this->onLoadDataAndUpdate( true ); + onLoadDataAndUpdate( true ); dataChanged.send(); } else if ( changedField == &m_yPushButtonSelectSummaryAddress ) @@ -1171,10 +1171,10 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, if ( crossPlotTestForMatchingTimeSteps ) { - auto curveValuesX = this->valuesX(); + auto curveValuesX = valuesX(); auto curveTimeStepsX = timeStepsX(); - auto curveValuesY = this->valuesY(); + auto curveValuesY = valuesY(); auto curveTimeStepsY = timeStepsY(); if ( !curveValuesX.empty() && !curveValuesY.empty() ) @@ -1233,7 +1233,7 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, //-------------------------------------------------------------------------------------------------- void RimSummaryCurve::loadAndUpdateDataAndPlot() { - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); auto plot = firstAncestorOrThisOfTypeAsserted(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp index b35e0464c1..184da3a0c5 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp @@ -410,7 +410,7 @@ void RimSummaryCurveAutoName::fieldChangedByUi( const caf::PdmFieldHandle* chang // NOTE: The curve filter is parent object of a summary curve, and the update is supposed to update // the first parent, not the grandparent. This is the reason for not using firstAncestorOrThisOfType() - RimSummaryCurve* summaryCurve = dynamic_cast( this->parentField()->ownerObject() ); + RimSummaryCurve* summaryCurve = dynamic_cast( parentField()->ownerObject() ); if ( summaryCurve ) { summaryCurve->updateCurveNameAndUpdatePlotLegendAndTitle(); @@ -419,7 +419,7 @@ void RimSummaryCurveAutoName::fieldChangedByUi( const caf::PdmFieldHandle* chang return; } - RicSummaryPlotEditorUi* curveCreator = dynamic_cast( this->parentField()->ownerObject() ); + RicSummaryPlotEditorUi* curveCreator = dynamic_cast( parentField()->ownerObject() ); if ( curveCreator ) { curveCreator->updateCurveNames(); @@ -429,7 +429,7 @@ void RimSummaryCurveAutoName::fieldChangedByUi( const caf::PdmFieldHandle* chang } { - auto ensembleCurveSet = dynamic_cast( this->parentField()->ownerObject() ); + auto ensembleCurveSet = dynamic_cast( parentField()->ownerObject() ); if ( ensembleCurveSet ) { ensembleCurveSet->updateAllTextInPlot(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp index d583f0e6ca..26557bd1ae 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp @@ -108,7 +108,7 @@ RimSummaryMultiPlot::RimSummaryMultiPlot() : duplicatePlot( this ) { CAF_PDM_InitObject( "Multi Summary Plot", ":/SummaryPlotLight16x16.png" ); - this->setDeletable( true ); + setDeletable( true ); CAF_PDM_InitField( &m_autoPlotTitle, "AutoPlotTitle", true, "Auto Plot Title" ); CAF_PDM_InitField( &m_autoSubPlotTitle, "AutoSubPlotTitle", true, "Auto Sub Plot Title" ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryNameHelper.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryNameHelper.cpp index fd1a7ec50b..25216f661c 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryNameHelper.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryNameHelper.cpp @@ -28,7 +28,7 @@ QString RimSummaryNameHelper::aggregatedPlotTitle( const RimSummaryNameHelper& o { QString title; - auto titleCaseName = this->caseName(); + auto titleCaseName = caseName(); if ( !other.isCaseInTitle() && !titleCaseName.isEmpty() ) { if ( !title.isEmpty() ) title += ", "; @@ -36,50 +36,50 @@ QString RimSummaryNameHelper::aggregatedPlotTitle( const RimSummaryNameHelper& o title += titleCaseName; } - auto wellName = this->titleWellName(); + auto wellName = titleWellName(); if ( !other.isWellNameInTitle() && !wellName.empty() ) { if ( !title.isEmpty() ) title += ", "; title += QString::fromStdString( wellName ); } - auto groupName = this->titleGroupName(); + auto groupName = titleGroupName(); if ( !other.isGroupNameInTitle() && !groupName.empty() ) { if ( !title.isEmpty() ) title += ", "; title += QString::fromStdString( groupName ); } - auto region = this->titleRegion(); + auto region = titleRegion(); if ( !other.isRegionInTitle() && !region.empty() ) { if ( !title.isEmpty() ) title += ", "; title += "Region : " + QString::fromStdString( region ); } - auto block = this->titleBlock(); + auto block = titleBlock(); if ( !other.isBlockInTitle() && !block.empty() ) { if ( !title.isEmpty() ) title += ", "; title += "Block : " + QString::fromStdString( block ); } - auto segment = this->titleSegment(); + auto segment = titleSegment(); if ( !other.isSegmentInTitle() && !segment.empty() ) { if ( !title.isEmpty() ) title += ", "; title += "Segment : " + QString::fromStdString( segment ); } - auto completion = this->titleCompletion(); + auto completion = titleCompletion(); if ( !other.isCompletionInTitle() && !completion.empty() ) { if ( !title.isEmpty() ) title += ", "; title += "Completion : " + QString::fromStdString( completion ); } - auto vectorName = this->titleVectorName(); - if ( ( other.titleVectorName() != this->titleVectorName() ) && ( !vectorName.empty() ) ) + auto vectorName = titleVectorName(); + if ( ( other.titleVectorName() != titleVectorName() ) && ( !vectorName.empty() ) ) { if ( !title.isEmpty() ) title += ", "; title += QString::fromStdString( RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( vectorName, true ) ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp index 48e443e367..8314443f4c 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp @@ -49,7 +49,7 @@ void RimSummaryObservedDataFile::createSummaryReaderInterface() { m_summaryReader = new RifReaderObservedData; - if ( !m_summaryReader->open( this->summaryHeaderFilename(), identifierName(), summaryCategory() ) ) + if ( !m_summaryReader->open( summaryHeaderFilename(), identifierName(), summaryCategory() ) ) { m_summaryReader = nullptr; } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 303f422f65..b8367128d0 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -530,7 +530,7 @@ std::set RimSummaryPlot::summaryAndEnsembleCurveDefin { std::set allCurveDefs; - for ( const auto& curve : this->summaryAndEnsembleCurves() ) + for ( const auto& curve : summaryAndEnsembleCurves() ) { allCurveDefs.insert( RiaSummaryCurveDefinition( curve->summaryCaseY(), curve->summaryAddressY(), curve->isEnsembleCurve() ) ); } @@ -813,7 +813,7 @@ void RimSummaryPlot::applyDefaultCurveAppearances() //-------------------------------------------------------------------------------------------------- void RimSummaryPlot::applyDefaultCurveAppearances( std::vector curvesToUpdate ) { - std::set allCurveDefs = this->summaryAndEnsembleCurveDefinitions(); + std::set allCurveDefs = summaryAndEnsembleCurveDefinitions(); RimSummaryCurveAppearanceCalculator curveLookCalc( allCurveDefs ); for ( auto& curve : curvesToUpdate ) @@ -1454,7 +1454,7 @@ void RimSummaryPlot::connectCurveToPlot( RimSummaryCurve* curve, bool update, bo if ( update ) { curve->setParentPlotAndReplot( plotWidget() ); - this->updateAxes(); + updateAxes(); } else { @@ -1560,7 +1560,7 @@ void RimSummaryPlot::addGridTimeHistoryCurve( RimGridTimeHistoryCurve* curve ) if ( plotWidget() ) { curve->setParentPlotAndReplot( plotWidget() ); - this->updateAxes(); + updateAxes(); } } @@ -1661,7 +1661,7 @@ void RimSummaryPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, c->detach( true ); } - for ( auto& curveSet : this->ensembleCurveSetCollection()->curveSets() ) + for ( auto& curveSet : ensembleCurveSetCollection()->curveSets() ) { curveSet->deletePlotCurves(); } @@ -1674,7 +1674,7 @@ void RimSummaryPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, if ( changedField == &m_normalizeCurveYValues ) { - this->loadDataAndUpdate(); + loadDataAndUpdate(); } } @@ -1866,7 +1866,7 @@ void RimSummaryPlot::onLoadDataAndUpdate() plotWidget()->setLegendFontSize( legendFontSize() ); plotWidget()->updateLegend(); } - this->updateAxes(); + updateAxes(); updateStackedCurveData(); } @@ -2690,7 +2690,7 @@ RiuPlotWidget* RimSummaryPlot::doCreatePlotViewWidget( QWidget* mainWindowParent m_ensembleCurveSetCollection->setParentPlotNoReplot( plotWidget() ); } - this->connect( plotWidget(), SIGNAL( plotZoomed() ), SLOT( onPlotZoomed() ) ); + connect( plotWidget(), SIGNAL( plotZoomed() ), SLOT( onPlotZoomed() ) ); updatePlotTitle(); } @@ -2825,7 +2825,7 @@ void RimSummaryPlot::doUpdateLayout() { updateFonts(); - this->loadDataAndUpdate(); + loadDataAndUpdate(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp index 3bd2abad4f..6f0ec0f1a1 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp @@ -259,7 +259,7 @@ QString RimSummaryPlotAxisFormatter::autoAxisTitle() const sumAddress = rimCurve->summaryAddressX(); unitText = rimCurve->unitNameX(); } - else if ( rimCurve->axisY() == this->m_axisProperties->plotAxisType() ) + else if ( rimCurve->axisY() == m_axisProperties->plotAxisType() ) { sumAddress = rimCurve->summaryAddressY(); unitText = rimCurve->unitNameY(); @@ -374,7 +374,7 @@ QString RimSummaryPlotAxisFormatter::createAxisObjectName() const { sumAddress = rimCurve->summaryAddressX(); } - else if ( rimCurve->axisY() == this->m_axisProperties->plotAxisType() ) + else if ( rimCurve->axisY() == m_axisProperties->plotAxisType() ) { sumAddress = rimCurve->summaryAddressY(); } diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp index 1d8dd00f71..f316d28129 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp @@ -165,7 +165,7 @@ bool RimFileSurface::loadDataFromFile() { std::pair, std::vector> surface; - QString filePath = this->surfaceFilePath(); + QString filePath = surfaceFilePath(); if ( filePath.endsWith( "ptl", Qt::CaseInsensitive ) ) { surface = RifSurfaceImporter::readPetrelFile( filePath ); diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp index cd9b75d1e4..b950adeb7b 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp @@ -202,11 +202,11 @@ void RimSurface::fieldChangedByUi( const caf::PdmFieldHandle* changedField, cons } else if ( changedField == &m_userDescription ) { - this->updateConnectedEditors(); + updateConnectedEditors(); } else if ( changedField == &m_depthOffset ) { - this->onLoadData(); + onLoadData(); updateViews = true; } diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp index 350a5b66da..e36bcd231b 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp @@ -158,7 +158,7 @@ RimSurface* RimSurfaceCollection::importSurfacesFromFiles( const QStringList& fi } else { - this->addSurface( newSurface ); + addSurface( newSurface ); surfacesToLoad.push_back( newSurface ); ++newSurfCount; } @@ -169,7 +169,7 @@ RimSurface* RimSurfaceCollection::importSurfacesFromFiles( const QStringList& fi RiaLogging::warning( "Import Surfaces : Could not import the following files:\n" + errorMessages ); } - this->updateConnectedEditors(); + updateConnectedEditors(); updateViews( surfacesToLoad, showLegend ); @@ -194,7 +194,7 @@ void RimSurfaceCollection::reloadSurfaces( std::vector surfaces, bo surface->reloadData(); } - this->updateConnectedEditors(); + updateConnectedEditors(); updateViews( surfaces, showLegend ); } @@ -227,7 +227,7 @@ RimSurface* RimSurfaceCollection::copySurfaces( std::vector surface retsurf = surface; } - this->updateConnectedEditors(); + updateConnectedEditors(); return retsurf; } @@ -251,7 +251,7 @@ RimSurface* RimSurfaceCollection::addGridCaseSurface( RimCase* sourceCase, int o m_surfaces.push_back( s ); - this->updateConnectedEditors(); + updateConnectedEditors(); std::vector surfacesToRefresh; surfacesToRefresh.push_back( s ); @@ -477,7 +477,7 @@ RimSurface* RimSurfaceCollection::addSurfacesAtIndex( int position, std::vector< void RimSurfaceCollection::addSubCollection( RimSurfaceCollection* subcoll ) { m_subCollections.push_back( subcoll ); - this->updateConnectedEditors(); + updateConnectedEditors(); updateViews(); diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp index acc1076961..4f4c18f55c 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp @@ -184,9 +184,9 @@ void RimSurfaceInView::updateLegendRangesTextAndVisibility( RiuViewer* nativeOrO { RimRegularLegendConfig* legendConfig = m_resultDefinition->legendConfig(); - legendConfig->setTitle( QString( "Surface : \n%1\n%2" ).arg( this->name() ).arg( m_resultDefinition->propertyName() ) ); + legendConfig->setTitle( QString( "Surface : \n%1\n%2" ).arg( name() ).arg( m_resultDefinition->propertyName() ) ); - if ( this->isActive() && m_resultDefinition->isChecked() && legendConfig->showLegend() ) + if ( isActive() && m_resultDefinition->isChecked() && legendConfig->showLegend() ) { nativeOrOverrideViewer->addColorLegendToBottomLeftCorner( legendConfig->titledOverlayFrame(), isUsingOverrideViewer ); } @@ -198,7 +198,7 @@ void RimSurfaceInView::updateLegendRangesTextAndVisibility( RiuViewer* nativeOrO //-------------------------------------------------------------------------------------------------- void RimSurfaceInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); bool scheduleRedraw = false; @@ -234,7 +234,7 @@ void RimSurfaceInView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin uiOrdering.add( &m_name ); uiOrdering.add( &m_showInactiveCells ); - this->defineSeparateDataSourceUi( uiConfigName, uiOrdering ); + defineSeparateDataSourceUi( uiConfigName, uiOrdering ); } //-------------------------------------------------------------------------------------------------- @@ -259,5 +259,5 @@ caf::PdmFieldHandle* RimSurfaceInView::userDescriptionField() //-------------------------------------------------------------------------------------------------- void RimSurfaceInView::initAfterRead() { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp index 7edb35b358..247726762f 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp @@ -154,7 +154,7 @@ void RimSurfaceInViewCollection::syncCollectionsWithView() { // check if this is a collection we need to create - RimSurfaceInViewCollection* viewSurfColl = this->getCollectionInViewForCollection( surfcoll ); + RimSurfaceInViewCollection* viewSurfColl = getCollectionInViewForCollection( surfcoll ); if ( viewSurfColl == nullptr ) { RimSurfaceInViewCollection* newColl = new RimSurfaceInViewCollection(); @@ -205,7 +205,7 @@ void RimSurfaceInViewCollection::syncSurfacesWithView() for ( auto surf : surfs ) { // check if this is a surface we need to create - RimSurfaceInView* viewSurf = this->getSurfaceInViewForSurface( surf ); + RimSurfaceInView* viewSurf = getSurfaceInViewForSurface( surf ); if ( viewSurf == nullptr ) { RimSurfaceInView* newSurfInView = new RimSurfaceInView(); @@ -307,7 +307,7 @@ void RimSurfaceInViewCollection::appendPartsToModel( cvf::ModelBasicList* model, //-------------------------------------------------------------------------------------------------- void RimSurfaceInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); if ( changedField == &m_isChecked ) { @@ -321,7 +321,7 @@ void RimSurfaceInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch //-------------------------------------------------------------------------------------------------- void RimSurfaceInViewCollection::initAfterRead() { - this->updateUiIconFromToggleField(); + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -361,7 +361,7 @@ RimSurfaceInViewCollection* RimSurfaceInViewCollection::getCollectionInViewForCo //-------------------------------------------------------------------------------------------------- void RimSurfaceInViewCollection::updateCellResultColor( bool hasGeneralCellResult, int timeStepIndex ) { - if ( !this->isChecked() ) return; + if ( !isChecked() ) return; for ( RimSurfaceInViewCollection* coll : m_collectionsInView ) { @@ -407,7 +407,7 @@ void RimSurfaceInViewCollection::updateCellResultColor( bool hasGeneralCellResul //-------------------------------------------------------------------------------------------------- void RimSurfaceInViewCollection::applySingleColorEffect() { - if ( !this->isChecked() ) return; + if ( !isChecked() ) return; for ( RimSurfaceInViewCollection* coll : m_collectionsInView ) { @@ -431,7 +431,7 @@ void RimSurfaceInViewCollection::applySingleColorEffect() //-------------------------------------------------------------------------------------------------- bool RimSurfaceInViewCollection::hasAnyActiveSeparateResults() { - if ( !this->isChecked() ) return false; + if ( !isChecked() ) return false; for ( RimSurfaceInViewCollection* coll : m_collectionsInView ) { diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp index 8b1824b444..5702952170 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp @@ -81,7 +81,7 @@ Rim3dWellLogCurve::Rim3dWellLogCurve() CAF_PDM_InitField( &m_drawPlane, "DrawPlane", DrawPlaneEnum( VERTICAL_ABOVE ), "Draw Plane" ); CAF_PDM_InitField( &m_color, "CurveColor", cvf::Color3f( 0.0f, 0.0f, 0.0f ), "Curve Color" ); - this->uiCapability()->setUiTreeChildrenHidden( true ); + uiCapability()->setUiTreeChildrenHidden( true ); } //-------------------------------------------------------------------------------------------------- @@ -164,7 +164,7 @@ std::pair Rim3dWellLogCurve::findCurveValueRange() std::vector values; std::vector measuredDepths; - this->curveValuesAndMds( &values, &measuredDepths ); + curveValuesAndMds( &values, &measuredDepths ); for ( double value : values ) { @@ -244,7 +244,7 @@ void Rim3dWellLogCurve::defineEditorAttribute( const caf::PdmFieldHandle* field, { if ( m_minCurveDataValue == -std::numeric_limits::infinity() && m_maxCurveDataValue == std::numeric_limits::infinity() ) { - this->resetMinMaxValues(); + resetMinMaxValues(); } } @@ -253,7 +253,7 @@ void Rim3dWellLogCurve::defineEditorAttribute( const caf::PdmFieldHandle* field, //-------------------------------------------------------------------------------------------------- void Rim3dWellLogCurve::initAfterRead() { - this->createAutoName(); + createAutoName(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp index 926c139adb..76e70964e4 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp @@ -170,7 +170,7 @@ void Rim3dWellLogExtractionCurve::curveValuesAndMds( std::vector* values { CVF_ASSERT( m_timeStep() >= 0 ); - return this->curveValuesAndMdsAtTimeStep( values, measuredDepthValues, m_timeStep ); + return curveValuesAndMdsAtTimeStep( values, measuredDepthValues, m_timeStep ); } //-------------------------------------------------------------------------------------------------- @@ -259,7 +259,7 @@ std::pair Rim3dWellLogExtractionCurve::findCurveValueRange() { std::vector values; std::vector measuredDepths; - this->curveValuesAndMdsAtTimeStep( &values, &measuredDepths, timeStep ); + curveValuesAndMdsAtTimeStep( &values, &measuredDepths, timeStep ); for ( double value : values ) { @@ -435,13 +435,13 @@ void Rim3dWellLogExtractionCurve::fieldChangedByUi( const caf::PdmFieldHandle* c m_geomResultDefinition->setGeoMechCase( geoMechCase ); } - this->resetMinMaxValues(); - this->updateConnectedEditors(); + resetMinMaxValues(); + updateConnectedEditors(); } else if ( ( changedField == &m_timeStep ) || ( changedField == &m_geomPartId ) ) { - this->resetMinMaxValues(); - this->updateConnectedEditors(); + resetMinMaxValues(); + updateConnectedEditors(); } Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp index 1adfbe1fae..4ef819feef 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp @@ -181,8 +181,8 @@ void Rim3dWellLogFileCurve::fieldChangedByUi( const caf::PdmFieldHandle* changed { if ( changedField == &m_wellLogFile || changedField == &m_wellLogChannelName ) { - this->resetMinMaxValues(); - this->updateConnectedEditors(); + resetMinMaxValues(); + updateConnectedEditors(); } Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp index 031a3f5778..e40d151324 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp @@ -148,8 +148,8 @@ void Rim3dWellLogRftCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedF { if ( changedField == &m_wellLogChannelName || changedField == &m_timeStep ) { - this->resetMinMaxValues(); - this->updateConnectedEditors(); + resetMinMaxValues(); + updateConnectedEditors(); } Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp index df23145ccb..39d8646059 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp @@ -513,10 +513,10 @@ void RimEnsembleWellLogCurveSet::defineUiTreeOrdering( caf::PdmUiTreeOrdering& u { uiTreeOrdering.skipRemainingChildren( true ); - caf::IconProvider iconProvider = this->uiIconProvider(); + caf::IconProvider iconProvider = uiIconProvider(); if ( !iconProvider.valid() ) return; - this->setUiIcon( iconProvider ); + setUiIcon( iconProvider ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp index 280b012cbd..951a89a0a8 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp @@ -150,7 +150,7 @@ void RimEnsembleWellLogStatisticsCurve::performDataExtraction( bool* isUsingPseu } bool useLogarithmicScale = false; - this->setPropertyValuesAndDepths( values, validDepths, rkbDiff, depthUnit, false, useLogarithmicScale ); + setPropertyValuesAndDepths( values, validDepths, rkbDiff, depthUnit, false, useLogarithmicScale ); } } } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimRftTopologyCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimRftTopologyCurve.cpp index 3d67b4baf4..771eefbf2d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimRftTopologyCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimRftTopologyCurve.cpp @@ -269,7 +269,7 @@ void RimRftTopologyCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedFi { RimWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } //-------------------------------------------------------------------------------------------------- @@ -277,7 +277,7 @@ void RimRftTopologyCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedFi //-------------------------------------------------------------------------------------------------- void RimRftTopologyCurve::onLoadDataAndUpdate( bool updateParentPlot ) { - this->RimPlotCurve::updateCurvePresentation( updateParentPlot ); + RimPlotCurve::updateCurvePresentation( updateParentPlot ); if ( m_summaryCase ) { diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp index b925a18ba0..11de54e9c9 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp @@ -162,19 +162,11 @@ void RimWellLogCurve::setPropertyAndDepthsAndErrors( const std::vector& if ( isVerticalCurve() ) { - this->setSamplesFromXYErrorValues( propertyValues, - depthValues, - errorValues, - useLogarithmicScale, - RiaCurveDataTools::ErrorAxis::ERROR_ALONG_X_AXIS ); + setSamplesFromXYErrorValues( propertyValues, depthValues, errorValues, useLogarithmicScale, RiaCurveDataTools::ErrorAxis::ERROR_ALONG_X_AXIS ); } else { - this->setSamplesFromXYErrorValues( depthValues, - propertyValues, - errorValues, - useLogarithmicScale, - RiaCurveDataTools::ErrorAxis::ERROR_ALONG_Y_AXIS ); + setSamplesFromXYErrorValues( depthValues, propertyValues, errorValues, useLogarithmicScale, RiaCurveDataTools::ErrorAxis::ERROR_ALONG_Y_AXIS ); } } @@ -292,7 +284,7 @@ void RimWellLogCurve::setOverrideCurveData( const std::vector& const RiaCurveDataTools::CurveIntervals& curveIntervals ) { auto minmax_it = std::minmax_element( propertyValues.begin(), propertyValues.end() ); - this->setOverrideCurveDataPropertyValueRange( *( minmax_it.first ), *( minmax_it.second ) ); + setOverrideCurveDataPropertyValueRange( *( minmax_it.first ), *( minmax_it.second ) ); if ( m_plotCurve ) { diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp index 44719de72e..cedb8c041b 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp @@ -502,7 +502,7 @@ void RimWellLogCurveCommonDataSource::analyseCurvesAndTracks() std::vector curves = parentPlot->descendantsIncludingThisOfType(); std::vector tracks = parentPlot->descendantsIncludingThisOfType(); - this->analyseCurvesAndTracks( curves, tracks ); + analyseCurvesAndTracks( curves, tracks ); } } @@ -705,7 +705,7 @@ void RimWellLogCurveCommonDataSource::applyDataSourceChanges() auto curves = parentPlot->descendantsIncludingThisOfType(); auto tracks = parentPlot->descendantsIncludingThisOfType(); - this->applyDataSourceChanges( curves, tracks ); + applyDataSourceChanges( curves, tracks ); // plot->loadDataAndUpdate() has been called in applyDataSourceChanges(), and this is required before the visibility of tracks and // curves can be updated. However, if the visibility of curves changes, another loadDataAndUpdate() is required to calculate zoom @@ -845,7 +845,7 @@ void RimWellLogCurveCommonDataSource::fieldChangedByUi( const caf::PdmFieldHandl m_wbsSmoothing.v() = caf::Tristate::State::True; } - this->applyDataSourceChanges(); + applyDataSourceChanges(); if ( changedField == &m_rftWellName ) { @@ -862,7 +862,7 @@ QList RimWellLogCurveCommonDataSource::calculateValueOpt { QList options; - this->analyseCurvesAndTracks(); + analyseCurvesAndTracks(); if ( fieldNeedingOptions == &m_case ) { diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp index dcf5b93fee..a9cb27cf3f 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp @@ -305,29 +305,29 @@ void RimWellLogExtractionCurve::fieldChangedByUi( const caf::PdmFieldHandle* cha clearGeneratedSimWellPaths(); - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } else if ( changedField == &m_wellPath ) { if ( m_wellPath() == m_refWellPath() ) m_refWellPath = nullptr; - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } else if ( ( changedField == &m_refWellPath ) || ( changedField == &m_timeStep ) || ( changedField == &m_trajectoryType ) || ( changedField == &m_geomPartId ) ) { - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } else if ( ( changedField == &m_branchDetection ) || ( changedField == &m_branchIndex ) || ( changedField == &m_simWellName ) ) { clearGeneratedSimWellPaths(); - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } if ( changedField == &m_addCaseNameToCurveName || changedField == &m_addPropertyToCurveName || changedField == &m_addWellNameToCurveName || changedField == &m_addTimestepToCurveName || changedField == &m_addDateToCurveName ) { - this->uiCapability()->updateConnectedEditors(); + uiCapability()->updateConnectedEditors(); updateCurveNameAndUpdatePlotLegendAndTitle(); } } @@ -376,7 +376,7 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate( bool updateParentPlot ) m_plotCurve->setLineSegmentStartStopIndices( curveData()->polylineStartStopIndices() ); - this->RimPlotCurve::updateCurvePresentation( updateParentPlot ); + RimPlotCurve::updateCurvePresentation( updateParentPlot ); if ( isUsingPseudoLength ) { @@ -475,25 +475,25 @@ void RimWellLogExtractionCurve::extractData( bool* isUsin if ( curveData.tvDepthValues.empty() ) { - this->setPropertyValuesAndDepths( curveData.values, - curveData.measuredDepthValues, - RiaDefines::DepthTypeEnum::MEASURED_DEPTH, - 0.0, - curveData.depthUnit, - !performDataSmoothing, - useLogarithmicScale, - curveData.xUnits ); + setPropertyValuesAndDepths( curveData.values, + curveData.measuredDepthValues, + RiaDefines::DepthTypeEnum::MEASURED_DEPTH, + 0.0, + curveData.depthUnit, + !performDataSmoothing, + useLogarithmicScale, + curveData.xUnits ); } else { - this->setPropertyValuesWithMdAndTVD( curveData.values, - curveData.measuredDepthValues, - curveData.tvDepthValues, - curveData.rkbDiff, - curveData.depthUnit, - !performDataSmoothing, - useLogarithmicScale, - curveData.xUnits ); + setPropertyValuesWithMdAndTVD( curveData.values, + curveData.measuredDepthValues, + curveData.tvDepthValues, + curveData.rkbDiff, + curveData.depthUnit, + !performDataSmoothing, + useLogarithmicScale, + curveData.xUnits ); } } else @@ -1015,7 +1015,7 @@ QList RimWellLogExtractionCurve::calculateValueOptions( } else if ( fieldNeedingOptions == &m_simWellName ) { - std::set sortedWellNames = this->sortedSimWellNames(); + std::set sortedWellNames = sortedSimWellNames(); caf::IconProvider simWellIcon( ":/Well.svg" ); for ( const QString& wname : sortedWellNames ) diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp index 003a2d80ee..1b3d5a0a1b 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp @@ -76,7 +76,7 @@ RimWellLogFileCurve::~RimWellLogFileCurve() //-------------------------------------------------------------------------------------------------- void RimWellLogFileCurve::onLoadDataAndUpdate( bool updateParentPlot ) { - this->RimPlotCurve::updateCurvePresentation( updateParentPlot ); + RimPlotCurve::updateCurvePresentation( updateParentPlot ); if ( isChecked() ) { @@ -155,10 +155,10 @@ void RimWellLogFileCurve::onLoadDataAndUpdate( bool updateParentPlot ) useLogarithmicScale = track->isLogarithmicScale(); } - this->setPropertyValuesAndDepths( values, validDepths, rkbDiff, wellLogFile->depthUnit(), false, useLogarithmicScale ); + setPropertyValuesAndDepths( values, validDepths, rkbDiff, wellLogFile->depthUnit(), false, useLogarithmicScale ); QString errMsg; - if ( wellLogPlot && !this->curveData()->availableDepthTypes().count( wellLogPlot->depthType() ) ) + if ( wellLogPlot && !curveData()->availableDepthTypes().count( wellLogPlot->depthType() ) ) { QString depthTitle = wellLogPlot->depthAxisTitle(); errMsg = QString( "Display of %1 for LAS curves is not possible without %2 " @@ -188,13 +188,13 @@ void RimWellLogFileCurve::onLoadDataAndUpdate( bool updateParentPlot ) } RiaDefines::DepthTypeEnum depthType = RiaDefines::DepthTypeEnum::MEASURED_DEPTH; - if ( wellLogPlot && this->curveData()->availableDepthTypes().count( wellLogPlot->depthType() ) ) + if ( wellLogPlot && curveData()->availableDepthTypes().count( wellLogPlot->depthType() ) ) { depthType = wellLogPlot->depthType(); } - setPropertyAndDepthValuesToPlotCurve( this->curveData()->propertyValuesByIntervals(), - this->curveData()->depthValuesByIntervals( depthType, displayUnit ) ); + setPropertyAndDepthValuesToPlotCurve( curveData()->propertyValuesByIntervals(), + curveData()->depthValuesByIntervals( depthType, displayUnit ) ); if ( updateParentPlot ) { @@ -308,15 +308,15 @@ void RimWellLogFileCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedFi if ( changedField == &m_wellPath ) { - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } else if ( changedField == &m_wellLogChannelName ) { - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } else if ( changedField == &m_wellLogFile ) { - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } if ( m_parentPlot ) m_parentPlot->replot(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp index 18bff4a3e0..6fcccbd1d6 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp @@ -647,7 +647,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) assignColorFromResultName( m_segmentResultName ); } - this->RimPlotCurve::updateCurvePresentation( updateParentPlot ); + RimPlotCurve::updateCurvePresentation( updateParentPlot ); DerivedMDSource derivedMDSource = DerivedMDSource::NO_SOURCE; @@ -677,7 +677,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) if ( !anyValidValuesPresent( values ) || ( values.size() != tvDepthVector.size() ) ) { clearCurveData(); - this->detach( true ); + detach( true ); return; } @@ -744,13 +744,13 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) } bool useLogarithmicScale = false; - this->setPropertyValuesWithMdAndTVD( values, - measuredDepthVector, - tvDepthVector, - rkbDiff, - RiaDefines::fromEclipseUnit( unitSystem ), - false, - useLogarithmicScale ); + setPropertyValuesWithMdAndTVD( values, + measuredDepthVector, + tvDepthVector, + rkbDiff, + RiaDefines::fromEclipseUnit( unitSystem ), + false, + useLogarithmicScale ); RiaDefines::DepthUnitType displayUnit = RiaDefines::DepthUnitType::UNIT_METER; if ( wellLogPlot ) @@ -764,8 +764,8 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) { m_plotCurve->setPerPointLabels( perPointLabels ); - auto propertyValues = this->curveData()->propertyValuesByIntervals(); - auto depthValues = this->curveData()->depthValuesByIntervals( RiaDefines::DepthTypeEnum::MEASURED_DEPTH, displayUnit ); + auto propertyValues = curveData()->propertyValuesByIntervals(); + auto depthValues = curveData()->depthValuesByIntervals( RiaDefines::DepthTypeEnum::MEASURED_DEPTH, displayUnit ); if ( !errors.empty() ) { @@ -776,7 +776,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) setPropertyAndDepthValuesToPlotCurve( propertyValues, depthValues ); } - m_plotCurve->setLineSegmentStartStopIndices( this->curveData()->polylineStartStopIndices() ); + m_plotCurve->setLineSegmentStartStopIndices( curveData()->polylineStartStopIndices() ); auto wellLogTrack = firstAncestorOrThisOfTypeAsserted(); @@ -808,8 +808,8 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) { m_plotCurve->setPerPointLabels( perPointLabels ); - auto propertyValues = this->curveData()->propertyValuesByIntervals(); - auto depthValues = this->curveData()->depthValuesByIntervals( RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH, displayUnit ); + auto propertyValues = curveData()->propertyValuesByIntervals(); + auto depthValues = curveData()->depthValuesByIntervals( RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH, displayUnit ); bool useLogarithmicScale = false; if ( !errors.empty() ) @@ -829,7 +829,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) } } - m_plotCurve->setLineSegmentStartStopIndices( this->curveData()->polylineStartStopIndices() ); + m_plotCurve->setLineSegmentStartStopIndices( curveData()->polylineStartStopIndices() ); } if ( updateParentPlot ) @@ -1006,7 +1006,7 @@ void RimWellLogRftCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedFie } } - if ( loadData ) this->loadDataAndUpdate( true ); + if ( loadData ) loadDataAndUpdate( true ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp index 64a6dd2dd2..3d05bab15b 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp @@ -935,7 +935,7 @@ void RimWellLogTrack::updateLegend() //-------------------------------------------------------------------------------------------------- QString RimWellLogTrack::asciiDataForPlotExport() const { - QString out = "\n" + this->description() + "\n"; + QString out = "\n" + description() + "\n"; std::vector curveNames; std::vector curveDepths; @@ -1433,16 +1433,16 @@ void RimWellLogTrack::onLoadDataAndUpdate() if ( m_plotWidget ) { - this->updateWellPathAttributesCollection(); - this->updateWellPathAttributesOnPlot(); + updateWellPathAttributesCollection(); + updateWellPathAttributesOnPlot(); m_plotWidget->updateLegend(); - this->updateAxisScaleEngine(); - this->updateRegionAnnotationsOnPlot(); - this->updatePropertyValueZoom(); + updateAxisScaleEngine(); + updateRegionAnnotationsOnPlot(); + updatePropertyValueZoom(); } - this->updatePropertyValueAxisAndGridTickIntervals(); + updatePropertyValueAxisAndGridTickIntervals(); m_majorTickIntervalPropertyAxis.uiCapability()->setUiHidden( !m_explicitTickIntervalsPropertyValueAxis() ); m_minorTickIntervalPropertyAxis.uiCapability()->setUiHidden( !m_explicitTickIntervalsPropertyValueAxis() ); @@ -1767,7 +1767,7 @@ void RimWellLogTrack::updateParentPlotZoom() //-------------------------------------------------------------------------------------------------- void RimWellLogTrack::updateEditors() { - this->updateConnectedEditors(); + updateConnectedEditors(); RimPlotWindow* plotWindow = firstAncestorOrThisOfTypeAsserted(); plotWindow->updateConnectedEditors(); } @@ -1777,7 +1777,7 @@ void RimWellLogTrack::updateEditors() //-------------------------------------------------------------------------------------------------- void RimWellLogTrack::setVisiblePropertyValueRange( double minValue, double maxValue ) { - this->setAutoScalePropertyValuesEnabled( false ); + setAutoScalePropertyValuesEnabled( false ); m_visiblePropertyValueRangeMin = minValue; m_visiblePropertyValueRangeMax = maxValue; } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp index 63654c905c..1c278fc141 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp @@ -101,6 +101,6 @@ void RimWellLogWbsCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedFie if ( changedField == &m_smoothCurve || changedField == &m_smoothingThreshold || changedField == &m_maximumCurvePointInterval ) { - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } } diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp index e4e80122fc..eafb20925b 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp @@ -69,7 +69,7 @@ void RimWellMeasurementCollection::updateAllCurves() curve->loadDataAndUpdate( true ); } - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- @@ -129,7 +129,7 @@ void RimWellMeasurementCollection::insertMeasurement( RimWellMeasurement* insert m_measurements.push_back( measurement ); addFilePath( measurement->filePath() ); - this->updateAllCurves(); + updateAllCurves(); } //-------------------------------------------------------------------------------------------------- @@ -139,7 +139,7 @@ void RimWellMeasurementCollection::appendMeasurement( RimWellMeasurement* measur { m_measurements.push_back( measurement ); addFilePath( measurement->filePath() ); - this->updateAllCurves(); + updateAllCurves(); } //-------------------------------------------------------------------------------------------------- @@ -150,7 +150,7 @@ void RimWellMeasurementCollection::deleteMeasurement( RimWellMeasurement* measur m_measurements.removeChild( measurementToDelete ); delete measurementToDelete; - this->updateAllCurves(); + updateAllCurves(); } //-------------------------------------------------------------------------------------------------- @@ -159,7 +159,7 @@ void RimWellMeasurementCollection::deleteMeasurement( RimWellMeasurement* measur void RimWellMeasurementCollection::deleteAllMeasurements() { m_measurements.deleteChildren(); - this->updateAllCurves(); + updateAllCurves(); } //-------------------------------------------------------------------------------------------------- @@ -262,5 +262,5 @@ void RimWellMeasurementCollection::removeMeasurementsForFilePath( RimWellMeasure } RimProject::current()->scheduleCreateDisplayModelAndRedrawAllViews(); - this->updateAllCurves(); + updateAllCurves(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCurve.cpp index 60c357d99f..299f1530b9 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCurve.cpp @@ -113,24 +113,24 @@ void RimWellMeasurementCurve::onLoadDataAndUpdate( bool updateParentPlot ) } bool useLogarithmicScale = false; - this->setPropertyValuesWithMdAndTVD( values, - measuredDepthValues, - trueVerticalDepthValues, - m_wellPath->wellPathGeometry()->rkbDiff(), - RiaDefines::DepthUnitType::UNIT_METER, - false, - useLogarithmicScale ); + setPropertyValuesWithMdAndTVD( values, + measuredDepthValues, + trueVerticalDepthValues, + m_wellPath->wellPathGeometry()->rkbDiff(), + RiaDefines::DepthUnitType::UNIT_METER, + false, + useLogarithmicScale ); } else { bool useLogarithmicScale = false; - this->setPropertyValuesAndDepths( values, - measuredDepthValues, - RiaDefines::DepthTypeEnum::MEASURED_DEPTH, - 0.0, - RiaDefines::DepthUnitType::UNIT_METER, - false, - useLogarithmicScale ); + setPropertyValuesAndDepths( values, + measuredDepthValues, + RiaDefines::DepthTypeEnum::MEASURED_DEPTH, + 0.0, + RiaDefines::DepthUnitType::UNIT_METER, + false, + useLogarithmicScale ); } } @@ -151,7 +151,7 @@ void RimWellMeasurementCurve::onLoadDataAndUpdate( bool updateParentPlot ) } RiaDefines::DepthTypeEnum depthType = RiaDefines::DepthTypeEnum::MEASURED_DEPTH; - if ( wellLogPlot && this->curveData()->availableDepthTypes().count( wellLogPlot->depthType() ) ) + if ( wellLogPlot && curveData()->availableDepthTypes().count( wellLogPlot->depthType() ) ) { depthType = wellLogPlot->depthType(); } @@ -159,14 +159,14 @@ void RimWellMeasurementCurve::onLoadDataAndUpdate( bool updateParentPlot ) if ( m_plotCurve ) { bool useLogarithmicScale = false; - m_plotCurve->setSamplesFromXValuesAndYValues( this->curveData()->propertyValuesByIntervals(), - this->curveData()->depthValuesByIntervals( depthType, displayUnit ), + m_plotCurve->setSamplesFromXValuesAndYValues( curveData()->propertyValuesByIntervals(), + curveData()->depthValuesByIntervals( depthType, displayUnit ), useLogarithmicScale ); - m_plotCurve->setLineSegmentStartStopIndices( this->curveData()->polylineStartStopIndices() ); + m_plotCurve->setLineSegmentStartStopIndices( curveData()->polylineStartStopIndices() ); } } - this->RimPlotCurve::updateCurvePresentation( updateParentPlot ); + RimPlotCurve::updateCurvePresentation( updateParentPlot ); if ( updateParentPlot ) { @@ -204,7 +204,7 @@ void RimWellMeasurementCurve::fieldChangedByUi( const caf::PdmFieldHandle* chang if ( changedField == &m_wellPath || changedField == &m_measurementKind ) { - this->loadDataAndUpdate( true ); + loadDataAndUpdate( true ); } if ( m_parentPlot ) m_parentPlot->replot(); diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInView.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInView.cpp index 1df9fa54a7..335eaee716 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInView.cpp @@ -84,7 +84,7 @@ RimWellMeasurementInView::RimWellMeasurementInView() CAF_PDM_InitField( &m_radiusScaleFactor, "RadiusScaleFactor", 2.5, "Radius Scale" ); m_radiusScaleFactor.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - this->setName( "Well Measurement" ); + setName( "Well Measurement" ); m_minimumResultValue = cvf::UNDEFINED_DOUBLE; m_maximumResultValue = cvf::UNDEFINED_DOUBLE; diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInViewCollection.cpp index 67d130198d..99f7cf8be3 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInViewCollection.cpp @@ -53,7 +53,7 @@ RimWellMeasurementInViewCollection::RimWellMeasurementInViewCollection() m_isChecked = false; - this->setName( "Well Measurements" ); + setName( "Well Measurements" ); CAF_PDM_InitField( &m_linkWellVisibility, "linkWellVisibility", true, "Link Visibility to Well Path Visibility" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_linkWellVisibility ); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp index d5ee14438e..1fefa61819 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp @@ -144,11 +144,11 @@ void RimFileWellPath::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering //-------------------------------------------------------------------------------------------------- bool RimFileWellPath::readWellPathFile( QString* errorMessage, RifWellPathImporter* wellPathImporter, bool setWellNameForExport ) { - if ( caf::Utils::fileExists( this->filePath() ) ) + if ( caf::Utils::fileExists( filePath() ) ) { - RifWellPathImporter::WellData wellData = wellPathImporter->readWellData( this->filePath(), m_wellPathIndexInFile() ); + RifWellPathImporter::WellData wellData = wellPathImporter->readWellData( filePath(), m_wellPathIndexInFile() ); - RifWellPathImporter::WellMetaData wellMetaData = RifWellPathImporter::readWellMetaData( this->filePath(), m_wellPathIndexInFile() ); + RifWellPathImporter::WellMetaData wellMetaData = RifWellPathImporter::readWellMetaData( filePath(), m_wellPathIndexInFile() ); // General well info if ( setWellNameForExport ) @@ -188,7 +188,7 @@ bool RimFileWellPath::readWellPathFile( QString* errorMessage, RifWellPathImport } else { - if ( errorMessage ) ( *errorMessage ) = "Could not find the well path file: " + this->filePath(); + if ( errorMessage ) ( *errorMessage ) = "Could not find the well path file: " + filePath(); return false; } } @@ -308,9 +308,9 @@ void RimFileWellPath::ensureWellPathStartAtSeaLevel( RigWellPath* wellPath ) { mdAtSeaLevel = wellPath->datumElevation(); } - else if ( this->airGap() != std::numeric_limits::infinity() && this->airGap() > 0.0 ) + else if ( airGap() != std::numeric_limits::infinity() && airGap() > 0.0 ) { - mdAtSeaLevel = this->airGap(); + mdAtSeaLevel = airGap(); } std::vector newMeasuredDepths = { mdAtSeaLevel }; diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimModeledWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimModeledWellPath.cpp index ca6d3c471d..6666505159 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimModeledWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimModeledWellPath.cpp @@ -72,7 +72,7 @@ RimModeledWellPath::~RimModeledWellPath() //-------------------------------------------------------------------------------------------------- void RimModeledWellPath::createWellPathGeometry() { - this->setWellPathGeometry( m_geometryDefinition->createWellPathGeometry().p() ); + setWellPathGeometry( m_geometryDefinition->createWellPathGeometry().p() ); } //-------------------------------------------------------------------------------------------------- @@ -295,7 +295,7 @@ void RimModeledWellPath::updateReferencePoint() RimWellPathTieIn* tieIn = wellPathTieIn(); if ( !tieIn ) return; - auto topLevelModelledWell = dynamic_cast( this->topLevelWellPath() ); + auto topLevelModelledWell = dynamic_cast( topLevelWellPath() ); if ( !topLevelModelledWell ) return; auto refPoint = topLevelModelledWell->geometryDefinition()->anchorPointXyz(); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp index 45174e7f3d..efe469c14c 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp @@ -94,7 +94,7 @@ RimWellIASettings::RimWellIASettings() CAF_PDM_InitField( &m_boxValid, "boxValid", false, "Model box is valid" ); m_boxValid.uiCapability()->setUiHidden( true ); - this->setDeletable( true ); + setDeletable( true ); } //-------------------------------------------------------------------------------------------------- @@ -145,7 +145,7 @@ void RimWellIASettings::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel updateVisualization(); } - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp index 663cc67cd3..0edd1e4b06 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp @@ -152,7 +152,7 @@ RimWellPath::RimWellPath() CAF_PDM_InitFieldNoDefault( &m_wellIASettingsCollection, "WellIASettings", "Integrity Analysis Settings" ); m_wellIASettingsCollection = new RimWellIASettingsCollection(); - this->setDeletable( true ); + setDeletable( true ); } //-------------------------------------------------------------------------------------------------- @@ -826,7 +826,7 @@ double RimWellPath::combinedScaleFactor() const { RimWellPathCollection* wellPathColl = firstAncestorOrThisOfTypeAsserted(); - return this->m_wellPathRadiusScaleFactor() * wellPathColl->wellPathRadiusScaleFactor(); + return m_wellPathRadiusScaleFactor() * wellPathColl->wellPathRadiusScaleFactor(); } //-------------------------------------------------------------------------------------------------- @@ -1169,7 +1169,7 @@ std::vector RimWellPath::allWellPathLaterals() const { std::vector laterals; - this->wellPathLateralsRecursively( laterals ); + wellPathLateralsRecursively( laterals ); return laterals; } diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp index 18540663cd..42764a5cd3 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp @@ -38,7 +38,7 @@ RimWellPathAttributeCollection::RimWellPathAttributeCollection() m_attributes.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_attributes.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_attributes.uiCapability()->setCustomContextMenuEnabled( true ); - this->setName( "Casing Design" ); + setName( "Casing Design" ); } //-------------------------------------------------------------------------------------------------- @@ -58,7 +58,7 @@ void RimWellPathAttributeCollection::updateAllReferringTracks() { track->loadDataAndUpdate(); } - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- @@ -86,7 +86,7 @@ void RimWellPathAttributeCollection::insertAttribute( RimWellPathAttribute* inse else m_attributes.push_back( attribute ); - this->updateAllReferringTracks(); + updateAllReferringTracks(); } //-------------------------------------------------------------------------------------------------- @@ -97,7 +97,7 @@ void RimWellPathAttributeCollection::deleteAttribute( RimWellPathAttribute* attr m_attributes.removeChild( attributeToDelete ); delete attributeToDelete; - this->updateAllReferringTracks(); + updateAllReferringTracks(); } //-------------------------------------------------------------------------------------------------- @@ -106,7 +106,7 @@ void RimWellPathAttributeCollection::deleteAttribute( RimWellPathAttribute* attr void RimWellPathAttributeCollection::deleteAllAttributes() { m_attributes.deleteChildren(); - this->updateAllReferringTracks(); + updateAllReferringTracks(); } //-------------------------------------------------------------------------------------------------- @@ -163,10 +163,10 @@ void RimWellPathAttributeCollection::defineUiTreeOrdering( caf::PdmUiTreeOrderin //-------------------------------------------------------------------------------------------------- void RimWellPathAttributeCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - if ( changedField == this->objectToggleField() ) + if ( changedField == objectToggleField() ) { RimProject* proj = RimProject::current(); proj->scheduleCreateDisplayModelAndRedrawAllViews(); - this->updateAllReferringTracks(); + updateAllReferringTracks(); } } diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp index 3aa03301f0..6e6d400753 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp @@ -195,7 +195,7 @@ void RimWellPathCollection::loadDataAndUpdate() rebuildWellPathNodes(); - this->sortWellsByName(); + sortWellsByName(); } //-------------------------------------------------------------------------------------------------- @@ -380,7 +380,7 @@ std::vector RimWellPathCollection::addWellLogs( const QStringLi } } - this->sortWellsByName(); + sortWellsByName(); updateAllRequiredEditors(); return logFileInfos; @@ -432,7 +432,7 @@ void RimWellPathCollection::addWellPathFormations( const QStringList& filePaths RiaLogging::errorInMessageBox( Riu3DMainWindowTools::mainWindowWidget(), "Well Picks Import", outputMessage ); } - this->sortWellsByName(); + sortWellsByName(); updateAllRequiredEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp index c90d213d01..43473d8b9f 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp @@ -63,7 +63,7 @@ RimWellPathGeometryDef::RimWellPathGeometryDef() "WellPathGeometry", "Class containing the geometry of a modeled Well Path" ); - this->setUi3dEditorTypeName( RicWellPathGeometry3dEditor::uiEditorTypeName() ); + setUi3dEditorTypeName( RicWellPathGeometry3dEditor::uiEditorTypeName() ); CAF_PDM_InitScriptableFieldWithScriptKeyword( &m_referencePointUtmXyd, "ReferencePosUtmXyd", "ReferencePoint", @@ -477,7 +477,7 @@ const RimWellPathTarget* RimWellPathGeometryDef::lastActiveTarget() const void RimWellPathGeometryDef::enableTargetPointPicking( bool isEnabling ) { m_pickPointsEnabled = isEnabling; - this->updateConnectedEditors(); + updateConnectedEditors(); } //-------------------------------------------------------------------------------------------------- @@ -505,7 +505,7 @@ void RimWellPathGeometryDef::fieldChangedByUi( const caf::PdmFieldHandle* change { if ( changedField == &m_pickPointsEnabled ) { - this->updateConnectedEditors(); + updateConnectedEditors(); } else if ( changedField == &m_referencePointUtmXyd ) { diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp index 4ac01f8b5c..af8ca3c618 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp @@ -76,7 +76,7 @@ void RimWellPathGroup::addChildWellPath( RimWellPath* wellPath ) RimWellPath::copyCompletionSettings( wellPath, this ); } - if ( !this->wellPathGeometry()->wellPathPoints().empty() ) + if ( !wellPathGeometry()->wellPathPoints().empty() ) { m_childWellPaths.push_back( wellPath ); createWellPathGeometry(); @@ -360,7 +360,7 @@ void RimWellPathGroup::makeMoreLevelsIfNecessary() { if ( m_childWellPaths.size() <= 1u ) return; - auto wellPathPoints = this->wellPathGeometry()->wellPathPoints(); + auto wellPathPoints = wellPathGeometry()->wellPathPoints(); auto comp = []( const cvf::Vec3d& lhs, const cvf::Vec3d& rhs ) { diff --git a/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp b/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp index e5dba87b2b..42328d5767 100644 --- a/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp +++ b/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp @@ -134,7 +134,7 @@ QString cafNamedTreeNode::name() const //-------------------------------------------------------------------------------------------------- void cafNamedTreeNode::setIcon( const QString& iconResourceName ) { - this->setUiIconFromResourceString( iconResourceName ); + setUiIconFromResourceString( iconResourceName ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigCombMultResultAccessor.cpp b/ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigCombMultResultAccessor.cpp index b6861af335..2cdb7c98da 100644 --- a/ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigCombMultResultAccessor.cpp +++ b/ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigCombMultResultAccessor.cpp @@ -169,5 +169,5 @@ double RigCombMultResultAccessor::cellScalarGlobIdx( size_t globCellIndex ) cons double RigCombMultResultAccessor::cellFaceScalarGlobIdx( size_t globCellIndex, cvf::StructGridInterface::FaceType faceId ) const { size_t gridLocalCellIndex = m_grid->mainGrid()->cell( globCellIndex ).gridLocalCellIndex(); - return this->cellFaceScalar( gridLocalCellIndex, faceId ); + return cellFaceScalar( gridLocalCellIndex, faceId ); } diff --git a/ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigCombTransResultAccessor.cpp b/ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigCombTransResultAccessor.cpp index 6f528c1c49..1dcf34ac74 100644 --- a/ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigCombTransResultAccessor.cpp +++ b/ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigCombTransResultAccessor.cpp @@ -105,7 +105,7 @@ double RigCombTransResultAccessor::cellFaceScalar( size_t gridLocalCellIndex, cv break; case cvf::StructGridInterface::NEG_I: { - return this->neighborCellTran( gridLocalCellIndex, cvf::StructGridInterface::NEG_I, m_xTransAccessor.p() ); + return neighborCellTran( gridLocalCellIndex, cvf::StructGridInterface::NEG_I, m_xTransAccessor.p() ); } break; case cvf::StructGridInterface::POS_J: @@ -118,7 +118,7 @@ double RigCombTransResultAccessor::cellFaceScalar( size_t gridLocalCellIndex, cv break; case cvf::StructGridInterface::NEG_J: { - return this->neighborCellTran( gridLocalCellIndex, cvf::StructGridInterface::NEG_J, m_yTransAccessor.p() ); + return neighborCellTran( gridLocalCellIndex, cvf::StructGridInterface::NEG_J, m_yTransAccessor.p() ); } break; case cvf::StructGridInterface::POS_K: @@ -131,7 +131,7 @@ double RigCombTransResultAccessor::cellFaceScalar( size_t gridLocalCellIndex, cv break; case cvf::StructGridInterface::NEG_K: { - return this->neighborCellTran( gridLocalCellIndex, cvf::StructGridInterface::NEG_K, m_zTransAccessor.p() ); + return neighborCellTran( gridLocalCellIndex, cvf::StructGridInterface::NEG_K, m_zTransAccessor.p() ); } break; default: @@ -157,5 +157,5 @@ double RigCombTransResultAccessor::cellScalarGlobIdx( size_t globCellIndex ) con double RigCombTransResultAccessor::cellFaceScalarGlobIdx( size_t globCellIndex, cvf::StructGridInterface::FaceType faceId ) const { size_t gridLocalCellIndex = m_grid->mainGrid()->cell( globCellIndex ).gridLocalCellIndex(); - return this->cellFaceScalar( gridLocalCellIndex, faceId ); + return cellFaceScalar( gridLocalCellIndex, faceId ); } diff --git a/ApplicationLibCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp b/ApplicationLibCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp index 70d7bcd8fb..59704dae54 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp @@ -289,7 +289,7 @@ std::vector> RigAccWellFlowCalculator::totalWellFlowP for ( const QString& tracerName : tracerNames ) { - const std::vector& accFlow = this->accumulatedTracerFlowPrConnection( tracerName, 0 ); + const std::vector& accFlow = accumulatedTracerFlowPrConnection( tracerName, 0 ); tracerWithValues.push_back( std::make_pair( tracerName, accFlow.back() ) ); } diff --git a/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp b/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp index d3698e3de0..b55fb20a0e 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp @@ -289,7 +289,7 @@ const std::vector& RigCaseCellResultsData::cellScalarResults( const RigE //-------------------------------------------------------------------------------------------------- size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseResultAddress& resVarAddr, bool needsToBeStored ) { - size_t scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddr ); + size_t scalarResultIndex = findScalarResultIndexFromAddress( resVarAddr ); // If the result exists, do nothing @@ -300,7 +300,7 @@ size_t RigCaseCellResultsData::findOrCreateScalarResultIndex( const RigEclipseRe // Create the new empty result with metadata - scalarResultIndex = this->resultCount(); + scalarResultIndex = resultCount(); m_cellScalarResults.push_back( std::vector>() ); RigEclipseResultInfo resInfo( resVarAddr, needsToBeStored, false, scalarResultIndex ); @@ -610,7 +610,7 @@ void RigCaseCellResultsData::setTimeStepInfos( const RigEclipseResultAddress& m_resultInfos[findScalarResultIndexFromAddress( resVarAddr )].setTimeStepInfos( timeStepInfos ); - std::vector>* dataValues = this->modifiableCellScalarResultTimesteps( resVarAddr ); + std::vector>* dataValues = modifiableCellScalarResultTimesteps( resVarAddr ); dataValues->resize( timeStepInfos.size() ); } @@ -648,7 +648,7 @@ QString RigCaseCellResultsData::makeResultNameUnique( const QString& resultNameP int stringLength = newResultName.size(); while ( true ) { - if ( !this->hasResultEntry( RigEclipseResultAddress( newResultName ) ) ) break; + if ( !hasResultEntry( RigEclipseResultAddress( newResultName ) ) ) break; newResultName.truncate( stringLength ); newResultName += "_" + QString::number( nameNum ); @@ -938,7 +938,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries() size_t soilIndex = findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::soil() ), needsToBeStored ); - this->setMustBeCalculated( soilIndex ); + setMustBeCalculated( soilIndex ); } } } @@ -1204,12 +1204,12 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu RiaDefines::ResultCatType::INPUT_PROPERTY, RiaDefines::ResultCatType::FORMATION_NAMES }; - size_t scalarResultIndex = this->findOrLoadKnownScalarResultByResultTypeOrder( resVarAddr, searchOrder ); + size_t scalarResultIndex = findOrLoadKnownScalarResultByResultTypeOrder( resVarAddr, searchOrder ); return scalarResultIndex; } - size_t scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddr ); + size_t scalarResultIndex = findScalarResultIndexFromAddress( resVarAddr ); if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T ) return cvf::UNDEFINED_SIZE_T; @@ -1218,7 +1218,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu if ( resVarAddr.isDeltaCaseActive() || resVarAddr.isDeltaTimeStepActive() ) { - if ( !RigCaseCellResultCalculator::computeDifference( this->m_ownerCaseData, m_porosityModel, resVarAddr ) ) + if ( !RigCaseCellResultCalculator::computeDifference( m_ownerCaseData, m_porosityModel, resVarAddr ) ) { return cvf::UNDEFINED_SIZE_T; } @@ -1230,7 +1230,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu { if ( !isDataPresent( scalarResultIndex ) ) { - if ( !RigCaseCellResultCalculator::computeDivideByCellFaceArea( m_ownerMainGrid, this->m_ownerCaseData, m_porosityModel, resVarAddr ) ) + if ( !RigCaseCellResultCalculator::computeDivideByCellFaceArea( m_ownerMainGrid, m_ownerCaseData, m_porosityModel, resVarAddr ) ) { return cvf::UNDEFINED_SIZE_T; @@ -1246,18 +1246,18 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu { if ( resultName == RiaResultNames::combinedTransmissibilityResultName() ) { - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANX" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANY" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANZ" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANX" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANY" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "TRANZ" ) ); } else if ( resultName == RiaResultNames::combinedMultResultName() ) { - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTX" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTX-" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTY" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTY-" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTZ" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTZ-" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTX" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTX-" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTY" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTY-" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTZ" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "MULTZ-" ) ); } else if ( resultName == RiaResultNames::combinedRiTranResultName() ) { @@ -1319,21 +1319,21 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu { if ( resultName == RiaResultNames::combinedWaterFluxResultName() ) { - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATI+" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATJ+" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATK+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATI+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATJ+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRWATK+" ) ); } else if ( resultName == RiaResultNames::combinedOilFluxResultName() ) { - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILI+" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILJ+" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILK+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILI+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILJ+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLROILK+" ) ); } else if ( resultName == RiaResultNames::combinedGasFluxResultName() ) { - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRGASI+" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRGASJ+" ) ); - this->findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRGASK+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRGASI+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRGASJ+" ) ); + findOrLoadKnownScalarResult( RigEclipseResultAddress( type, "FLRGASK+" ) ); } } @@ -1344,15 +1344,15 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu if ( resultName == RiaResultNames::soil() ) { - if ( this->mustBeCalculated( scalarResultIndex ) ) + if ( mustBeCalculated( scalarResultIndex ) ) { // Trigger loading of SWAT, SGAS to establish time step count if no data has been loaded from file at // this point findOrLoadKnownScalarResult( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::swat() ) ); findOrLoadKnownScalarResult( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::sgas() ) ); - m_cellScalarResults[scalarResultIndex].resize( this->maxTimeStepCount() ); - for ( size_t timeStepIdx = 0; timeStepIdx < this->maxTimeStepCount(); timeStepIdx++ ) + m_cellScalarResults[scalarResultIndex].resize( maxTimeStepCount() ); + for ( size_t timeStepIdx = 0; timeStepIdx < maxTimeStepCount(); timeStepIdx++ ) { std::vector& values = m_cellScalarResults[scalarResultIndex][timeStepIdx]; if ( values.size() == 0 ) @@ -1366,9 +1366,9 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu } else if ( resultName == RiaResultNames::completionTypeResultName() ) { - caf::ProgressInfo progressInfo( this->maxTimeStepCount(), "Calculate Completion Type Results" ); - m_cellScalarResults[scalarResultIndex].resize( this->maxTimeStepCount() ); - for ( size_t timeStepIdx = 0; timeStepIdx < this->maxTimeStepCount(); ++timeStepIdx ) + caf::ProgressInfo progressInfo( maxTimeStepCount(), "Calculate Completion Type Results" ); + m_cellScalarResults[scalarResultIndex].resize( maxTimeStepCount() ); + for ( size_t timeStepIdx = 0; timeStepIdx < maxTimeStepCount(); ++timeStepIdx ) { computeCompletionTypeForTimeStep( timeStepIdx ); progressInfo.incrementProgress(); @@ -1387,7 +1387,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu if ( m_readerInterface.notNull() ) { // Add one more result to result container - size_t timeStepCount = this->infoForEachResultIndex()[scalarResultIndex].timeStepInfos().size(); + size_t timeStepCount = infoForEachResultIndex()[scalarResultIndex].timeStepInfos().size(); bool resultLoadingSuccess = true; @@ -1472,7 +1472,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu RifReaderEclipseOutput* eclReader = dynamic_cast( m_readerInterface.p() ); if ( eclReader ) { - size_t timeStepCount = this->infoForEachResultIndex()[scalarResultIndex].timeStepInfos().size(); + size_t timeStepCount = infoForEachResultIndex()[scalarResultIndex].timeStepInfos().size(); m_cellScalarResults[scalarResultIndex].resize( timeStepCount ); @@ -1518,7 +1518,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultByResultTypeOrder( con RigEclipseResultAddress resVarAddressWithType = resVarAddr; resVarAddressWithType.setResultCatType( resultType ); - size_t scalarResultIndex = this->findOrLoadKnownScalarResult( resVarAddressWithType ); + size_t scalarResultIndex = findOrLoadKnownScalarResult( resVarAddressWithType ); if ( scalarResultIndex != cvf::UNDEFINED_SIZE_T ) { @@ -1541,11 +1541,11 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig // Special handling for SOIL if ( type == RiaDefines::ResultCatType::DYNAMIC_NATIVE && resultName.toUpper() == RiaResultNames::soil() ) { - size_t soilScalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddr ); + size_t soilScalarResultIndex = findScalarResultIndexFromAddress( resVarAddr ); - if ( this->mustBeCalculated( soilScalarResultIndex ) ) + if ( mustBeCalculated( soilScalarResultIndex ) ) { - m_cellScalarResults[soilScalarResultIndex].resize( this->maxTimeStepCount() ); + m_cellScalarResults[soilScalarResultIndex].resize( maxTimeStepCount() ); std::vector& values = m_cellScalarResults[soilScalarResultIndex][timeStepIndex]; if ( values.size() == 0 ) @@ -1558,12 +1558,12 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig } else if ( type == RiaDefines::ResultCatType::DYNAMIC_NATIVE && resultName == RiaResultNames::completionTypeResultName() ) { - size_t completionTypeScalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddr ); + size_t completionTypeScalarResultIndex = findScalarResultIndexFromAddress( resVarAddr ); computeCompletionTypeForTimeStep( timeStepIndex ); return completionTypeScalarResultIndex; } - size_t scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddr ); + size_t scalarResultIndex = findScalarResultIndexFromAddress( resVarAddr ); if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T ) return cvf::UNDEFINED_SIZE_T; if ( type == RiaDefines::ResultCatType::GENERATED ) @@ -1573,7 +1573,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig if ( m_readerInterface.notNull() ) { - size_t timeStepCount = this->infoForEachResultIndex()[scalarResultIndex].timeStepInfos().size(); + size_t timeStepCount = infoForEachResultIndex()[scalarResultIndex].timeStepInfos().size(); bool resultLoadingSuccess = true; @@ -1615,7 +1615,7 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResultForTimeStep( const Rig RifReaderEclipseOutput* eclReader = dynamic_cast( m_readerInterface.p() ); if ( eclReader ) { - size_t timeStepCount = this->infoForEachResultIndex()[scalarResultIndex].timeStepInfos().size(); + size_t timeStepCount = infoForEachResultIndex()[scalarResultIndex].timeStepInfos().size(); m_cellScalarResults[scalarResultIndex].resize( timeStepCount ); @@ -1663,8 +1663,7 @@ void RigCaseCellResultsData::testAndComputeSgasForTimeStep( size_t timeStepIndex // Simulation type is gas and water. No SGAS is present, compute SGAS based on SWAT size_t scalarIndexSGAS = - this->findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::sgas() ), - false ); + findOrCreateScalarResultIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::sgas() ), false ); if ( m_cellScalarResults[scalarIndexSGAS].size() > timeStepIndex ) { std::vector& values = m_cellScalarResults[scalarIndexSGAS][timeStepIndex]; @@ -1679,7 +1678,7 @@ void RigCaseCellResultsData::testAndComputeSgasForTimeStep( size_t timeStepIndex if ( swatForTimeStep.size() > 0 ) { swatResultValueCount = swatForTimeStep.size(); - swatTimeStepCount = this->infoForEachResultIndex()[scalarIndexSWAT].timeStepInfos().size(); + swatTimeStepCount = infoForEachResultIndex()[scalarIndexSWAT].timeStepInfos().size(); } } @@ -1742,37 +1741,37 @@ void RigCaseCellResultsData::computeDepthRelatedResults() if ( depthResultIndex == cvf::UNDEFINED_SIZE_T ) { - depthResultIndex = this->addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "DEPTH", false, actCellCount ); + depthResultIndex = addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "DEPTH", false, actCellCount ); computeDepth = true; } if ( dxResultIndex == cvf::UNDEFINED_SIZE_T ) { - dxResultIndex = this->addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "DX", false, actCellCount ); + dxResultIndex = addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "DX", false, actCellCount ); computeDx = true; } if ( dyResultIndex == cvf::UNDEFINED_SIZE_T ) { - dyResultIndex = this->addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "DY", false, actCellCount ); + dyResultIndex = addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "DY", false, actCellCount ); computeDy = true; } if ( dzResultIndex == cvf::UNDEFINED_SIZE_T ) { - dzResultIndex = this->addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "DZ", false, actCellCount ); + dzResultIndex = addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "DZ", false, actCellCount ); computeDz = true; } if ( topsResultIndex == cvf::UNDEFINED_SIZE_T ) { - topsResultIndex = this->addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "TOPS", false, actCellCount ); + topsResultIndex = addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "TOPS", false, actCellCount ); computeTops = true; } if ( bottomResultIndex == cvf::UNDEFINED_SIZE_T ) { - bottomResultIndex = this->addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "BOTTOM", false, actCellCount ); + bottomResultIndex = addStaticScalarResult( RiaDefines::ResultCatType::STATIC_NATIVE, "BOTTOM", false, actCellCount ); computeBottom = true; } @@ -2021,8 +2020,8 @@ void RigCaseCellResultsData::computeRiTransComponent( const QString& riTransComp // Get the result index of the output - size_t riTransResultIdx = this->findScalarResultIndexFromAddress( - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, riTransComponentResultName ) ); + size_t riTransResultIdx = + findScalarResultIndexFromAddress( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, riTransComponentResultName ) ); CVF_ASSERT( riTransResultIdx != cvf::UNDEFINED_SIZE_T ); // Get the result count, to handle that one of them might be globally defined @@ -2054,14 +2053,13 @@ void RigCaseCellResultsData::computeRiTransComponent( const QString& riTransComp ResultIndexFunction permIdxFunc = nullptr; ResultIndexFunction ntgIdxFunc = nullptr; { - bool isPermUsingResIdx = - this->isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, permCompName ) ); + bool isPermUsingResIdx = isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, permCompName ) ); bool isTransUsingResIdx = - this->isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, riTransComponentResultName ) ); + isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, riTransComponentResultName ) ); bool isNtgUsingResIdx = false; if ( hasNTGResults ) { - isNtgUsingResIdx = this->isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "NTG" ) ); + isNtgUsingResIdx = isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "NTG" ) ); } // Set up result index function pointers @@ -2204,16 +2202,13 @@ void RigCaseCellResultsData::computeNncCombRiTrans() ResultIndexFunction permZIdxFunc = nullptr; ResultIndexFunction ntgIdxFunc = nullptr; { - bool isPermXUsingResIdx = - this->isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMX" ) ); - bool isPermYUsingResIdx = - this->isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMY" ) ); - bool isPermZUsingResIdx = - this->isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMZ" ) ); - bool isNtgUsingResIdx = false; + bool isPermXUsingResIdx = isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMX" ) ); + bool isPermYUsingResIdx = isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMY" ) ); + bool isPermZUsingResIdx = isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMZ" ) ); + bool isNtgUsingResIdx = false; if ( hasNTGResults ) { - isNtgUsingResIdx = this->isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "NTG" ) ); + isNtgUsingResIdx = isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "NTG" ) ); } // Set up result index function pointers @@ -2395,7 +2390,7 @@ void RigCaseCellResultsData::computeRiMULTComponent( const QString& riMultCompNa // Get the result index of the output size_t riMultResultIdx = - this->findScalarResultIndexFromAddress( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, riMultCompName ) ); + findScalarResultIndexFromAddress( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, riMultCompName ) ); CVF_ASSERT( riMultResultIdx != cvf::UNDEFINED_SIZE_T ); // Get the result count, to handle that one of them might be globally defined @@ -2487,8 +2482,8 @@ void RigCaseCellResultsData::computeRiTRANSbyAreaComponent( const QString& riTra // Get the result index of the output - size_t riTranByAreaScResIdx = this->findScalarResultIndexFromAddress( - RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, riTransByAreaCompResultName ) ); + size_t riTranByAreaScResIdx = + findScalarResultIndexFromAddress( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, riTransByAreaCompResultName ) ); CVF_ASSERT( riTranByAreaScResIdx != cvf::UNDEFINED_SIZE_T ); @@ -2507,7 +2502,7 @@ void RigCaseCellResultsData::computeRiTRANSbyAreaComponent( const QString& riTra // Prepare how to index the result values: - bool isUsingResIdx = this->isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, transCompName ) ); + bool isUsingResIdx = isUsingGlobalActiveIndex( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, transCompName ) ); // Set up result index function pointers @@ -2601,12 +2596,12 @@ void RigCaseCellResultsData::computeNncCombRiTRANSbyArea() //-------------------------------------------------------------------------------------------------- void RigCaseCellResultsData::computeCompletionTypeForTimeStep( size_t timeStep ) { - size_t completionTypeResultIndex = this->findScalarResultIndexFromAddress( + size_t completionTypeResultIndex = findScalarResultIndexFromAddress( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::completionTypeResultName() ) ); - if ( m_cellScalarResults[completionTypeResultIndex].size() < this->maxTimeStepCount() ) + if ( m_cellScalarResults[completionTypeResultIndex].size() < maxTimeStepCount() ) { - m_cellScalarResults[completionTypeResultIndex].resize( this->maxTimeStepCount() ); + m_cellScalarResults[completionTypeResultIndex].resize( maxTimeStepCount() ); } std::vector& completionTypeResult = m_cellScalarResults[completionTypeResultIndex][timeStep]; @@ -2725,14 +2720,11 @@ void RigCaseCellResultsData::setActiveFormationNames( RigFormationNames* activeF m_activeFormationNamesData = activeFormationNames; size_t totalGlobCellCount = m_ownerMainGrid->globalCellArray().size(); - this->addStaticScalarResult( RiaDefines::ResultCatType::FORMATION_NAMES, - RiaResultNames::activeFormationNamesResultName(), - false, - totalGlobCellCount ); + addStaticScalarResult( RiaDefines::ResultCatType::FORMATION_NAMES, RiaResultNames::activeFormationNamesResultName(), false, totalGlobCellCount ); - std::vector* fnData = this->modifiableCellScalarResult( RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, - RiaResultNames::activeFormationNamesResultName() ), - 0 ); + std::vector* fnData = modifiableCellScalarResult( RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, + RiaResultNames::activeFormationNamesResultName() ), + 0 ); if ( m_activeFormationNamesData.isNull() ) { @@ -2808,7 +2800,7 @@ RigAllanDiagramData* RigCaseCellResultsData::allanDiagramData() //-------------------------------------------------------------------------------------------------- bool RigCaseCellResultsData::isDataPresent( size_t scalarResultIndex ) const { - if ( scalarResultIndex >= this->resultCount() ) + if ( scalarResultIndex >= resultCount() ) { return false; } @@ -2906,36 +2898,36 @@ size_t RigCaseCellResultsData::findScalarResultIndexFromAddress( const RigEclips resVarAddressWithType.setResultCatType( RiaDefines::ResultCatType::STATIC_NATIVE ); - size_t scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddressWithType ); + size_t scalarResultIndex = findScalarResultIndexFromAddress( resVarAddressWithType ); if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T ) { resVarAddressWithType.setResultCatType( RiaDefines::ResultCatType::DYNAMIC_NATIVE ); - scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddressWithType ); + scalarResultIndex = findScalarResultIndexFromAddress( resVarAddressWithType ); } if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T ) { resVarAddressWithType.setResultCatType( RiaDefines::ResultCatType::SOURSIMRL ); - scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddressWithType ); + scalarResultIndex = findScalarResultIndexFromAddress( resVarAddressWithType ); } if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T ) { resVarAddressWithType.setResultCatType( RiaDefines::ResultCatType::GENERATED ); - scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddressWithType ); + scalarResultIndex = findScalarResultIndexFromAddress( resVarAddressWithType ); } if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T ) { resVarAddressWithType.setResultCatType( RiaDefines::ResultCatType::INPUT_PROPERTY ); - scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddressWithType ); + scalarResultIndex = findScalarResultIndexFromAddress( resVarAddressWithType ); } if ( scalarResultIndex == cvf::UNDEFINED_SIZE_T ) { resVarAddressWithType.setResultCatType( RiaDefines::ResultCatType::FORMATION_NAMES ); - scalarResultIndex = this->findScalarResultIndexFromAddress( resVarAddressWithType ); + scalarResultIndex = findScalarResultIndexFromAddress( resVarAddressWithType ); } return scalarResultIndex; @@ -3012,5 +3004,5 @@ void RigCaseCellResultsData::copyResultsMetaDataFromMainCase( RigEclipseCaseData //-------------------------------------------------------------------------------------------------- void RigCaseCellResultsData::setStatisticsDataCacheNumBins( const RigEclipseResultAddress& resultAddress, size_t numBins ) { - this->statistics( resultAddress )->setNumBins( numBins ); + statistics( resultAddress )->setNumBins( numBins ); } diff --git a/ApplicationLibCode/ReservoirDataModel/RigCaseToCaseCellMapper.cpp b/ApplicationLibCode/ReservoirDataModel/RigCaseToCaseCellMapper.cpp index 7d29b110b4..9d1eb68647 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigCaseToCaseCellMapper.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigCaseToCaseCellMapper.cpp @@ -46,7 +46,7 @@ RigCaseToCaseCellMapper::RigCaseToCaseCellMapper( RigFemPart* masterFemPart, Rig , m_dependentFemPart( nullptr ) { m_masterCellOrIntervalIndex.resize( dependentEclGrid->globalCellArray().size(), cvf::UNDEFINED_INT ); - this->calculateEclToGeomCellMapping( dependentEclGrid, masterFemPart, false ); + calculateEclToGeomCellMapping( dependentEclGrid, masterFemPart, false ); } //-------------------------------------------------------------------------------------------------- @@ -71,7 +71,7 @@ RigCaseToCaseCellMapper::RigCaseToCaseCellMapper( RigMainGrid* masterEclGrid, Ri , m_dependentFemPart( nullptr ) { m_masterCellOrIntervalIndex.resize( dependentFemPart->elementCount(), cvf::UNDEFINED_INT ); - this->calculateEclToGeomCellMapping( masterEclGrid, dependentFemPart, true ); + calculateEclToGeomCellMapping( masterEclGrid, dependentFemPart, true ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp b/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp index 55dc65b006..862ae6180f 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp @@ -192,7 +192,7 @@ void RigEclipseCaseData::computeWellCellsPrGrid() if ( m_wellCellsInGrid.size() ) return; std::vector grids; - this->allGrids( &grids ); + allGrids( &grids ); // Debug code used to display grid names and grid sizes /* @@ -747,7 +747,7 @@ const std::vector* RigEclipseCaseData::resultValues( RiaDefines::Porosit const QString& resultName, size_t timeStepIndex ) { - RigCaseCellResultsData* gridCellResults = this->results( porosityModel ); + RigCaseCellResultsData* gridCellResults = results( porosityModel ); const std::vector* swatResults = nullptr; if ( gridCellResults->ensureKnownResultLoaded( RigEclipseResultAddress( type, resultName ) ) ) diff --git a/ApplicationLibCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.cpp b/ApplicationLibCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.cpp index 5e26727587..cb0d94fc5b 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.cpp @@ -129,6 +129,6 @@ void RigEclipseMultiPropertyStatCalc::addNativeStatisticsCalculator( RigCaseCell { if ( eclipseResultAddress.isValid() ) { - this->addStatisticsCalculator( new RigEclipseNativeStatCalc( cellResultsData, eclipseResultAddress ) ); + addStatisticsCalculator( new RigEclipseNativeStatCalc( cellResultsData, eclipseResultAddress ) ); } } diff --git a/ApplicationLibCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp b/ApplicationLibCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp index ca2589a0b1..571e27babe 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp @@ -169,7 +169,7 @@ void RigEclipseWellLogExtractor::calculateIntersection() } } - this->populateReturnArrays( uniqueIntersections ); + populateReturnArrays( uniqueIntersections ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ReservoirDataModel/RigEnsembleParameter.cpp b/ApplicationLibCode/ReservoirDataModel/RigEnsembleParameter.cpp index ade8d3bcfc..e12472caea 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEnsembleParameter.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigEnsembleParameter.cpp @@ -70,12 +70,12 @@ double RigEnsembleParameter::normalizedStdDeviation() const //-------------------------------------------------------------------------------------------------- bool RigEnsembleParameter::operator<( const RigEnsembleParameter& other ) const { - if ( this->variationBin != other.variationBin ) + if ( variationBin != other.variationBin ) { - return this->variationBin > other.variationBin; // Larger first + return variationBin > other.variationBin; // Larger first } - return this->name < other.name; + return name < other.name; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ReservoirDataModel/RigEquil.cpp b/ApplicationLibCode/ReservoirDataModel/RigEquil.cpp index 1e6633df77..e09ee8abe5 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigEquil.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigEquil.cpp @@ -48,47 +48,47 @@ RigEquil::RigEquil( double datumDepth, double RigEquil::datumDepth() const { - return this->datum_depth; + return datum_depth; } double RigEquil::datumDepthPressure() const { - return this->datum_depth_ps; + return datum_depth_ps; } double RigEquil::waterOilContactDepth() const { - return this->water_oil_contact_depth; + return water_oil_contact_depth; } double RigEquil::waterOilContactCapillaryPressure() const { - return this->water_oil_contact_capillary_pressure; + return water_oil_contact_capillary_pressure; } double RigEquil::gasOilContactDepth() const { - return this->gas_oil_contact_depth; + return gas_oil_contact_depth; } double RigEquil::gasOilContactCapillaryPressure() const { - return this->gas_oil_contact_capillary_pressure; + return gas_oil_contact_capillary_pressure; } bool RigEquil::liveOilInitConstantRs() const { - return this->live_oil_init_proc; + return live_oil_init_proc; } bool RigEquil::wetGasInitConstantRv() const { - return this->wet_gas_init_proc; + return wet_gas_init_proc; } int RigEquil::initializationTargetAccuracy() const { - return this->init_target_accuracy; + return init_target_accuracy; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagResults.cpp b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagResults.cpp index dcaacce235..1edaf336f0 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagResults.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagResults.cpp @@ -235,7 +235,7 @@ std::vector* RigFlowDiagResults::calculateAverageTOFResult( const RigFlo findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::TracerStatusType::PRODUCER ); std::vector*> producerFractions = findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::TracerStatusType::PRODUCER ); - size_t activeCellCount = this->activeCellInfo( resVarAddr )->reservoirActiveCellCount(); + size_t activeCellCount = activeCellInfo( resVarAddr )->reservoirActiveCellCount(); std::vector injectorTotalFractions; std::vector injectorFractMultTof; @@ -245,7 +245,7 @@ std::vector* RigFlowDiagResults::calculateAverageTOFResult( const RigFlo std::vector producerFractMultTof; calculateSumOfFractionAndFractionMultTOF( activeCellCount, producerFractions, producerTOFs, &producerTotalFractions, &producerFractMultTof ); - RigFlowDiagResultFrames* averageTofFrames = this->createScalarResult( resVarAddr ); + RigFlowDiagResultFrames* averageTofFrames = createScalarResult( resVarAddr ); std::vector& averageTof = averageTofFrames->frameData( timeStepIndex ); averageTof.resize( activeCellCount, HUGE_VAL ); @@ -309,10 +309,10 @@ std::vector* RigFlowDiagResults::calculateSumOfFractionsResult( const Ri RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::TracerStatusType::UNDEFINED ); - RigFlowDiagResultFrames* sumOfFractionsFrames = this->createScalarResult( resVarAddr ); + RigFlowDiagResultFrames* sumOfFractionsFrames = createScalarResult( resVarAddr ); std::vector& sumOfFractions = sumOfFractionsFrames->frameData( timeStepIndex ); - size_t activeCellCount = this->activeCellInfo( resVarAddr )->reservoirActiveCellCount(); + size_t activeCellCount = activeCellInfo( resVarAddr )->reservoirActiveCellCount(); calculateSumOfFractions( fractions, activeCellCount, &sumOfFractions ); @@ -351,9 +351,9 @@ std::vector* RigFlowDiagResults::calculateTracerWithMaxFractionResult( c } } - size_t activeCellCount = this->activeCellInfo( resVarAddr )->reservoirActiveCellCount(); + size_t activeCellCount = activeCellInfo( resVarAddr )->reservoirActiveCellCount(); - RigFlowDiagResultFrames* maxFractionTracerIdxFrames = this->createScalarResult( resVarAddr ); + RigFlowDiagResultFrames* maxFractionTracerIdxFrames = createScalarResult( resVarAddr ); std::vector& maxFractionTracerIdx = maxFractionTracerIdxFrames->frameData( timeStepIndex ); { maxFractionTracerIdx.resize( activeCellCount, HUGE_VAL ); @@ -392,7 +392,7 @@ std::vector* RigFlowDiagResults::calculateCommunicationResult( const Rig findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::TracerStatusType::INJECTOR ); std::vector*> producerFractions = findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::TracerStatusType::PRODUCER ); - size_t activeCellCount = this->activeCellInfo( resVarAddr )->reservoirActiveCellCount(); + size_t activeCellCount = activeCellInfo( resVarAddr )->reservoirActiveCellCount(); std::vector sumOfInjectorFractions; calculateSumOfFractions( injectorFractions, activeCellCount, &sumOfInjectorFractions ); @@ -400,7 +400,7 @@ std::vector* RigFlowDiagResults::calculateCommunicationResult( const Rig std::vector sumOfProducerFractions; calculateSumOfFractions( producerFractions, activeCellCount, &sumOfProducerFractions ); - RigFlowDiagResultFrames* commFrames = this->createScalarResult( resVarAddr ); + RigFlowDiagResultFrames* commFrames = createScalarResult( resVarAddr ); std::vector& commPI = commFrames->frameData( timeStepIndex ); commPI.resize( activeCellCount, HUGE_VAL ); @@ -428,7 +428,7 @@ void RigFlowDiagResults::calculateNumFloodedPV( const RigFlowDiagResultAddress& } RigNumberOfFloodedPoreVolumesCalculator calc( eclipseCase, tracerNames ); - RigFlowDiagResultFrames* frames = this->createScalarResult( resVarAddr ); + RigFlowDiagResultFrames* frames = createScalarResult( resVarAddr ); for ( size_t frameIdx = 0; frameIdx < m_timeStepCount; ++frameIdx ) { std::vector& frame = frames->frameData( frameIdx ); @@ -539,7 +539,7 @@ void RigFlowDiagResults::calculateSumOfFractions( const std::vectorstatistics( resVarAddr )->minMaxCellScalarValues( timeStepIndex, *localMin, *localMax ); + statistics( resVarAddr )->minMaxCellScalarValues( timeStepIndex, *localMin, *localMax ); } //-------------------------------------------------------------------------------------------------- @@ -547,7 +547,7 @@ void RigFlowDiagResults::minMaxScalarValues( const RigFlowDiagResultAddress& res //-------------------------------------------------------------------------------------------------- void RigFlowDiagResults::minMaxScalarValues( const RigFlowDiagResultAddress& resVarAddr, double* globalMin, double* globalMax ) { - this->statistics( resVarAddr )->minMaxCellScalarValues( *globalMin, *globalMax ); + statistics( resVarAddr )->minMaxCellScalarValues( *globalMin, *globalMax ); } //-------------------------------------------------------------------------------------------------- @@ -558,7 +558,7 @@ void RigFlowDiagResults::posNegClosestToZero( const RigFlowDiagResultAddress& re double* localPosClosestToZero, double* localNegClosestToZero ) { - this->statistics( resVarAddr )->posNegClosestToZero( timeStepIndex, *localPosClosestToZero, *localNegClosestToZero ); + statistics( resVarAddr )->posNegClosestToZero( timeStepIndex, *localPosClosestToZero, *localNegClosestToZero ); } //-------------------------------------------------------------------------------------------------- @@ -568,7 +568,7 @@ void RigFlowDiagResults::posNegClosestToZero( const RigFlowDiagResultAddress& re double* globalPosClosestToZero, double* globalNegClosestToZero ) { - this->statistics( resVarAddr )->posNegClosestToZero( *globalPosClosestToZero, *globalNegClosestToZero ); + statistics( resVarAddr )->posNegClosestToZero( *globalPosClosestToZero, *globalNegClosestToZero ); } //-------------------------------------------------------------------------------------------------- @@ -578,7 +578,7 @@ void RigFlowDiagResults::meanScalarValue( const RigFlowDiagResultAddress& resVar { CVF_ASSERT( meanValue ); - this->statistics( resVarAddr )->meanCellScalarValues( *meanValue ); + statistics( resVarAddr )->meanCellScalarValues( *meanValue ); } //-------------------------------------------------------------------------------------------------- @@ -586,7 +586,7 @@ void RigFlowDiagResults::meanScalarValue( const RigFlowDiagResultAddress& resVar //-------------------------------------------------------------------------------------------------- void RigFlowDiagResults::meanScalarValue( const RigFlowDiagResultAddress& resVarAddr, int timeStepIndex, double* meanValue ) { - this->statistics( resVarAddr )->meanCellScalarValues( timeStepIndex, *meanValue ); + statistics( resVarAddr )->meanCellScalarValues( timeStepIndex, *meanValue ); } //-------------------------------------------------------------------------------------------------- @@ -594,7 +594,7 @@ void RigFlowDiagResults::meanScalarValue( const RigFlowDiagResultAddress& resVar //-------------------------------------------------------------------------------------------------- void RigFlowDiagResults::p10p90ScalarValues( const RigFlowDiagResultAddress& resVarAddr, double* p10, double* p90 ) { - this->statistics( resVarAddr )->p10p90CellScalarValues( *p10, *p90 ); + statistics( resVarAddr )->p10p90CellScalarValues( *p10, *p90 ); } //-------------------------------------------------------------------------------------------------- @@ -602,7 +602,7 @@ void RigFlowDiagResults::p10p90ScalarValues( const RigFlowDiagResultAddress& res //-------------------------------------------------------------------------------------------------- void RigFlowDiagResults::p10p90ScalarValues( const RigFlowDiagResultAddress& resVarAddr, int timeStepIndex, double* p10, double* p90 ) { - this->statistics( resVarAddr )->p10p90CellScalarValues( timeStepIndex, *p10, *p90 ); + statistics( resVarAddr )->p10p90CellScalarValues( timeStepIndex, *p10, *p90 ); } //-------------------------------------------------------------------------------------------------- @@ -612,7 +612,7 @@ void RigFlowDiagResults::sumScalarValue( const RigFlowDiagResultAddress& resVarA { CVF_ASSERT( sum ); - this->statistics( resVarAddr )->sumCellScalarValues( *sum ); + statistics( resVarAddr )->sumCellScalarValues( *sum ); } //-------------------------------------------------------------------------------------------------- @@ -622,7 +622,7 @@ void RigFlowDiagResults::sumScalarValue( const RigFlowDiagResultAddress& resVarA { CVF_ASSERT( sum ); - this->statistics( resVarAddr )->sumCellScalarValues( timeStepIndex, *sum ); + statistics( resVarAddr )->sumCellScalarValues( timeStepIndex, *sum ); } //-------------------------------------------------------------------------------------------------- @@ -630,7 +630,7 @@ void RigFlowDiagResults::sumScalarValue( const RigFlowDiagResultAddress& resVarA //-------------------------------------------------------------------------------------------------- const std::vector& RigFlowDiagResults::scalarValuesHistogram( const RigFlowDiagResultAddress& resVarAddr ) { - return this->statistics( resVarAddr )->cellScalarValuesHistogram(); + return statistics( resVarAddr )->cellScalarValuesHistogram(); } //-------------------------------------------------------------------------------------------------- @@ -638,7 +638,7 @@ const std::vector& RigFlowDiagResults::scalarValuesHistogram( const RigF //-------------------------------------------------------------------------------------------------- const std::vector& RigFlowDiagResults::scalarValuesHistogram( const RigFlowDiagResultAddress& resVarAddr, int timeStepIndex ) { - return this->statistics( resVarAddr )->cellScalarValuesHistogram( timeStepIndex ); + return statistics( resVarAddr )->cellScalarValuesHistogram( timeStepIndex ); } //-------------------------------------------------------------------------------------------------- @@ -646,7 +646,7 @@ const std::vector& RigFlowDiagResults::scalarValuesHistogram( const RigF //-------------------------------------------------------------------------------------------------- const std::vector& RigFlowDiagResults::uniqueCellScalarValues( const RigFlowDiagResultAddress& resVarAddr ) { - return this->statistics( resVarAddr )->uniqueCellScalarValues(); + return statistics( resVarAddr )->uniqueCellScalarValues(); } //-------------------------------------------------------------------------------------------------- @@ -654,7 +654,7 @@ const std::vector& RigFlowDiagResults::uniqueCellScalarValues( const RigFlo //-------------------------------------------------------------------------------------------------- const std::vector& RigFlowDiagResults::uniqueCellScalarValues( const RigFlowDiagResultAddress& resVarAddr, int timeStepIndex ) { - return this->statistics( resVarAddr )->uniqueCellScalarValues( timeStepIndex ); + return statistics( resVarAddr )->uniqueCellScalarValues( timeStepIndex ); } //-------------------------------------------------------------------------------------------------- @@ -662,7 +662,7 @@ const std::vector& RigFlowDiagResults::uniqueCellScalarValues( const RigFlo //-------------------------------------------------------------------------------------------------- void RigFlowDiagResults::mobileVolumeWeightedMean( const RigFlowDiagResultAddress& resVarAddr, int timeStepIndex, double* mean ) { - this->statistics( resVarAddr )->mobileVolumeWeightedMean( timeStepIndex, *mean ); + statistics( resVarAddr )->mobileVolumeWeightedMean( timeStepIndex, *mean ); } //-------------------------------------------------------------------------------------------------- @@ -670,7 +670,7 @@ void RigFlowDiagResults::mobileVolumeWeightedMean( const RigFlowDiagResultAddres //-------------------------------------------------------------------------------------------------- void RigFlowDiagResults::mobileVolumeWeightedMean( const RigFlowDiagResultAddress& resVarAddr, double* mean ) { - this->statistics( resVarAddr )->mobileVolumeWeightedMean( *mean ); + statistics( resVarAddr )->mobileVolumeWeightedMean( *mean ); } //-------------------------------------------------------------------------------------------------- @@ -906,5 +906,5 @@ RimFlowDiagSolution* RigFlowDiagResults::flowDiagSolution() //-------------------------------------------------------------------------------------------------- void RigFlowDiagResults::setStatisticsDataCacheNumBins( const RigFlowDiagResultAddress& resVarAddr, size_t numBins ) { - this->statistics( resVarAddr )->setNumBins( numBins ); + statistics( resVarAddr )->setNumBins( numBins ); } diff --git a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp index a3d5e6dca4..e26a85d647 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp @@ -64,7 +64,7 @@ void RigFlowDiagTimeStepResult::setTracerTOF( const std::string& RigFlowDiagResultAddress resAddr( RIG_FLD_TOF_RESNAME, phaseSelection, tracers ); - this->addResult( resAddr, cellValues ); + addResult( resAddr, cellValues ); std::vector& activeCellValues = m_nativeResults[resAddr]; for ( double& val : activeCellValues ) @@ -83,7 +83,7 @@ void RigFlowDiagTimeStepResult::setTracerFraction( const std::string& std::set tracers; tracers.insert( tracerName ); - this->addResult( RigFlowDiagResultAddress( RIG_FLD_CELL_FRACTION_RESNAME, phaseSelection, tracers ), cellValues ); + addResult( RigFlowDiagResultAddress( RIG_FLD_CELL_FRACTION_RESNAME, phaseSelection, tracers ), cellValues ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp b/ApplicationLibCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp index 7066a0b27e..0a53f17c85 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp @@ -1021,7 +1021,7 @@ void RigGeoMechWellLogExtractor::calculateIntersection() insertIntersectionsInMap( intersections, p1, md1, p2, md2, tolerance, &uniqueIntersections ); } - this->populateReturnArrays( uniqueIntersections ); + populateReturnArrays( uniqueIntersections ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ReservoirDataModel/RigGridBase.cpp b/ApplicationLibCode/ReservoirDataModel/RigGridBase.cpp index ed9b70f09f..27d593d5e9 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigGridBase.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigGridBase.cpp @@ -391,7 +391,7 @@ double RigGridBase::characteristicIJCellSize() const double characteristicCellSize = HUGE_VAL; double cellSizeI, cellSizeJ, cellSizeK; - this->characteristicCellSizes( &cellSizeI, &cellSizeJ, &cellSizeK ); + characteristicCellSizes( &cellSizeI, &cellSizeJ, &cellSizeK ); if ( cellSizeI < characteristicCellSize ) characteristicCellSize = cellSizeI; if ( cellSizeJ < characteristicCellSize ) characteristicCellSize = cellSizeJ; @@ -430,9 +430,9 @@ size_t RigGridBase::addCoarseningBox( size_t i1, size_t i2, size_t j1, size_t j2 { for ( size_t i = i1; i <= i2; i++ ) { - size_t cellIdx = this->cellIndexFromIJK( i, j, k ); + size_t cellIdx = cellIndexFromIJK( i, j, k ); - RigCell& c = this->cell( cellIdx ); + RigCell& c = cell( cellIdx ); CVF_ASSERT( c.coarseningBoxIndex() == cvf::UNDEFINED_SIZE_T ); c.setCoarseningBoxIndex( coarseningBoxIndex ); diff --git a/ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp b/ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp index 6e0c882ca7..df86b4e6fb 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigMainGrid.cpp @@ -355,7 +355,7 @@ void RigMainGrid::setFlipAxis( bool flipXAxis, bool flipYAxis ) RigGridBase* RigMainGrid::gridById( int localGridId ) { CVF_ASSERT( localGridId >= 0 && static_cast( localGridId ) < m_gridIdToIndexMapping.size() ); - return this->gridByIndex( m_gridIdToIndexMapping[localGridId] ); + return gridByIndex( m_gridIdToIndexMapping[localGridId] ); } //-------------------------------------------------------------------------------------------------- @@ -399,7 +399,7 @@ void RigMainGrid::setFaults( const cvf::Collection& faults ) #pragma omp parallel for for ( int i = 0; i < static_cast( m_faults.size() ); i++ ) { - m_faults[i]->computeFaultFacesFromCellRanges( this->mainGrid() ); + m_faults[i]->computeFaultFacesFromCellRanges( mainGrid() ); } } @@ -527,7 +527,7 @@ void RigMainGrid::addUnNamedFaultFaces( int gcIdx, if ( firstNO_FAULTFaceForCell ) // To avoid doing this for every face, and only when detecting a NO_FAULT { size_t gridLocalCellIndex; - hostGrid = this->gridAndGridLocalIdxFromGlobalCellIdx( gcIdx, &gridLocalCellIndex ); + hostGrid = gridAndGridLocalIdxFromGlobalCellIdx( gcIdx, &gridLocalCellIndex ); hostGrid->ijkFromCellIndex( gridLocalCellIndex, &i, &j, &k ); isCellActive = activeCellInfo->isActive( gcIdx ); @@ -602,7 +602,7 @@ void RigMainGrid::distributeNNCsToFaults() { if ( m_faultsPrCellAcc.isNull() ) return; - const RigConnectionContainer& nncs = this->nncData()->allConnections(); + const RigConnectionContainer& nncs = nncData()->allConnections(); for ( size_t nncIdx = 0; nncIdx < nncs.size(); ++nncIdx ) { // Find the fault for each side of the nnc diff --git a/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp b/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp index bf3ea2afa1..747a432a17 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp @@ -336,7 +336,7 @@ std::vector> RigStimPlanFractureDefinition::getStimP { std::vector> propertyNamesUnits; { - for ( const RigStimPlanResultFrames& stimPlanDataEntry : this->m_stimPlanResults ) + for ( const RigStimPlanResultFrames& stimPlanDataEntry : m_stimPlanResults ) { propertyNamesUnits.push_back( std::make_pair( stimPlanDataEntry.resultName, stimPlanDataEntry.unit ) ); } @@ -355,7 +355,7 @@ std::vector> RigStimPlanFractureDefinition::conductivityValu QString conductivityUnitTextOnFile; - std::vector> propertyNamesUnitsOnFile = this->getStimPlanPropertyNamesUnits(); + std::vector> propertyNamesUnitsOnFile = getStimPlanPropertyNamesUnits(); for ( auto properyNameUnit : propertyNamesUnitsOnFile ) { if ( resultName == properyNameUnit.first ) @@ -371,7 +371,7 @@ std::vector> RigStimPlanFractureDefinition::conductivityValu return conductivityValues; } - conductivityValues = this->getDataAtTimeIndex( resultName, conductivityUnitTextOnFile, activeTimeStepIndex ); + conductivityValues = getDataAtTimeIndex( resultName, conductivityUnitTextOnFile, activeTimeStepIndex ); // Check that the data is in the required unit system. // Convert if not the case. @@ -421,10 +421,10 @@ cvf::cref RigStimPlanFractureDefinition::createFractureGrid( co bool wellCenterStimPlanCellFound = false; - std::vector scaledXs = computeScaledXs( this->m_Xs, xScaleFactor ); - std::vector scaledYs = computeScaledYs( this->m_Ys, yScaleFactor, -wellPathIntersectionAtFractureDepth ); + std::vector scaledXs = computeScaledXs( m_Xs, xScaleFactor ); + std::vector scaledYs = computeScaledYs( m_Ys, yScaleFactor, -wellPathIntersectionAtFractureDepth ); - std::vector yCoordsAtNodes = this->adjustedYCoordsAroundWellPathPosition( scaledYs, wellPathIntersectionAtFractureDepth ); + std::vector yCoordsAtNodes = adjustedYCoordsAroundWellPathPosition( scaledYs, wellPathIntersectionAtFractureDepth ); std::vector xCoordsAtNodes = scaledXs; @@ -479,8 +479,8 @@ cvf::cref RigStimPlanFractureDefinition::createFractureGrid( co cvf::ref fractureGrid = new RigFractureGrid; fractureGrid->setFractureCells( stimPlanCells ); fractureGrid->setWellCenterFractureCellIJ( wellCenterStimPlanCellIJ ); - fractureGrid->setICellCount( this->m_Xs.size() - 2 ); - fractureGrid->setJCellCount( this->m_Ys.size() - 2 ); + fractureGrid->setICellCount( m_Xs.size() - 2 ); + fractureGrid->setJCellCount( m_Ys.size() - 2 ); fractureGrid->ensureCellSearchTreeIsBuilt(); return cvf::cref( fractureGrid.p() ); @@ -493,7 +493,7 @@ std::vector RigStimPlanFractureDefinition::fractureGridResults( const QString& resultName, const QString& unitName, size_t timeStepIndex ) const { std::vector fractureGridResults; - const std::vector>& resultValuesAtTimeStep = this->getDataAtTimeIndex( resultName, unitName, timeStepIndex ); + const std::vector>& resultValuesAtTimeStep = getDataAtTimeIndex( resultName, unitName, timeStepIndex ); for ( int i = 0; i < static_cast( xCount() ) - 2; i++ ) { @@ -523,13 +523,13 @@ void RigStimPlanFractureDefinition::createFractureTriangleGeometry( double std::vector* vertices, std::vector* triangleIndices ) const { - std::vector scaledXs = computeScaledXs( this->m_Xs, xScaleFactor ); - std::vector scaledYs = computeScaledYs( this->m_Ys, yScaleFactor, -wellPathIntersectionAtFractureDepth ); + std::vector scaledXs = computeScaledXs( m_Xs, xScaleFactor ); + std::vector scaledYs = computeScaledYs( m_Ys, yScaleFactor, -wellPathIntersectionAtFractureDepth ); std::vector xCoords = scaledXs; cvf::uint lenXcoords = static_cast( xCoords.size() ); - std::vector adjustedYs = this->adjustedYCoordsAroundWellPathPosition( scaledYs, wellPathIntersectionAtFractureDepth ); + std::vector adjustedYs = adjustedYCoordsAroundWellPathPosition( scaledYs, wellPathIntersectionAtFractureDepth ); for ( cvf::uint k = 0; k < adjustedYs.size(); k++ ) { diff --git a/ApplicationLibCode/ReservoirDataModel/RigWellLogExtractor.cpp b/ApplicationLibCode/ReservoirDataModel/RigWellLogExtractor.cpp index f3c397b570..b0220894ab 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigWellLogExtractor.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigWellLogExtractor.cpp @@ -79,7 +79,7 @@ std::vector RigWellLogExtractor::cellIntersectionI cellInfo.intersectedCellFaceIn = m_intersectedCellFaces[i]; cellInfo.intersectedCellFaceOut = m_intersectedCellFaces[i + 1]; - cellInfo.intersectionLengthsInCellCS = this->calculateLengthInCell( cellInfo.globCellIndex, cellInfo.startPoint, cellInfo.endPoint ); + cellInfo.intersectionLengthsInCellCS = calculateLengthInCell( cellInfo.globCellIndex, cellInfo.startPoint, cellInfo.endPoint ); infoVector.push_back( cellInfo ); } diff --git a/ApplicationLibCode/ResultStatisticsCache/RigStatisticsCalculator.cpp b/ApplicationLibCode/ResultStatisticsCache/RigStatisticsCalculator.cpp index 41a328ac92..b5c0b2a264 100644 --- a/ApplicationLibCode/ResultStatisticsCache/RigStatisticsCalculator.cpp +++ b/ApplicationLibCode/ResultStatisticsCache/RigStatisticsCalculator.cpp @@ -30,7 +30,7 @@ void RigStatisticsCalculator::meanCellScalarValue( double& meanValue ) double valueSum = 0.0; size_t sampleCount = 0; - this->valueSumAndSampleCount( valueSum, sampleCount ); + valueSumAndSampleCount( valueSum, sampleCount ); if ( sampleCount == 0 ) { @@ -50,7 +50,7 @@ void RigStatisticsCalculator::meanCellScalarValue( size_t timeStepIndex, double& double valueSum = 0.0; size_t sampleCount = 0; - this->valueSumAndSampleCount( timeStepIndex, valueSum, sampleCount ); + valueSumAndSampleCount( timeStepIndex, valueSum, sampleCount ); if ( sampleCount == 0 ) { @@ -67,10 +67,10 @@ void RigStatisticsCalculator::meanCellScalarValue( size_t timeStepIndex, double& //-------------------------------------------------------------------------------------------------- void RigStatisticsCalculator::valueSumAndSampleCount( double& valueSum, size_t& sampleCount ) { - size_t tsCount = this->timeStepCount(); + size_t tsCount = timeStepCount(); for ( size_t tIdx = 0; tIdx < tsCount; tIdx++ ) { - this->valueSumAndSampleCount( tIdx, valueSum, sampleCount ); + valueSumAndSampleCount( tIdx, valueSum, sampleCount ); } } @@ -79,10 +79,10 @@ void RigStatisticsCalculator::valueSumAndSampleCount( double& valueSum, size_t& //-------------------------------------------------------------------------------------------------- void RigStatisticsCalculator::addDataToHistogramCalculator( RigHistogramCalculator& histogramCalculator ) { - size_t tsCount = this->timeStepCount(); + size_t tsCount = timeStepCount(); for ( size_t tIdx = 0; tIdx < tsCount; tIdx++ ) { - this->addDataToHistogramCalculator( tIdx, histogramCalculator ); + addDataToHistogramCalculator( tIdx, histogramCalculator ); } } @@ -99,11 +99,11 @@ void RigStatisticsCalculator::mobileVolumeWeightedMean( size_t timeStepIndex, do void RigStatisticsCalculator::mobileVolumeWeightedMean( double& mean ) { double sum = 0.0; - size_t tsCount = this->timeStepCount(); + size_t tsCount = timeStepCount(); for ( size_t tIdx = 0; tIdx < tsCount; tIdx++ ) { double meanForTimeStep; - this->mobileVolumeWeightedMean( tIdx, meanForTimeStep ); + mobileVolumeWeightedMean( tIdx, meanForTimeStep ); sum += meanForTimeStep; } if ( tsCount != 0 ) diff --git a/ApplicationLibCode/ResultStatisticsCache/RigStatisticsDataCache.cpp b/ApplicationLibCode/ResultStatisticsCache/RigStatisticsDataCache.cpp index db11735353..13e9b5c665 100644 --- a/ApplicationLibCode/ResultStatisticsCache/RigStatisticsDataCache.cpp +++ b/ApplicationLibCode/ResultStatisticsCache/RigStatisticsDataCache.cpp @@ -75,7 +75,7 @@ void RigStatisticsDataCache::minMaxCellScalarValues( double& min, double& max ) for ( i = 0; i < m_statisticsCalculator->timeStepCount(); i++ ) { double tsmin, tsmax; - this->minMaxCellScalarValues( i, tsmin, tsmax ); + minMaxCellScalarValues( i, tsmin, tsmax ); if ( tsmin < min ) min = tsmin; if ( tsmax > max ) max = tsmax; } @@ -130,7 +130,7 @@ void RigStatisticsDataCache::posNegClosestToZero( double& pos, double& neg ) for ( i = 0; i < m_statisticsCalculator->timeStepCount(); i++ ) { double tsNeg, tsPos; - this->posNegClosestToZero( i, tsPos, tsNeg ); + posNegClosestToZero( i, tsPos, tsNeg ); if ( tsNeg > neg && tsNeg < 0 ) neg = tsNeg; if ( tsPos < pos && tsPos > 0 ) pos = tsPos; } @@ -215,7 +215,7 @@ void RigStatisticsDataCache::sumCellScalarValues( double& sumValue ) for ( size_t i = 0; i < m_statisticsCalculator->timeStepCount(); i++ ) { double valueSum = 0.0; - this->sumCellScalarValues( i, valueSum ); + sumCellScalarValues( i, valueSum ); aggregatedSum += valueSum; } @@ -390,7 +390,7 @@ void RigStatisticsDataCache::computeHistogramStatisticsIfNeeded() { double min; double max; - this->minMaxCellScalarValues( min, max ); + minMaxCellScalarValues( min, max ); RigHistogramCalculator histCalc( min, max, m_numBins, &m_statsAllTimesteps.m_histogram ); @@ -410,7 +410,7 @@ void RigStatisticsDataCache::computeHistogramStatisticsIfNeeded( size_t timeStep { double min; double max; - this->minMaxCellScalarValues( timeStepIndex, min, max ); + minMaxCellScalarValues( timeStepIndex, min, max ); RigHistogramCalculator histCalc( min, max, m_numBins, &m_statsPrTs[timeStepIndex].m_histogram ); diff --git a/ApplicationLibCode/SocketInterface/RiaNNCCommands.cpp b/ApplicationLibCode/SocketInterface/RiaNNCCommands.cpp index 00dfb341d5..c173f3e151 100644 --- a/ApplicationLibCode/SocketInterface/RiaNNCCommands.cpp +++ b/ApplicationLibCode/SocketInterface/RiaNNCCommands.cpp @@ -415,7 +415,7 @@ public: if ( server->currentClient()->bytesAvailable() ) { - return this->interpretMore( server, server->currentClient() ); + return interpretMore( server, server->currentClient() ); } return false; diff --git a/ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp index db4aea3d27..521b03e41b 100644 --- a/ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp +++ b/ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp @@ -504,7 +504,7 @@ public: if ( server->currentClient()->bytesAvailable() ) { - return this->interpretMore( server, server->currentClient() ); + return interpretMore( server, server->currentClient() ); } return false; @@ -856,7 +856,7 @@ public: if ( server->currentClient()->bytesAvailable() ) { - return this->interpretMore( server, server->currentClient() ); + return interpretMore( server, server->currentClient() ); } return false; diff --git a/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp b/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp index d0696b0b69..ad8e955a3a 100644 --- a/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp +++ b/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp @@ -346,11 +346,11 @@ void RiaSocketServer::handleNextPendingConnection() if ( m_currentClient->bytesAvailable() ) { - bool isFinished = this->readCommandFromOctave(); + bool isFinished = readCommandFromOctave(); if ( isFinished ) { // Call ourselves recursively until there are none left, or until it can not be processed in one go. - this->handleNextPendingConnection(); + handleNextPendingConnection(); } } } diff --git a/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp b/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp index 5ded3c9d17..ff970acc63 100644 --- a/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp +++ b/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp @@ -57,11 +57,11 @@ public: { painter->save(); - switch ( this->style() ) + switch ( style() ) { case QwtColumnSymbol::Box: { - switch ( this->frameStyle() ) + switch ( frameStyle() ) { case QwtColumnSymbol::NoFrame: { @@ -75,8 +75,8 @@ public: } painter->fillRect( r, - this->palette().window() ); // This line here is the difference. Qwt adds a 1 - // to width and height. + palette().window() ); // This line here is the difference. Qwt adds a 1 + // to width and height. } break; default: @@ -121,9 +121,9 @@ public: , m_labelFontPointSize( labelFontPointSize ) , m_textColor( textColor ) { - this->setTickLength( QwtScaleDiv::MajorTick, 0 ); - this->setTickLength( QwtScaleDiv::MediumTick, 0 ); - this->setTickLength( QwtScaleDiv::MinorTick, 0 ); + setTickLength( QwtScaleDiv::MajorTick, 0 ); + setTickLength( QwtScaleDiv::MediumTick, 0 ); + setTickLength( QwtScaleDiv::MinorTick, 0 ); int minorTextLineCount = 0; int mediumTextLineCount = 0; @@ -183,7 +183,7 @@ public: auto posTickIt = m_posTickTypeAndTexts.find( v ); if ( posTickIt != m_posTickTypeAndTexts.end() ) { - if ( this->alignment() == BottomScale ) + if ( alignment() == BottomScale ) { if ( posTickIt->second.tickType == QwtScaleDiv::MediumTick ) { @@ -198,7 +198,7 @@ public: return createLabelFromString( posTickIt->second.label, -2 ); } } - else if ( this->alignment() == LeftScale ) + else if ( alignment() == LeftScale ) { if ( posTickIt->second.tickType == QwtScaleDiv::MediumTick ) { diff --git a/ApplicationLibCode/UserInterface/RiuAbstractLegendFrame.cpp b/ApplicationLibCode/UserInterface/RiuAbstractLegendFrame.cpp index 442850fd6b..d2705d9685 100644 --- a/ApplicationLibCode/UserInterface/RiuAbstractLegendFrame.cpp +++ b/ApplicationLibCode/UserInterface/RiuAbstractLegendFrame.cpp @@ -48,7 +48,7 @@ QSize RiuAbstractLegendFrame::sizeHint() const LayoutInfo layout( QSize( 200, 200 ) ); // Use default size layoutInfo( &layout ); - QFontMetrics fontMetrics( this->font() ); + QFontMetrics fontMetrics( font() ); QRect titleRect = fontMetrics.boundingRect( QRect( 0, 0, 200, 200 ), Qt::AlignLeft | Qt::TextWordWrap, m_title ); int preferredContentHeight = titleRect.height() + labelCount() * layout.lineSpacing + 1.0 * layout.lineSpacing; @@ -80,7 +80,7 @@ QSize RiuAbstractLegendFrame::minimumSizeHint() const LayoutInfo layout( QSize( 200, 200 ) ); // Use default size layoutInfo( &layout ); - QFontMetrics fontMetrics( this->font() ); + QFontMetrics fontMetrics( font() ); int preferredHeight = 0; int titleWidth = 0; @@ -123,7 +123,7 @@ void RiuAbstractLegendFrame::renderTo( QPainter* painter, const QRect& targetRec painter->save(); - painter->setFont( this->font() ); + painter->setFont( font() ); painter->translate( targetRect.topLeft() ); QPoint titlePos( layout.margins.left(), layout.margins.top() ); { @@ -132,7 +132,7 @@ void RiuAbstractLegendFrame::renderTo( QPainter* painter, const QRect& targetRec painter->setPen( QPen( textColor ) ); QTextDocument td; td.setDocumentMargin( 0.0 ); - td.setDefaultFont( this->font() ); + td.setDefaultFont( font() ); QString formattedTitle = m_title; td.setHtml( QString( "%2" ).arg( textColor.name() ).arg( formattedTitle.replace( "\n", "
" ) ) ); @@ -148,7 +148,7 @@ void RiuAbstractLegendFrame::renderTo( QPainter* painter, const QRect& targetRec painter->setPen( QPen( textColor ) ); QTextDocument td; td.setDocumentMargin( 0.0 ); - td.setDefaultFont( this->font() ); + td.setDefaultFont( font() ); td.setHtml( QString( "%2" ).arg( textColor.name() ).arg( tickLabel.second ) ); td.drawContents( painter ); painter->restore(); diff --git a/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp b/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp index 2567f4ab1d..46fb7eff7c 100644 --- a/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp +++ b/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp @@ -48,7 +48,7 @@ void RiuAbstractOverlayContentFrame::updateFontSize() { QFont font = this->font(); font.setPixelSize( caf::FontTools::pointSizeToPixelSize( RiaPreferences::current()->defaultPlotFontSize() ) ); - this->setFont( font ); + setFont( font ); } //-------------------------------------------------------------------------------------------------- @@ -81,7 +81,7 @@ void RiuTextOverlayContentFrame::renderTo( QPainter* painter, const QRect& targe updateLabelFont(); painter->save(); - painter->translate( targetRect.topLeft() + QPoint( this->contentsMargins().left(), this->contentsMargins().top() ) ); + painter->translate( targetRect.topLeft() + QPoint( contentsMargins().left(), contentsMargins().top() ) ); painter->setFont( m_textLabel->font() ); QTextDocument td; diff --git a/ApplicationLibCode/UserInterface/RiuCadNavigation.cpp b/ApplicationLibCode/UserInterface/RiuCadNavigation.cpp index 8c4e33be2f..d81d38333f 100644 --- a/ApplicationLibCode/UserInterface/RiuCadNavigation.cpp +++ b/ApplicationLibCode/UserInterface/RiuCadNavigation.cpp @@ -62,7 +62,7 @@ bool RiuCadNavigation::handleInputEvent( QInputEvent* inputEvent ) if ( me->button() == Qt::MiddleButton && me->modifiers() == Qt::NoModifier && isRotationEnabled() ) { - this->pickAndSetPointOfInterest( me->x(), me->y() ); + pickAndSetPointOfInterest( me->x(), me->y() ); m_trackball->startNavigation( cvf::ManipulatorTrackball::ROTATE, translatedMousePosX, translatedMousePosY ); m_isNavigating = true; diff --git a/ApplicationLibCode/UserInterface/RiuCategoryLegendFrame.cpp b/ApplicationLibCode/UserInterface/RiuCategoryLegendFrame.cpp index 3902c4130b..78e22e6379 100644 --- a/ApplicationLibCode/UserInterface/RiuCategoryLegendFrame.cpp +++ b/ApplicationLibCode/UserInterface/RiuCategoryLegendFrame.cpp @@ -30,7 +30,7 @@ RiuCategoryLegendFrame::~RiuCategoryLegendFrame() //-------------------------------------------------------------------------------------------------- void RiuCategoryLegendFrame::layoutInfo( LayoutInfo* layout ) const { - QFontMetrics fontMetrics( this->font() ); + QFontMetrics fontMetrics( font() ); QStringList titleLines = RiaTextStringTools::splitSkipEmptyParts( m_title, "\n" ); layout->charHeight = fontMetrics.height(); @@ -105,7 +105,7 @@ QRect RiuCategoryLegendFrame::labelRect( const LayoutInfo& layout, int index ) c float categoryHeight = static_cast( layout.colorBarRect.height() ) / labelCount(); const int posX = layout.tickEndX + layout.tickTextLeadSpace; int posY = static_cast( layout.colorBarRect.bottom() - ( index + 1 ) * categoryHeight ); - QString labelI = this->label( index ); - int width = this->fontMetrics().boundingRect( labelI ).width(); + QString labelI = label( index ); + int width = fontMetrics().boundingRect( labelI ).width(); return QRect( posX, posY, width, categoryHeight ); } diff --git a/ApplicationLibCode/UserInterface/RiuDepthQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuDepthQwtPlot.cpp index cafca1d551..fb8070a8e5 100644 --- a/ApplicationLibCode/UserInterface/RiuDepthQwtPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuDepthQwtPlot.cpp @@ -135,9 +135,9 @@ void RiuDepthQwtPlot::addCurve( const RimCase* rimCase, updateAxisScaling(); - this->applyFontSizes( false ); + applyFontSizes( false ); - this->replot(); + replot(); int caseId = rimCase->caseId(); @@ -193,7 +193,7 @@ void RiuDepthQwtPlot::contextMenuEvent( QContextMenuEvent* event ) { QMenu menu; - const int curveCount = this->itemList( QwtPlotItem::Rtti_PlotCurve ).count(); + const int curveCount = itemList( QwtPlotItem::Rtti_PlotCurve ).count(); QAction* act = menu.addAction( "Show Plot Data", this, SLOT( slotCurrentPlotDataInTextDialog() ) ); act->setEnabled( curveCount > 0 ); @@ -302,6 +302,6 @@ void RiuDepthQwtPlot::updateAxisScaling() double valRangeY = m_maxY - m_minY; if ( valRangeY == 0.0 ) valRangeY = 1.0; - this->setAxisScale( QwtAxis::YLeft, m_maxY + 0.02 * valRangeY, m_minY - 0.02 * valRangeY ); - this->setAxisScale( QwtAxis::XTop, m_minX - 0.02 * valRangeX, m_maxX + 0.1 * valRangeX ); + setAxisScale( QwtAxis::YLeft, m_maxY + 0.02 * valRangeY, m_minY - 0.02 * valRangeY ); + setAxisScale( QwtAxis::XTop, m_minX - 0.02 * valRangeX, m_maxX + 0.1 * valRangeX ); } diff --git a/ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp index 94c625a4e9..05b98b3d0d 100644 --- a/ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp @@ -47,24 +47,24 @@ void RiuDockedQwtPlot::applyFontSizes( bool replot /*= false*/ ) int axisFontSize = caf::FontTools::absolutePointSize( fontSize, caf::FontTools::RelativeSize::Medium ); int legendFontSize = caf::FontTools::absolutePointSize( fontSize, caf::FontTools::RelativeSize::Small ); - QwtText titleText = this->title(); + QwtText titleText = title(); QFont font = titleText.font(); font.setPixelSize( caf::FontTools::pointSizeToPixelSize( titleFontSize ) ); titleText.setFont( font ); - this->setTitle( titleText ); + setTitle( titleText ); for ( QwtAxis::Position axis : allAxes ) { - QwtText text = this->axisTitle( axis ); + QwtText text = axisTitle( axis ); QFont axisTitleFont = text.font(); axisTitleFont.setPixelSize( caf::FontTools::pointSizeToPixelSize( axisFontSize ) ); text.setFont( axisTitleFont ); - this->setAxisTitle( axis, text ); + setAxisTitle( axis, text ); - QFont valuesFont = this->axisFont( axis ); + QFont valuesFont = axisFont( axis ); valuesFont.setPixelSize( axisTitleFont.pixelSize() ); - this->setAxisFont( axis, valuesFont ); + setAxisFont( axis, valuesFont ); } if ( legend() ) diff --git a/ApplicationLibCode/UserInterface/RiuDraggableOverlayFrame.cpp b/ApplicationLibCode/UserInterface/RiuDraggableOverlayFrame.cpp index d12bc18ed6..edc0a1cdd9 100644 --- a/ApplicationLibCode/UserInterface/RiuDraggableOverlayFrame.cpp +++ b/ApplicationLibCode/UserInterface/RiuDraggableOverlayFrame.cpp @@ -40,7 +40,7 @@ RiuDraggableOverlayFrame::RiuDraggableOverlayFrame( QWidget* parent, const int s dropShadowEffect->setBlurRadius( 3.0 ); dropShadowEffect->setColor( QColor( 100, 100, 100, 100 ) ); setGraphicsEffect( dropShadowEffect ); - this->setContentsMargins( 1, 1, 1, 1 ); + setContentsMargins( 1, 1, 1, 1 ); m_layout = new QVBoxLayout( this ); m_layout->setContentsMargins( 0, 0, 0, 0 ); } @@ -68,7 +68,7 @@ void RiuDraggableOverlayFrame::setContentFrame( RiuAbstractOverlayContentFrame* m_contentFrame = contentFrame; m_layout->addWidget( m_contentFrame ); - this->adjustSize(); + adjustSize(); } //-------------------------------------------------------------------------------------------------- @@ -79,7 +79,7 @@ void RiuDraggableOverlayFrame::renderTo( QPainter* painter, const QRect& targetR if ( m_contentFrame ) { painter->save(); - painter->fillRect( targetRect, this->palette().color( QWidget::backgroundRole() ) ); + painter->fillRect( targetRect, palette().color( QWidget::backgroundRole() ) ); QRect contentRect = targetRect; contentRect.adjust( -1, -1, -1, -1 ); m_contentFrame->renderTo( painter, contentRect ); diff --git a/ApplicationLibCode/UserInterface/RiuFemResultTextBuilder.cpp b/ApplicationLibCode/UserInterface/RiuFemResultTextBuilder.cpp index 3e7ddbd536..0717d844ce 100644 --- a/ApplicationLibCode/UserInterface/RiuFemResultTextBuilder.cpp +++ b/ApplicationLibCode/UserInterface/RiuFemResultTextBuilder.cpp @@ -105,7 +105,7 @@ QString RiuFemResultTextBuilder::mainResultText() if ( !text.isEmpty() ) text += "\n"; - QString topoText = this->geometrySelectionText( "\n" ); + QString topoText = geometrySelectionText( "\n" ); text += topoText; appendDetails( text, formationDetails() ); text += "\n"; @@ -197,7 +197,7 @@ QString RiuFemResultTextBuilder::gridResultDetails() { RigGeoMechCaseData* eclipseCaseData = m_geomResDef->geoMechCase()->geoMechData(); - this->appendTextFromResultColors( eclipseCaseData, m_gridIndex, m_cellIndex, m_timeStepIndex, m_frameIndex, m_geomResDef, &text ); + appendTextFromResultColors( eclipseCaseData, m_gridIndex, m_cellIndex, m_timeStepIndex, m_frameIndex, m_geomResDef, &text ); if ( !text.isEmpty() ) { diff --git a/ApplicationLibCode/UserInterface/RiuFlowCharacteristicsPlot.cpp b/ApplicationLibCode/UserInterface/RiuFlowCharacteristicsPlot.cpp index e26fa9bb5e..4dc900c739 100644 --- a/ApplicationLibCode/UserInterface/RiuFlowCharacteristicsPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuFlowCharacteristicsPlot.cpp @@ -62,15 +62,15 @@ RiuFlowCharacteristicsPlot::RiuFlowCharacteristicsPlot( RimFlowCharacteristicsPl Q_ASSERT( m_plotDefinition ); QGridLayout* mainLayout = new QGridLayout(); - this->setLayout( mainLayout ); - this->layout()->setMargin( 3 ); - this->layout()->setSpacing( 3 ); + setLayout( mainLayout ); + layout()->setMargin( 3 ); + layout()->setSpacing( 3 ); // White background - QPalette pal = this->palette(); + QPalette pal = palette(); pal.setColor( QPalette::Window, Qt::white ); - this->setAutoFillBackground( true ); - this->setPalette( pal ); + setAutoFillBackground( true ); + setPalette( pal ); m_lorenzPlot = new QwtPlot( this ); m_flowCapVsStorageCapPlot = new QwtPlot( this ); diff --git a/ApplicationLibCode/UserInterface/RiuGeoQuestNavigation.cpp b/ApplicationLibCode/UserInterface/RiuGeoQuestNavigation.cpp index 58b7108aee..354513d914 100644 --- a/ApplicationLibCode/UserInterface/RiuGeoQuestNavigation.cpp +++ b/ApplicationLibCode/UserInterface/RiuGeoQuestNavigation.cpp @@ -62,7 +62,7 @@ bool RiuGeoQuestNavigation::handleInputEvent( QInputEvent* inputEvent ) if ( me->button() == Qt::LeftButton && isRotationEnabled() ) { - this->pickAndSetPointOfInterest( me->x(), me->y() ); + pickAndSetPointOfInterest( me->x(), me->y() ); m_trackball->startNavigation( cvf::ManipulatorTrackball::ROTATE, translatedMousePosX, translatedMousePosY ); m_isNavigating = true; @@ -113,7 +113,7 @@ bool RiuGeoQuestNavigation::handleInputEvent( QInputEvent* inputEvent ) if ( m_isZooming ) { int delta = 3 * ( m_lastPosY - me->y() ); - this->zoomAlongRay( m_zoomRay.p(), delta ); + zoomAlongRay( m_zoomRay.p(), delta ); m_lastPosX = me->x(); m_lastPosY = me->y(); } diff --git a/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp index 60c285f04c..ced8ef81ef 100644 --- a/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp @@ -104,8 +104,8 @@ RiuGridCrossQwtPlot::RiuGridCrossQwtPlot( RimGridCrossPlot* plot, QWidget* paren RiuQwtPlotTools::setCommonPlotBehaviour( qwtPlot() ); RiuQwtPlotTools::setDefaultAxes( qwtPlot() ); - this->installEventFilter( this ); - this->qwtPlot()->canvas()->installEventFilter( this ); + installEventFilter( this ); + qwtPlot()->canvas()->installEventFilter( this ); setInternalQwtLegendVisible( true ); @@ -177,11 +177,11 @@ void RiuGridCrossQwtPlot::setInternalQwtLegendVisible( bool visible ) if ( visible ) { QwtLegend* legend = new QwtLegend( this ); - this->qwtPlot()->insertLegend( legend, QwtPlot::BottomLegend ); + qwtPlot()->insertLegend( legend, QwtPlot::BottomLegend ); } else { - this->qwtPlot()->insertLegend( nullptr ); + qwtPlot()->insertLegend( nullptr ); } } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/UserInterface/RiuGridStatisticsHistogramWidget.cpp b/ApplicationLibCode/UserInterface/RiuGridStatisticsHistogramWidget.cpp index 3a0b8bb9bd..78b02fb125 100644 --- a/ApplicationLibCode/UserInterface/RiuGridStatisticsHistogramWidget.cpp +++ b/ApplicationLibCode/UserInterface/RiuGridStatisticsHistogramWidget.cpp @@ -49,7 +49,7 @@ RiuGridStatisticsHistogramWidget::RiuGridStatisticsHistogramWidget( QWidget* par void RiuGridStatisticsHistogramWidget::paintEvent( QPaintEvent* event ) { QPainter painter( this ); - this->draw( &painter, 0, 0, this->width() - 1, this->height() - 1 ); + draw( &painter, 0, 0, width() - 1, height() - 1 ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/UserInterface/RiuMainWindow.cpp b/ApplicationLibCode/UserInterface/RiuMainWindow.cpp index 1aee631a65..1a3e31575e 100644 --- a/ApplicationLibCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationLibCode/UserInterface/RiuMainWindow.cpp @@ -316,7 +316,7 @@ void RiuMainWindow::closeEvent( QCloseEvent* event ) return; } } - this->saveWinGeoAndDockToolBarLayout(); + saveWinGeoAndDockToolBarLayout(); QMainWindow::closeEvent( event ); } @@ -880,7 +880,7 @@ void RiuMainWindow::setResultInfo( const QString& info ) const //-------------------------------------------------------------------------------------------------- void RiuMainWindow::refreshViewActions() { - this->slotRefreshViewActions(); + slotRefreshViewActions(); } //================================================================================================== @@ -1802,7 +1802,7 @@ void RiuMainWindow::updateMemoryUsage() //-------------------------------------------------------------------------------------------------- void RiuMainWindow::showProcessMonitorDockPanel() { - RiuDockWidgetTools::showDockWidget( this->dockManager(), RiuDockWidgetTools::mainWindowProcessMonitorName() ); + RiuDockWidgetTools::showDockWidget( dockManager(), RiuDockWidgetTools::mainWindowProcessMonitorName() ); } //-------------------------------------------------------------------------------------------------- @@ -2010,7 +2010,7 @@ void RiuMainWindow::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( senderObj ); if ( treeView ) { diff --git a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp index 41e3998def..c4ff5b96fb 100644 --- a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp +++ b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp @@ -620,7 +620,7 @@ ads::CDockAreaWidget* RiuMainWindowBase::addTabbedWidgets( std::vector( this->sender() ); + QAction* action = dynamic_cast( sender() ); if ( action ) { QString layoutName = action->text(); @@ -636,7 +636,7 @@ void RiuMainWindowBase::setDefaultDockLayout() //-------------------------------------------------------------------------------------------------- void RiuMainWindowBase::setDockLayout() { - QAction* action = dynamic_cast( this->sender() ); + QAction* action = dynamic_cast( sender() ); if ( action ) { QString layoutName = action->text(); @@ -649,7 +649,7 @@ void RiuMainWindowBase::setDockLayout() //-------------------------------------------------------------------------------------------------- void RiuMainWindowBase::deleteDockLayout() { - QAction* action = dynamic_cast( this->sender() ); + QAction* action = dynamic_cast( sender() ); if ( action ) { QString name = action->text(); diff --git a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp index 68e03e2562..6fabe6a9bb 100644 --- a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp +++ b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp @@ -83,13 +83,13 @@ RiuMatrixPlotWidget::RiuMatrixPlotWidget( RimViewWindow* ownerViewWindow, RimReg // Configure main layout QHBoxLayout* mainLayout = new QHBoxLayout(); mainLayout->setContentsMargins( 15, 15, 15, 15 ); - this->setLayout( mainLayout ); + setLayout( mainLayout ); // White background QPalette palette = this->palette(); palette.setColor( QPalette::Window, Qt::white ); - this->setAutoFillBackground( true ); - this->setPalette( palette ); + setAutoFillBackground( true ); + setPalette( palette ); // Add plot to main layout m_plotWidget = new RiuQwtPlotWidget( nullptr, parent ); diff --git a/ApplicationLibCode/UserInterface/RiuMessagePanel.cpp b/ApplicationLibCode/UserInterface/RiuMessagePanel.cpp index 07a8ec4407..ddb9ee9e0f 100644 --- a/ApplicationLibCode/UserInterface/RiuMessagePanel.cpp +++ b/ApplicationLibCode/UserInterface/RiuMessagePanel.cpp @@ -81,7 +81,7 @@ void RiuMessagePanel::addMessage( RILogLevel messageLevel, const QString& msg ) { if ( messageLevel == RILogLevel::RI_LL_ERROR || messageLevel == RILogLevel::RI_LL_WARNING ) { - ads::CDockWidget* parentDockWidget = dynamic_cast( this->parent() ); + ads::CDockWidget* parentDockWidget = dynamic_cast( parent() ); if ( parentDockWidget && !parentDockWidget->isVisible() ) { parentDockWidget->toggleViewAction()->trigger(); diff --git a/ApplicationLibCode/UserInterface/RiuMohrsCirclePlot.cpp b/ApplicationLibCode/UserInterface/RiuMohrsCirclePlot.cpp index c3acf046f0..a4daa17ed7 100644 --- a/ApplicationLibCode/UserInterface/RiuMohrsCirclePlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuMohrsCirclePlot.cpp @@ -81,9 +81,9 @@ RiuMohrsCirclePlot::RiuMohrsCirclePlot( QWidget* parent ) // The legend will be deleted in the destructor of the plot or when // another legend is inserted. QwtLegend* legend = new QwtLegend( this ); - this->insertLegend( legend, BottomLegend ); + insertLegend( legend, BottomLegend ); - // this->setTitle(QString("SE")); + // setTitle(QString("SE")); } //-------------------------------------------------------------------------------------------------- @@ -101,7 +101,7 @@ void RiuMohrsCirclePlot::appendSelection( const RiuSelectionItem* selectionItem { m_viewToFollowAnimationFrom = nullptr; - if ( this->isVisible() ) + if ( isVisible() ) { Rim3dView* newFollowAnimView = nullptr; RiuGeoMechSelectionItem* geoMechSelectionItem = nullptr; @@ -132,7 +132,7 @@ void RiuMohrsCirclePlot::appendSelection( const RiuSelectionItem* selectionItem } else { - this->clearPlot(); + clearPlot(); } } @@ -145,7 +145,7 @@ void RiuMohrsCirclePlot::clearPlot() m_viewToFollowAnimationFrom = nullptr; - this->replot(); + replot(); } //-------------------------------------------------------------------------------------------------- @@ -153,7 +153,7 @@ void RiuMohrsCirclePlot::clearPlot() //-------------------------------------------------------------------------------------------------- void RiuMohrsCirclePlot::updateOnTimeStepChanged( Rim3dView* changedView ) { - if ( !this->isVisible() ) + if ( !isVisible() ) { return; } @@ -690,8 +690,8 @@ void RiuMohrsCirclePlot::setAxesScaleAndReplot() return; } - int canvasHeight = this->canvas()->height(); - int canvasWidth = this->canvas()->width(); + int canvasHeight = canvas()->height(); + int canvasWidth = canvas()->width(); const double minPlotWidth = xMax - xMin; const double minPlotHeight = yMax; @@ -715,10 +715,10 @@ void RiuMohrsCirclePlot::setAxesScaleAndReplot() yMaxDisplayed = heightToKeepAspectRatio; } - this->setAxisScale( QwtAxis::YLeft, 0, yMaxDisplayed ); - this->setAxisScale( QwtAxis::XBottom, xMin, xMaxDisplayed ); + setAxisScale( QwtAxis::YLeft, 0, yMaxDisplayed ); + setAxisScale( QwtAxis::XBottom, xMin, xMaxDisplayed ); - this->replot(); + replot(); } RiuGeoMechSelectionItem* RiuMohrsCirclePlot::extractGeoMechSelectionItem( const RiuSelectionItem* selectionItem, Rim3dView*& newFollowAnimView ) diff --git a/ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp b/ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp index be70889cc7..ce754fe567 100644 --- a/ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp +++ b/ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp @@ -66,7 +66,7 @@ public: QSize calculateSize( int width ) const { int pageWidth = width - 2 * m_margins; - QList pages = this->findChildren(); + QList pages = findChildren(); QSize fullSize( 0, 0 ); for ( auto page : pages ) { @@ -80,7 +80,7 @@ public: protected: QSize minimumSizeHint() const override { - QList pages = this->findChildren(); + QList pages = findChildren(); QSize fullSize( 0, 0 ); for ( auto page : pages ) { @@ -111,7 +111,7 @@ RiuMultiPlotBook::RiuMultiPlotBook( RimMultiPlot* plotDefinition, QWidget* paren { const int spacing = 8; - this->setContentsMargins( 0, 0, 0, 0 ); + setContentsMargins( 0, 0, 0, 0 ); m_layout = new QVBoxLayout( this ); m_layout->setContentsMargins( 0, 0, 0, 0 ); m_scrollArea = new QScrollArea( this ); @@ -133,14 +133,14 @@ RiuMultiPlotBook::RiuMultiPlotBook( RimMultiPlot* plotDefinition, QWidget* paren setAutoFillBackground( true ); - this->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding ); + setSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding ); setFocusPolicy( Qt::StrongFocus ); setAcceptDrops( true ); QSize pageSize = m_plotDefinition->pageLayout().fullRectPixels( RiaGuiApplication::applicationResolution() ).size(); applyPagePreviewBookSize( pageSize.width() ); - this->setObjectName( QString( "%1" ).arg( reinterpret_cast( this ) ) ); + setObjectName( QString( "%1" ).arg( reinterpret_cast( this ) ) ); applyLook(); } @@ -596,8 +596,8 @@ void RiuMultiPlotBook::createPages() { CAF_ASSERT( m_plotDefinition ); - QList> plotWidgets = this->visiblePlotWidgets(); - auto [rowCount, columnCount] = this->rowAndColumnCount( plotWidgets.size() ); + QList> plotWidgets = visiblePlotWidgets(); + auto [rowCount, columnCount] = rowAndColumnCount( plotWidgets.size() ); int rowsPerPage = m_plotDefinition->rowsPerPage(); int row = 0; @@ -676,7 +676,7 @@ void RiuMultiPlotBook::applyLook() { if ( m_previewMode ) { - this->setBackgroundRole( QPalette::Dark ); + setBackgroundRole( QPalette::Dark ); m_book->setBackgroundRole( QPalette::Dark ); } else @@ -685,7 +685,7 @@ void RiuMultiPlotBook::applyLook() newPalette.setColor( QPalette::Window, Qt::white ); setPalette( newPalette ); - this->setBackgroundRole( QPalette::Window ); + setBackgroundRole( QPalette::Window ); m_book->setBackgroundRole( QPalette::Window ); m_book->setPalette( newPalette ); } diff --git a/ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp b/ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp index 3f459b04e9..06fe932f40 100644 --- a/ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp +++ b/ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp @@ -114,7 +114,7 @@ RiuMultiPlotPage::RiuMultiPlotPage( RimPlotWindow* plotDefinition, QWidget* pare setFocusPolicy( Qt::StrongFocus ); setAcceptDrops( true ); - this->setObjectName( QString( "%1" ).arg( reinterpret_cast( this ) ) ); + setObjectName( QString( "%1" ).arg( reinterpret_cast( this ) ) ); applyLook(); @@ -636,7 +636,7 @@ void RiuMultiPlotPage::onLegendUpdated() //-------------------------------------------------------------------------------------------------- void RiuMultiPlotPage::refreshLegends() { - QList> legends = this->legendsForVisiblePlots(); + QList> legends = legendsForVisiblePlots(); for ( const auto& l : legends ) { l->setVisible( !l->isEmpty() ); @@ -649,7 +649,7 @@ void RiuMultiPlotPage::refreshLegends() //-------------------------------------------------------------------------------------------------- void RiuMultiPlotPage::updatePlotLayouts() { - QList> plotWidgets = this->visiblePlotWidgets(); + QList> plotWidgets = visiblePlotWidgets(); for ( auto p : plotWidgets ) p->updateLayout(); } @@ -661,16 +661,16 @@ void RiuMultiPlotPage::reinsertPlotWidgets() { clearGridLayout(); - QList> subTitles = this->subTitlesForVisiblePlots(); - QList> legends = this->legendsForVisiblePlots(); - QList> legendFrames = this->legendFramesForVisiblePlots(); - QList> plotWidgets = this->visiblePlotWidgets(); + QList> subTitles = subTitlesForVisiblePlots(); + QList> legends = legendsForVisiblePlots(); + QList> legendFrames = legendFramesForVisiblePlots(); + QList> plotWidgets = visiblePlotWidgets(); m_visibleIndexToPositionMapping.clear(); if ( !plotWidgets.empty() ) { - auto [rowCount, columnCount] = this->rowAndColumnCount( plotWidgets.size() ); + auto [rowCount, columnCount] = rowAndColumnCount( plotWidgets.size() ); int row = 0; int column = 0; diff --git a/ApplicationLibCode/UserInterface/RiuNightchartsWidget.cpp b/ApplicationLibCode/UserInterface/RiuNightchartsWidget.cpp index 4a7225a422..fd3eee59f6 100644 --- a/ApplicationLibCode/UserInterface/RiuNightchartsWidget.cpp +++ b/ApplicationLibCode/UserInterface/RiuNightchartsWidget.cpp @@ -64,19 +64,19 @@ void RiuNightchartsWidget::updateSizePolicy() { if ( m_showPie && m_showLegend ) { - this->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); + setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); } else if ( m_showPie && !m_showLegend ) { - this->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum ); + setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum ); } else if ( !m_showPie && m_showLegend ) { - this->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); + setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); } else { - this->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); + setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); } } @@ -108,7 +108,7 @@ QSize RiuNightchartsWidget::sizeHint() const if ( m_showLegend ) { - int lineHeight = this->fontMetrics().height(); + int lineHeight = fontMetrics().height(); int lineCount = m_chart.pieceCount(); int exactLegendHeight = ( lineCount + lineCount - 1 ) * lineHeight; @@ -158,8 +158,8 @@ void RiuNightchartsWidget::paintEvent( QPaintEvent* e ) legendMargin = 0; } - int w = ( this->width() - 2 * m_marginLeft - legendWidth - legendMargin ); - int h = ( this->height() - 2 * m_marginTop ); + int w = ( width() - 2 * m_marginLeft - legendWidth - legendMargin ); + int h = ( height() - 2 * m_marginTop ); int size = ( w < h ) ? w : h; @@ -184,7 +184,7 @@ void RiuNightchartsWidget::paintEvent( QPaintEvent* e ) void RiuNightchartsWidget::addItem( const QString& name, const QColor& color, float value ) { m_chart.addPiece( name, color, value ); - int textWidth = this->fontMetrics().boundingRect( name + " (00 %)" ).width(); + int textWidth = fontMetrics().boundingRect( name + " (00 %)" ).width(); m_maxNameWidth = textWidth > m_maxNameWidth ? textWidth : m_maxNameWidth; } diff --git a/ApplicationLibCode/UserInterface/RiuPickItemInfo.cpp b/ApplicationLibCode/UserInterface/RiuPickItemInfo.cpp index 2e012bef79..9e9eeebe36 100644 --- a/ApplicationLibCode/UserInterface/RiuPickItemInfo.cpp +++ b/ApplicationLibCode/UserInterface/RiuPickItemInfo.cpp @@ -112,9 +112,9 @@ bool RiuPickItemInfo::operator<( const RiuPickItemInfo& other ) const { return m_distanceAlongRay < other.distanceAlongRay(); } - else if ( this->polygonOffsetUnit() != other.polygonOffsetUnit() ) + else if ( polygonOffsetUnit() != other.polygonOffsetUnit() ) { - return this->polygonOffsetUnit() < other.polygonOffsetUnit(); + return polygonOffsetUnit() < other.polygonOffsetUnit(); } else if ( m_faceIdx != other.faceIdx() ) { diff --git a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp index ed8cdb5dd0..8c9cd355da 100644 --- a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp +++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp @@ -271,7 +271,7 @@ void RiuPlotMainWindow::closeEvent( QCloseEvent* event ) return; } } - this->saveWinGeoAndDockToolBarLayout(); + saveWinGeoAndDockToolBarLayout(); QMainWindow::closeEvent( event ); } @@ -748,7 +748,7 @@ RiuMessagePanel* RiuPlotMainWindow::messagePanel() //-------------------------------------------------------------------------------------------------- void RiuPlotMainWindow::showAndSetKeyboardFocusToSummaryPlotManager() { - auto dockWidget = RiuDockWidgetTools::findDockWidget( this->dockManager(), RiuDockWidgetTools::plotMainWindowPlotManagerName() ); + auto dockWidget = RiuDockWidgetTools::findDockWidget( dockManager(), RiuDockWidgetTools::plotMainWindowPlotManagerName() ); if ( dockWidget ) { dockWidget->setVisible( true ); @@ -983,7 +983,7 @@ void RiuPlotMainWindow::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( senderObj ); if ( treeView ) { diff --git a/ApplicationLibCode/UserInterface/RiuQwtCurvePointTracker.cpp b/ApplicationLibCode/UserInterface/RiuQwtCurvePointTracker.cpp index 083d566c6b..ab57583754 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtCurvePointTracker.cpp +++ b/ApplicationLibCode/UserInterface/RiuQwtCurvePointTracker.cpp @@ -42,7 +42,7 @@ RiuQwtCurvePointTracker::RiuQwtCurvePointTracker( QwtPlot* plot, bool isMainAxis , m_isMainAxisHorizontal( isMainAxisHorizontal ) , m_curveInfoTextProvider( curveInfoTextProvider ) { - this->setTrackerMode( QwtPicker::AlwaysOn ); + setTrackerMode( QwtPicker::AlwaysOn ); m_plotMarker = new QwtPlotMarker; // Have this marker always on top of all curves/plot items. @@ -85,7 +85,7 @@ bool RiuQwtCurvePointTracker::eventFilter( QObject* watched, QEvent* event ) { if ( event->type() == QEvent::Leave ) { - this->removeMarkerOnFocusLeave(); + removeMarkerOnFocusLeave(); } // pass the event on to the parent class diff --git a/ApplicationLibCode/UserInterface/RiuQwtLegendOverlayContentFrame.cpp b/ApplicationLibCode/UserInterface/RiuQwtLegendOverlayContentFrame.cpp index bde5e7e766..72cb5fcc5a 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtLegendOverlayContentFrame.cpp +++ b/ApplicationLibCode/UserInterface/RiuQwtLegendOverlayContentFrame.cpp @@ -47,7 +47,7 @@ void RiuQwtLegendOverlayContentFrame::setLegend( QwtLegend* legend ) void RiuQwtLegendOverlayContentFrame::renderTo( QPainter* painter, const QRect& targetRect ) { painter->save(); - painter->translate( targetRect.topLeft() + QPoint( this->contentsMargins().left(), this->contentsMargins().top() ) ); + painter->translate( targetRect.topLeft() + QPoint( contentsMargins().left(), contentsMargins().top() ) ); QRegion sourceRegion = visibleRegion(); render( painter, QPoint(), sourceRegion ); diff --git a/ApplicationLibCode/UserInterface/RiuQwtLinearScaleEngine.cpp b/ApplicationLibCode/UserInterface/RiuQwtLinearScaleEngine.cpp index 1a3d8ca96f..16bd5fa648 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtLinearScaleEngine.cpp +++ b/ApplicationLibCode/UserInterface/RiuQwtLinearScaleEngine.cpp @@ -26,9 +26,9 @@ QwtScaleDiv RiuQwtLinearScaleEngine::divideScaleWithExplicitIntervals( double x1, double x2, double majorStepInterval, double minorStepInterval ) { QwtInterval interval( x1, x2 ); - QwtInterval roundedInterval = this->align( interval, majorStepInterval ); - QList majorTicks = this->buildMajorTicks( roundedInterval, majorStepInterval ); - QList minorTicks = this->buildMajorTicks( roundedInterval, minorStepInterval ); + QwtInterval roundedInterval = align( interval, majorStepInterval ); + QList majorTicks = buildMajorTicks( roundedInterval, majorStepInterval ); + QList minorTicks = buildMajorTicks( roundedInterval, minorStepInterval ); return QwtScaleDiv( x1, x2, minorTicks, minorTicks, majorTicks ); } @@ -44,8 +44,8 @@ QwtScaleDiv RiuQwtLinearScaleEngine::divideScaleWithExplicitIntervalsAndRange( d double rangeEnd ) { QwtInterval tickInterval( tickStart, tickEnd ); - QList majorTicks = this->buildMajorTicks( tickInterval, majorStepInterval ); - QList minorTicks = this->buildMajorTicks( tickInterval, minorStepInterval ); + QList majorTicks = buildMajorTicks( tickInterval, majorStepInterval ); + QList minorTicks = buildMajorTicks( tickInterval, minorStepInterval ); return QwtScaleDiv( rangeStart, rangeEnd, minorTicks, minorTicks, majorTicks ); } diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotCurve.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotCurve.cpp index f2fbdfdfd5..618be610f0 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtPlotCurve.cpp +++ b/ApplicationLibCode/UserInterface/RiuQwtPlotCurve.cpp @@ -55,11 +55,11 @@ RiuQwtPlotCurve::RiuQwtPlotCurve( RimPlotCurve* ownerRimCurve, const QString& ti , QwtPlotCurve( title ) , m_showErrorBars( false ) { - this->setLegendAttribute( QwtPlotCurve::LegendShowLine, true ); - this->setLegendAttribute( QwtPlotCurve::LegendShowSymbol, true ); - this->setLegendAttribute( QwtPlotCurve::LegendShowBrush, true ); + setLegendAttribute( QwtPlotCurve::LegendShowLine, true ); + setLegendAttribute( QwtPlotCurve::LegendShowSymbol, true ); + setLegendAttribute( QwtPlotCurve::LegendShowBrush, true ); - this->setRenderHint( QwtPlotItem::RenderAntialiased, true ); + setRenderHint( QwtPlotItem::RenderAntialiased, true ); m_qwtCurveErrorBars = new QwtPlotIntervalCurve(); m_qwtCurveErrorBars->setStyle( QwtPlotIntervalCurve::CurveStyle::NoCurve ); diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotItemGroup.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotItemGroup.cpp index 6a25b43d8f..d06337f333 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtPlotItemGroup.cpp +++ b/ApplicationLibCode/UserInterface/RiuQwtPlotItemGroup.cpp @@ -34,7 +34,7 @@ RiuQwtPlotItemGroup::RiuQwtPlotItemGroup() //-------------------------------------------------------------------------------------------------- RiuQwtPlotItemGroup::~RiuQwtPlotItemGroup() { - this->detach(); + detach(); for ( QwtPlotItem* item : m_plotItems ) { delete item; diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotLegend.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotLegend.cpp index 32aa2f202f..500e97e76a 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtPlotLegend.cpp +++ b/ApplicationLibCode/UserInterface/RiuQwtPlotLegend.cpp @@ -78,7 +78,7 @@ QSize RiuQwtPlotLegend::sizeHint() const const QwtDynGridLayout* legendLayout = qobject_cast( contentsWidget()->layout() ); if ( legendLayout ) { - QMargins margins = this->contentsMargins(); + QMargins margins = contentsMargins(); auto widgetSize = size(); diff --git a/ApplicationLibCode/UserInterface/RiuResultQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuResultQwtPlot.cpp index 3cf3bf8516..ced34d866f 100644 --- a/ApplicationLibCode/UserInterface/RiuResultQwtPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuResultQwtPlot.cpp @@ -88,10 +88,10 @@ void RiuResultQwtPlot::addCurve( const RimCase* rimCase, plotCurve->attach( this ); m_plotCurves.push_back( plotCurve ); - this->setAxisScale( QwtAxis::XTop, QwtDate::toDouble( dateTimes.front() ), QwtDate::toDouble( dateTimes.back() ) ); - this->applyFontSizes( false ); + setAxisScale( QwtAxis::XTop, QwtDate::toDouble( dateTimes.front() ), QwtDate::toDouble( dateTimes.back() ) ); + applyFontSizes( false ); - this->replot(); + replot(); int caseId = rimCase->caseId(); @@ -165,7 +165,7 @@ void RiuResultQwtPlot::contextMenuEvent( QContextMenuEvent* event ) menuBuilder << "RicNewGridTimeHistoryCurveFeature"; - const int curveCount = this->itemList( QwtPlotItem::Rtti_PlotCurve ).count(); + const int curveCount = itemList( QwtPlotItem::Rtti_PlotCurve ).count(); QAction* act = menu.addAction( "Show Plot Data", this, SLOT( slotCurrentPlotDataInTextDialog() ) ); act->setEnabled( curveCount > 0 ); @@ -201,7 +201,7 @@ void RiuResultQwtPlot::setDefaults() // The legend will be deleted in the destructor of the plot or when // another legend is inserted. QwtLegend* legend = new QwtLegend( this ); - this->insertLegend( legend, BottomLegend ); + insertLegend( legend, BottomLegend ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp index 50a9331c65..566f1bf07b 100644 --- a/ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp @@ -177,7 +177,7 @@ QString RiuResultTextBuilder::mainResultText() text += "\n"; } - QString topoText = this->geometrySelectionText( "\n" ); + QString topoText = geometrySelectionText( "\n" ); text += topoText; appendDetails( text, formationDetails() ); text += "\n"; @@ -420,12 +420,12 @@ QString RiuResultTextBuilder::faultResultDetails() if ( m_eclipseView->faultResultSettings()->customFaultResult()->resultType() != RiaDefines::ResultCatType::ALLAN_DIAGRAMS ) { text += "Fault result data:\n"; - this->appendTextFromResultColors( eclipseCaseData, - m_gridIndex, - m_cellIndex, - m_timeStepIndex, - m_eclipseView->currentFaultResultColors(), - &text ); + appendTextFromResultColors( eclipseCaseData, + m_gridIndex, + m_cellIndex, + m_timeStepIndex, + m_eclipseView->currentFaultResultColors(), + &text ); } } } diff --git a/ApplicationLibCode/UserInterface/RiuRmsNavigation.cpp b/ApplicationLibCode/UserInterface/RiuRmsNavigation.cpp index 520c858f1e..0d8d10c8ce 100644 --- a/ApplicationLibCode/UserInterface/RiuRmsNavigation.cpp +++ b/ApplicationLibCode/UserInterface/RiuRmsNavigation.cpp @@ -62,7 +62,7 @@ bool RiuRmsNavigation::handleInputEvent( QInputEvent* inputEvent ) if ( me->button() == Qt::MiddleButton && isRotationEnabled() ) { - this->pickAndSetPointOfInterest( me->x(), me->y() ); + pickAndSetPointOfInterest( me->x(), me->y() ); m_trackball->startNavigation( cvf::ManipulatorTrackball::ROTATE, translatedMousePosX, translatedMousePosY ); m_isNavigating = true; @@ -138,7 +138,7 @@ bool RiuRmsNavigation::handleInputEvent( QInputEvent* inputEvent ) if ( m_isZooming ) { int delta = -3 * ( m_lastPosY - me->y() ); - this->zoomAlongRay( m_zoomRay.p(), delta ); + zoomAlongRay( m_zoomRay.p(), delta ); m_lastPosX = me->x(); m_lastPosY = me->y(); } diff --git a/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.cpp b/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.cpp index 33f51b8a6c..e20177aa85 100644 --- a/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.cpp +++ b/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.cpp @@ -90,7 +90,7 @@ void RiuScalarMapperLegendFrame::setScalarMapper( cvf::ScalarMapper* scalarMappe //-------------------------------------------------------------------------------------------------- void RiuScalarMapperLegendFrame::layoutInfo( LayoutInfo* layout ) const { - QFontMetrics fontMetrics( this->font() ); + QFontMetrics fontMetrics( font() ); QStringList titleLines = RiaTextStringTools::splitSkipEmptyParts( m_title, "\n" ); layout->charHeight = fontMetrics.height(); @@ -208,9 +208,9 @@ QRect RiuScalarMapperLegendFrame::labelRect( const LayoutInfo& layout, int index { const int posX = layout.tickEndX + layout.tickTextLeadSpace; - QString labelI = this->label( index ); + QString labelI = label( index ); - int width = this->fontMetrics().boundingRect( labelI ).width() + 4; + int width = fontMetrics().boundingRect( labelI ).width() + 4; int height = layout.lineSpacing; int posY = layout.colorBarRect.bottom() - layout.tickYPixelPos[index]; diff --git a/ApplicationLibCode/UserInterface/RiuSimpleHistogramWidget.cpp b/ApplicationLibCode/UserInterface/RiuSimpleHistogramWidget.cpp index c674a33e93..af32626aed 100644 --- a/ApplicationLibCode/UserInterface/RiuSimpleHistogramWidget.cpp +++ b/ApplicationLibCode/UserInterface/RiuSimpleHistogramWidget.cpp @@ -51,7 +51,7 @@ RiuSimpleHistogramWidget::RiuSimpleHistogramWidget( const QString& objectName, Q void RiuSimpleHistogramWidget::paintEvent( QPaintEvent* event ) { QPainter painter( this ); - this->draw( &painter, 0, 0, this->width() - 1, this->height() - 1 ); + draw( &painter, 0, 0, width() - 1, height() - 1 ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/UserInterface/RiuSummaryMultiPlotBook.cpp b/ApplicationLibCode/UserInterface/RiuSummaryMultiPlotBook.cpp index 0b945c6b46..ac39f55635 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryMultiPlotBook.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryMultiPlotBook.cpp @@ -48,7 +48,7 @@ void RiuSummaryMultiPlotBook::createPages() { CAF_ASSERT( m_plotDefinition ); - QList> plotWidgets = this->visiblePlotWidgets(); + QList> plotWidgets = visiblePlotWidgets(); int columns = std::max( 1, m_plotDefinition->columnCount() ); int rowsPerPage = m_plotDefinition->rowsPerPage(); diff --git a/ApplicationLibCode/UserInterface/RiuSummaryMultiPlotPage.cpp b/ApplicationLibCode/UserInterface/RiuSummaryMultiPlotPage.cpp index e5507de3dd..69a09f1864 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryMultiPlotPage.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryMultiPlotPage.cpp @@ -70,10 +70,10 @@ void RiuSummaryMultiPlotPage::reinsertPlotWidgets() int nCells = cols * rows; reservePlaceholders( nCells - nPlots ); - QList> subTitles = this->subTitlesForVisiblePlots(); - QList> legends = this->legendsForVisiblePlots(); - QList> legendFrames = this->legendFramesForVisiblePlots(); - QList> plotWidgets = this->visiblePlotWidgets(); + QList> subTitles = subTitlesForVisiblePlots(); + QList> legends = legendsForVisiblePlots(); + QList> legendFrames = legendFramesForVisiblePlots(); + QList> plotWidgets = visiblePlotWidgets(); m_visibleIndexToPositionMapping.clear(); diff --git a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp index a48bcfd202..e7ce07ff71 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp @@ -60,7 +60,7 @@ RiuSummaryVectorSelectionDialog::RiuSummaryVectorSelectionDialog( QWidget* paren mainLayout->addLayout( labelLayout ); - m_addrSelWidget->summaryAddressSelection()->setFieldChangedHandler( [this]() { this->updateLabel(); } ); + m_addrSelWidget->summaryAddressSelection()->setFieldChangedHandler( [this]() { updateLabel(); } ); updateLabel(); } @@ -229,7 +229,7 @@ RiuSummaryVectorSelectionUi* RiuSummaryVectorSelectionDialog::summaryAddressSele void RiuSummaryVectorSelectionDialog::updateLabel() { QString curveAddressText; - std::vector sumCasePairs = this->summaryAddressSelection()->selection(); + std::vector sumCasePairs = summaryAddressSelection()->selection(); if ( sumCasePairs.size() == 1 ) { curveAddressText = sumCasePairs.front().curveDefinitionText(); diff --git a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.cpp b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.cpp index d10d29c81e..d366550c8f 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.cpp @@ -37,7 +37,7 @@ RiuSummaryVectorSelectionWidgetCreator::RiuSummaryVectorSelectionWidgetCreator() { m_summaryAddressSelection = std::unique_ptr( new RiuSummaryVectorSelectionUi() ); - this->setPdmObject( m_summaryAddressSelection.get() ); + setPdmObject( m_summaryAddressSelection.get() ); } //-------------------------------------------------------------------------------------------------- @@ -45,7 +45,7 @@ RiuSummaryVectorSelectionWidgetCreator::RiuSummaryVectorSelectionWidgetCreator() //-------------------------------------------------------------------------------------------------- RiuSummaryVectorSelectionWidgetCreator::~RiuSummaryVectorSelectionWidgetCreator() { - this->setPdmObject( nullptr ); + setPdmObject( nullptr ); } //-------------------------------------------------------------------------------------------------- @@ -156,7 +156,7 @@ void RiuSummaryVectorSelectionWidgetCreator::configureAndUpdateFields( int { caf::PdmUiFieldHandle* field = dynamic_cast( uiItems[i] ); - caf::PdmUiFieldEditorHandle* fieldEditor = findOrCreateFieldEditor( this->widget(), field, uiConfigName ); + caf::PdmUiFieldEditorHandle* fieldEditor = findOrCreateFieldEditor( widget(), field, uiConfigName ); if ( fieldEditor ) { @@ -165,7 +165,7 @@ void RiuSummaryVectorSelectionWidgetCreator::configureAndUpdateFields( int if ( fieldCombinedWidget ) { - fieldCombinedWidget->setParent( this->widget() ); + fieldCombinedWidget->setParent( widget() ); layout->insertWidget( currentWidgetIndex++, fieldCombinedWidget ); } else @@ -179,7 +179,7 @@ void RiuSummaryVectorSelectionWidgetCreator::configureAndUpdateFields( int QWidget* fieldLabelWidget = fieldEditor->labelWidget(); if ( fieldLabelWidget ) { - fieldLabelWidget->setParent( this->widget() ); + fieldLabelWidget->setParent( widget() ); layout->insertWidget( currentWidgetIndex++, fieldLabelWidget ); @@ -194,8 +194,8 @@ void RiuSummaryVectorSelectionWidgetCreator::configureAndUpdateFields( int if ( fieldEditorWidget ) { - fieldEditorWidget->setParent( this->widget() ); // To make sure this widget has the current - // group box as parent. + fieldEditorWidget->setParent( widget() ); // To make sure this widget has the current + // group box as parent. layout->insertWidget( currentWidgetIndex++, fieldEditorWidget ); } @@ -212,7 +212,7 @@ void RiuSummaryVectorSelectionWidgetCreator::configureAndUpdateFields( int //-------------------------------------------------------------------------------------------------- QMinimizePanel* RiuSummaryVectorSelectionWidgetCreator::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; diff --git a/ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp b/ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp index c568371768..3da8e5ab5b 100644 --- a/ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp +++ b/ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp @@ -50,7 +50,7 @@ QSize RiuTextContentFrame::sizeHint() const LayoutInfo layout( QSize( 200, 100 ) ); // Use default size layoutInfo( &layout ); - QFontMetrics fontMetrics( this->font() ); + QFontMetrics fontMetrics( font() ); QRect titleRect = fontMetrics.boundingRect( QRect( 0, 0, 2000, 200 ), Qt::AlignLeft | Qt::TextWordWrap, m_title ); QRect textRect = fontMetrics.boundingRect( QRect( 0, 0, 2000, 200 ), Qt::AlignLeft | Qt::TextWordWrap, m_text ); @@ -71,11 +71,11 @@ QSize RiuTextContentFrame::minimumSizeHint() const { LayoutInfo layout( QSize( 200, 100 ) ); // Use default size layoutInfo( &layout ); - QFont titleFont = this->font(); + QFont titleFont = font(); titleFont.setBold( true ); QFontMetrics fontMetrics( titleFont ); QRect titleRect = fontMetrics.boundingRect( QRect( 0, 0, 2000, 200 ), Qt::AlignLeft | Qt::TextWordWrap, m_title ); - fontMetrics = QFontMetrics( this->font() ); + fontMetrics = QFontMetrics( font() ); QRect textRect = fontMetrics.boundingRect( QRect( 0, 0, 2000, 200 ), Qt::AlignLeft | Qt::TextWordWrap, m_text ); int preferredContentHeight = titleRect.height() + layout.lineSpacing + textRect.height(); @@ -101,7 +101,7 @@ void RiuTextContentFrame::renderTo( QPainter* painter, const QRect& targetRect ) painter->save(); - painter->setFont( this->font() ); + painter->setFont( font() ); painter->translate( targetRect.topLeft() ); { @@ -110,7 +110,7 @@ void RiuTextContentFrame::renderTo( QPainter* painter, const QRect& targetRect ) painter->setPen( QPen( textColor ) ); QTextDocument td; td.setDocumentMargin( 0.0 ); - td.setDefaultFont( this->font() ); + td.setDefaultFont( font() ); QString formattedTitle = m_title; td.setHtml( QString( "%2" ).arg( textColor.name() ).arg( formattedTitle.replace( "\n", "
" ) ) ); @@ -125,7 +125,7 @@ void RiuTextContentFrame::renderTo( QPainter* painter, const QRect& targetRect ) QTextDocument td; td.setDocumentMargin( 0.0 ); - td.setDefaultFont( this->font() ); + td.setDefaultFont( font() ); QString formattedTitle = m_text; td.setHtml( QString( "%2" ).arg( textColor.name() ).arg( formattedTitle.replace( "\n", "
" ) ) ); @@ -151,7 +151,7 @@ void RiuTextContentFrame::paintEvent( QPaintEvent* e ) //-------------------------------------------------------------------------------------------------- void RiuTextContentFrame::layoutInfo( LayoutInfo* layout ) const { - QFontMetrics fontMetrics( this->font() ); + QFontMetrics fontMetrics( font() ); QStringList titleLines = RiaTextStringTools::splitSkipEmptyParts( m_text, "\n" ); layout->charHeight = fontMetrics.height(); diff --git a/ApplicationLibCode/UserInterface/RiuTextDialog.cpp b/ApplicationLibCode/UserInterface/RiuTextDialog.cpp index 4e098f526b..7829f4e18d 100644 --- a/ApplicationLibCode/UserInterface/RiuTextDialog.cpp +++ b/ApplicationLibCode/UserInterface/RiuTextDialog.cpp @@ -60,7 +60,7 @@ void RiuQPlainTextEdit::keyPressEvent( QKeyEvent* e ) //-------------------------------------------------------------------------------------------------- void RiuQPlainTextEdit::slotCopyContentToClipboard() { - QTextCursor cursor( this->textCursor() ); + QTextCursor cursor( textCursor() ); QString textForClipboard; @@ -75,7 +75,7 @@ void RiuQPlainTextEdit::slotCopyContentToClipboard() if ( textForClipboard.isEmpty() ) { - textForClipboard = this->toPlainText(); + textForClipboard = toPlainText(); } if ( !textForClipboard.isEmpty() ) @@ -93,7 +93,7 @@ void RiuQPlainTextEdit::slotCopyContentToClipboard() //-------------------------------------------------------------------------------------------------- void RiuQPlainTextEdit::slotSelectAll() { - this->selectAll(); + selectAll(); } //-------------------------------------------------------------------------------------------------- @@ -116,7 +116,7 @@ void RiuQPlainTextEdit::slotExportToFile() { QString defaultDir = RicAsciiExportSummaryPlotFeature::defaultExportDir(); auto fileName = RicAsciiExportSummaryPlotFeature::getFileNameFromUserDialog( dialog->description(), defaultDir ); - RicAsciiExportSummaryPlotFeature::exportTextToFile( fileName, this->toPlainText() ); + RicAsciiExportSummaryPlotFeature::exportTextToFile( fileName, toPlainText() ); } } @@ -197,7 +197,7 @@ RiuTabbedTextDialog::RiuTabbedTextDialog( RiuTabbedTextProvider* textProvider, Q connect( m_tabWidget, SIGNAL( currentChanged( int ) ), this, SLOT( slotTabChanged( int ) ) ); CVF_ASSERT( m_textProvider->isValid() ); - this->setWindowTitle( m_textProvider->description() ); + setWindowTitle( m_textProvider->description() ); for ( int tabIndex = 0; tabIndex < m_textProvider->tabCount(); ++tabIndex ) { diff --git a/ApplicationLibCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp b/ApplicationLibCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp index e58ba531b1..9c2feabf3f 100644 --- a/ApplicationLibCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp @@ -220,7 +220,7 @@ void RiuTofAccumulatedPhaseFractionsPlot::setDefaults() // The legend will be deleted in the destructor of the plot or when // another legend is inserted. QwtLegend* legend = new QwtLegend( this ); - this->insertLegend( legend, BottomLegend ); + insertLegend( legend, BottomLegend ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/UserInterface/RiuViewer.cpp b/ApplicationLibCode/UserInterface/RiuViewer.cpp index 75181b43ca..e6d99204af 100644 --- a/ApplicationLibCode/UserInterface/RiuViewer.cpp +++ b/ApplicationLibCode/UserInterface/RiuViewer.cpp @@ -109,8 +109,8 @@ RiuViewer::RiuViewer( const QGLFormat& format, QWidget* parent ) overlayItemsRendering()->addOverlayItem( m_axisCross.p() ); m_showAxisCross = true; - this->enableOverlayPainting( true ); - this->setReleaseOGLResourcesEachFrame( true ); + enableOverlayPainting( true ); + setReleaseOGLResourcesEachFrame( true ); // Info Text m_infoLabel = new QLabel(); @@ -215,7 +215,7 @@ RiuViewer::RiuViewer( const QGLFormat& format, QWidget* parent ) m_scaleLegend->setOrientation( caf::OverlayScaleLegend::HORIZONTAL ); m_comparisonWindowMover = new RiuComparisonViewMover( this ); - this->setComparisonViewToFollowAnimation( false ); + setComparisonViewToFollowAnimation( false ); m_fontPointSize = caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultSceneFontSize() ); } @@ -281,7 +281,7 @@ void RiuViewer::setDefaultView() //-------------------------------------------------------------------------------------------------- void RiuViewer::mouseReleaseEvent( QMouseEvent* event ) { - if ( !this->canRender() ) return; + if ( !canRender() ) return; if ( event->button() == Qt::LeftButton ) { @@ -421,18 +421,18 @@ void RiuViewer::paintOverlayItems( QPainter* painter ) if ( m_showInfoText ) columnWidth = std::max( columnWidth, m_infoLabel->sizeHint().width() ); - int columnPos = this->width() - columnWidth - margin - edgeAxisFrameBorderWidth; + int columnPos = width() - columnWidth - margin - edgeAxisFrameBorderWidth; - if ( this->isComparisonViewActive() ) + if ( isComparisonViewActive() ) { Rim3dView* compView = dynamic_cast( m_rimView.p() )->activeComparisonView(); if ( compView ) { columnWidth = 200; - // int sliderPos = this->width() * this->comparisonViewVisibleNormalizedRect().min().x(); - int sliderPos = 0.5 * this->width(); - int compViewItemsXPos = sliderPos + 0.5 * ( this->width() - sliderPos ) - 0.5 * columnWidth; + // int sliderPos = width() * comparisonViewVisibleNormalizedRect().min().x(); + int sliderPos = 0.5 * width(); + int compViewItemsXPos = sliderPos + 0.5 * ( width() - sliderPos ) - 0.5 * columnWidth; columnPos = 0.5 * sliderPos - 0.5 * columnWidth; if ( m_showInfoText ) @@ -502,7 +502,7 @@ void RiuViewer::paintOverlayItems( QPainter* painter ) yPos += m_animationProgress->height() + margin; } - if ( m_showInfoText && !this->isComparisonViewActive() ) + if ( m_showInfoText && !isComparisonViewActive() ) { QPoint topLeft = QPoint( columnPos, yPos ); m_infoLabel->resize( columnWidth, m_infoLabel->sizeHint().height() ); @@ -514,12 +514,12 @@ void RiuViewer::paintOverlayItems( QPainter* painter ) yPos += m_infoLabel->height() + margin; } - else if ( !this->isComparisonViewActive() ) + else if ( !isComparisonViewActive() ) { m_infoPickArea = QRect(); } - if ( m_showHistogram && !this->isComparisonViewActive() ) + if ( m_showHistogram && !isComparisonViewActive() ) { m_histogramWidget->resize( columnWidth, 40 ); m_histogramWidget->render( painter, QPoint( columnPos, yPos ) ); @@ -528,9 +528,8 @@ void RiuViewer::paintOverlayItems( QPainter* painter ) if ( m_showVersionInfo ) // Version Label { - QSize size( m_versionInfoLabel->sizeHint().width(), m_versionInfoLabel->sizeHint().height() ); - QPoint pos( this->width() - size.width() - margin - edgeAxisFrameBorderWidth, - this->height() - size.height() - margin - edgeAxisFrameBorderHeight ); + QSize size( m_versionInfoLabel->sizeHint().width(), m_versionInfoLabel->sizeHint().height() ); + QPoint pos( width() - size.width() - margin - edgeAxisFrameBorderWidth, height() - size.height() - margin - edgeAxisFrameBorderHeight ); m_versionInfoLabel->resize( size.width(), size.height() ); m_versionInfoLabel->render( painter, pos ); } @@ -654,13 +653,13 @@ void RiuViewer::showGridBox( bool enable ) { if ( enable ) { - this->addStaticModelOnce( m_gridBoxGenerator->model(), false ); - this->addStaticModelOnce( m_comparisonGridBoxGenerator->model(), true ); + addStaticModelOnce( m_gridBoxGenerator->model(), false ); + addStaticModelOnce( m_comparisonGridBoxGenerator->model(), true ); } else { - this->removeStaticModel( m_gridBoxGenerator->model() ); - this->removeStaticModel( m_comparisonGridBoxGenerator->model() ); + removeStaticModel( m_gridBoxGenerator->model() ); + removeStaticModel( m_comparisonGridBoxGenerator->model() ); } } @@ -1033,7 +1032,7 @@ void RiuViewer::optimizeClippingPlanes() if ( m_showWindowEdgeAxes ) { m_windowEdgeAxisOverlay->setDisplayCoordTransform( m_rimView->displayCoordTransform().p() ); - m_windowEdgeAxisOverlay->updateFromCamera( this->mainCamera() ); + m_windowEdgeAxisOverlay->updateFromCamera( mainCamera() ); } m_gridBoxGenerator->updateFromCamera( mainCamera() ); diff --git a/ApplicationLibCode/UserInterface/RiuWellAllocationPlot.cpp b/ApplicationLibCode/UserInterface/RiuWellAllocationPlot.cpp index 9e0d94e895..8717cd2210 100644 --- a/ApplicationLibCode/UserInterface/RiuWellAllocationPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuWellAllocationPlot.cpp @@ -45,9 +45,9 @@ RiuWellAllocationPlot::RiuWellAllocationPlot( RimWellAllocationPlot* plotDefinit Q_ASSERT( m_plotDefinition ); QVBoxLayout* mainLayout = new QVBoxLayout(); - this->setLayout( mainLayout ); - this->layout()->setMargin( 0 ); - this->layout()->setSpacing( 2 ); + setLayout( mainLayout ); + layout()->setMargin( 0 ); + layout()->setSpacing( 2 ); m_titleLabel = new QLabel( this ); m_titleLabel->setWordWrap( true ); @@ -61,10 +61,10 @@ RiuWellAllocationPlot::RiuWellAllocationPlot( RimWellAllocationPlot* plotDefinit m_titleLabel->setFont( font ); // White background - QPalette pal = this->palette(); + QPalette pal = palette(); pal.setColor( QPalette::Window, Qt::white ); - this->setAutoFillBackground( true ); - this->setPalette( pal ); + setAutoFillBackground( true ); + setPalette( pal ); mainLayout->addWidget( m_titleLabel ); diff --git a/ApplicationLibCode/UserInterface/RiuWellLogPlot.cpp b/ApplicationLibCode/UserInterface/RiuWellLogPlot.cpp index a1fbacb8d0..466fb8a6c2 100644 --- a/ApplicationLibCode/UserInterface/RiuWellLogPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuWellLogPlot.cpp @@ -128,9 +128,9 @@ bool RiuWellLogPlot::showYAxis( int row, int column ) const //-------------------------------------------------------------------------------------------------- void RiuWellLogPlot::reinsertScrollbar() { - QList> plotWidgets = this->visiblePlotWidgets(); - int colCount = this->m_gridLayout->columnCount(); - int rowCount = this->m_gridLayout->rowCount(); + QList> plotWidgets = visiblePlotWidgets(); + int colCount = m_gridLayout->columnCount(); + int rowCount = m_gridLayout->rowCount(); if ( depthTrackPlot() && depthTrackPlot()->depthOrientation() == RiaDefines::Orientation::HORIZONTAL ) {