OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#10367 Janitor: Remove unneccessary 'this' pointers

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

8
ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp
View File

@@ -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<double, double> Rim3dWellLogCurve::findCurveValueRange()
std::vector<double> values;
std::vector<double> 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<float>::infinity() && m_maxCurveDataValue == std::numeric_limits<float>::infinity() )
{
this->resetMinMaxValues();
resetMinMaxValues();
}
}
@@ -253,7 +253,7 @@ void Rim3dWellLogCurve::defineEditorAttribute( const caf::PdmFieldHandle* field,
//--------------------------------------------------------------------------------------------------
void Rim3dWellLogCurve::initAfterRead()
{
this->createAutoName();
createAutoName();
}
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp
View File

@@ -170,7 +170,7 @@ void Rim3dWellLogExtractionCurve::curveValuesAndMds( std::vector<double>* 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<double, double> Rim3dWellLogExtractionCurve::findCurveValueRange()
{
std::vector<double> values;
std::vector<double> 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 );

4
ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp
View File

@@ -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 );
}

4
ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp
View File

@@ -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 );
}

4
ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp
View File

@@ -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 );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp
View File

@@ -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 );
}
}
}

4
ApplicationLibCode/ProjectDataModel/WellLog/RimRftTopologyCurve.cpp
View File

@@ -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 )
{

14
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurve.cpp
View File

@@ -162,19 +162,11 @@ void RimWellLogCurve::setPropertyAndDepthsAndErrors( const std::vector<double>&
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<double>&
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 )
{

8
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp
View File

@@ -502,7 +502,7 @@ void RimWellLogCurveCommonDataSource::analyseCurvesAndTracks()
std::vector<RimWellLogCurve*> curves = parentPlot->descendantsIncludingThisOfType<RimWellLogCurve>();
std::vector<RimWellLogTrack*> tracks = parentPlot->descendantsIncludingThisOfType<RimWellLogTrack>();
this->analyseCurvesAndTracks( curves, tracks );
analyseCurvesAndTracks( curves, tracks );
}
}
@@ -705,7 +705,7 @@ void RimWellLogCurveCommonDataSource::applyDataSourceChanges()
auto curves = parentPlot->descendantsIncludingThisOfType<RimWellLogCurve>();
auto tracks = parentPlot->descendantsIncludingThisOfType<RimWellLogTrack>();
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<caf::PdmOptionItemInfo> RimWellLogCurveCommonDataSource::calculateValueOpt
{
QList<caf::PdmOptionItemInfo> options;
this->analyseCurvesAndTracks();
analyseCurvesAndTracks();
if ( fieldNeedingOptions == &m_case )
{

46
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp
View File

@@ -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<caf::PdmOptionItemInfo> RimWellLogExtractionCurve::calculateValueOptions(
}
else if ( fieldNeedingOptions == &m_simWellName )
{
std::set<QString> sortedWellNames = this->sortedSimWellNames();
std::set<QString> sortedWellNames = sortedSimWellNames();
caf::IconProvider simWellIcon( ":/Well.svg" );
for ( const QString& wname : sortedWellNames )

18
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp
View File

@@ -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();
}

32
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp
View File

@@ -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<RimWellLogTrack>();
@@ -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 );
}
//--------------------------------------------------------------------------------------------------

18
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
View File

@@ -935,7 +935,7 @@ void RimWellLogTrack::updateLegend()
//--------------------------------------------------------------------------------------------------
QString RimWellLogTrack::asciiDataForPlotExport() const
{
QString out = "\n" + this->description() + "\n";
QString out = "\n" + description() + "\n";
std::vector<QString> curveNames;
std::vector<double> 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<RimPlotWindow>();
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;
}

2
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp
View File

@@ -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 );
}
}