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

Change API for PdmObjectHandle and PdmFieldHandle

Browse Source 
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
This commit is contained in:
Magne Sjaastad
2023-05-12 21:41:34 +02:00
committed by GitHub
parent 37e29a0f68
commit 0c90f67dcc
510 changed files with 1651 additions and 3111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,8 +158,7 @@ RimEnsembleWellLogCurveSet::RimEnsembleWellLogCurveSet()
//--------------------------------------------------------------------------------------------------
RimEnsembleWellLogCurveSet::~RimEnsembleWellLogCurveSet()
{
RimWellLogTrack* plotTrack = nullptr;
firstAncestorOrThisOfType( plotTrack );
auto plotTrack = firstAncestorOrThisOfType<RimWellLogTrack>();
if ( plotTrack && plotTrack->viewer() )
{
if ( m_legendOverlayFrame )
@@ -210,8 +209,7 @@ void RimEnsembleWellLogCurveSet::loadDataAndUpdate( bool updateParentPlot )
if ( updateParentPlot )
{
RimWellLogTrack* parentPlot;
firstAncestorOrThisOfTypeAsserted( parentPlot );
auto parentPlot = firstAncestorOrThisOfTypeAsserted<RimWellLogTrack>();
parentPlot->viewer()->scheduleReplot();
}
}
@@ -252,8 +250,7 @@ void RimEnsembleWellLogCurveSet::reattachPlotCurves()
m_qwtPlotCurveForLegendText->detach();
RimWellLogTrack* plot = nullptr;
firstAncestorOrThisOfType( plot );
auto plot = firstAncestorOrThisOfType<RimWellLogTrack>();
if ( plot )
{
m_qwtPlotCurveForLegendText->attach( plot->viewer()->qwtPlot() );
@@ -265,7 +262,7 @@ void RimEnsembleWellLogCurveSet::reattachPlotCurves()
//--------------------------------------------------------------------------------------------------
std::vector<RimWellLogCurve*> RimEnsembleWellLogCurveSet::curves() const
{
return m_curves.ptrReferencedObjects();
return m_curves.ptrReferencedObjectsByType();
}
//--------------------------------------------------------------------------------------------------
@@ -273,9 +270,7 @@ std::vector<RimWellLogCurve*> RimEnsembleWellLogCurveSet::curves() const
//--------------------------------------------------------------------------------------------------
void RimEnsembleWellLogCurveSet::deleteEnsembleCurves()
{
RimWellLogTrack* plotTrack = nullptr;
firstAncestorOrThisOfType( plotTrack );
CVF_ASSERT( plotTrack );
auto plotTrack = firstAncestorOrThisOfTypeAsserted<RimWellLogTrack>();
std::vector<size_t> curvesIndexesToDelete;
for ( size_t c = 0; c < m_curves.size(); c++ )
@@ -302,9 +297,7 @@ void RimEnsembleWellLogCurveSet::deleteEnsembleCurves()
//--------------------------------------------------------------------------------------------------
void RimEnsembleWellLogCurveSet::deleteStatisticsCurves()
{
RimWellLogTrack* plotTrack = nullptr;
firstAncestorOrThisOfType( plotTrack );
CVF_ASSERT( plotTrack );
auto plotTrack = firstAncestorOrThisOfTypeAsserted<RimWellLogTrack>();
std::vector<size_t> curvesIndexesToDelete;
for ( size_t c = 0; c < m_curves.size(); c++ )
@@ -392,10 +385,6 @@ void RimEnsembleWellLogCurveSet::updateEditors()
//--------------------------------------------------------------------------------------------------
void RimEnsembleWellLogCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
RimWellLogPlot* plot = nullptr;
firstAncestorOrThisOfType( plot );
CVF_ASSERT( plot );
bool updateTextInPlot = false;
if ( changedField == &m_showCurves )
@@ -404,9 +393,8 @@ void RimEnsembleWellLogCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* ch
updateConnectedEditors();
RimWellLogPlot* summaryPlot = nullptr;
this->firstAncestorOrThisOfTypeAsserted( summaryPlot );
summaryPlot->updateConnectedEditors();
auto plot = firstAncestorOrThisOfTypeAsserted<RimWellLogPlot>();
plot->updateConnectedEditors();
updateTextInPlot = true;
}
@@ -624,8 +612,7 @@ QList<caf::PdmOptionItemInfo> RimEnsembleWellLogCurveSet::calculateValueOptions(
//--------------------------------------------------------------------------------------------------
void RimEnsembleWellLogCurveSet::updateFilterLegend()
{
RimWellLogTrack* plotTrack;
firstAncestorOrThisOfType( plotTrack );
auto plotTrack = firstAncestorOrThisOfType<RimWellLogTrack>();
if ( plotTrack && plotTrack->viewer() )
{
@@ -721,8 +708,7 @@ void RimEnsembleWellLogCurveSet::updateCurveColors()
}
}
RimWellLogTrack* plotTrack;
firstAncestorOrThisOfType( plotTrack );
auto plotTrack = firstAncestorOrThisOfType<RimWellLogTrack>();
if ( plotTrack && plotTrack->viewer() )
{
if ( m_colorMode != ColorMode::SINGLE_COLOR && m_ensembleCurveSet != nullptr &&
@@ -752,13 +738,8 @@ void RimEnsembleWellLogCurveSet::updateCurveColors()
//--------------------------------------------------------------------------------------------------
void RimEnsembleWellLogCurveSet::updateEnsembleCurves( const std::vector<RimWellLogFile*>& sumCases )
{
RimWellLogTrack* plotTrack = nullptr;
firstAncestorOrThisOfType( plotTrack );
CVF_ASSERT( plotTrack );
RimWellLogPlot* wellLogPlot = nullptr;
firstAncestorOrThisOfType( wellLogPlot );
CVF_ASSERT( wellLogPlot );
auto plotTrack = firstAncestorOrThisOfTypeAsserted<RimWellLogTrack>();
auto wellLogPlot = firstAncestorOrThisOfTypeAsserted<RimWellLogPlot>();
deleteEnsembleCurves();
m_qwtPlotCurveForLegendText->detach();
@@ -847,8 +828,7 @@ void RimEnsembleWellLogCurveSet::setLogScaleFromSelectedResult( const QString re
{
if ( RiaResultNames::isLogarithmicResult( resVar ) )
{
RimWellLogTrack* track = nullptr;
this->firstAncestorOrThisOfType( track );
auto track = firstAncestorOrThisOfType<RimWellLogTrack>();
if ( track ) track->setLogarithmicScale( true );
}
}
@@ -897,10 +877,6 @@ void RimEnsembleWellLogCurveSet::updateStatisticsCurves( const std::vector<RimWe
if ( !updateStatistics( sumCases ) ) return;
RimWellLogPlot* plot = nullptr;
firstAncestorOrThisOfType( plot );
CVF_ASSERT( plot );
std::vector<RimEnsembleWellLogStatistics::StatisticsType> statisticsTypes;
if ( m_statistics->isActive() )
{
@@ -922,9 +898,7 @@ void RimEnsembleWellLogCurveSet::updateStatisticsCurves( const std::vector<RimWe
return RiuPlotCurveSymbol::SYMBOL_ELLIPSE;
};
RimWellLogTrack* plotTrack = nullptr;
firstAncestorOrThisOfType( plotTrack );
CVF_ASSERT( plotTrack );
auto plotTrack = firstAncestorOrThisOfTypeAsserted<RimWellLogTrack>();
for ( auto statisticsType : statisticsTypes )
{
@@ -1002,9 +976,7 @@ void RimEnsembleWellLogCurveSet::setFilterByEnsembleCurveSet( RimEnsembleCurveSe
//--------------------------------------------------------------------------------------------------
void RimEnsembleWellLogCurveSet::updateAllTextInPlot()
{
RimWellLogTrack* plotTrack = nullptr;
firstAncestorOrThisOfType( plotTrack );
CVF_ASSERT( plotTrack );
auto plotTrack = firstAncestorOrThisOfTypeAsserted<RimWellLogTrack>();
plotTrack->viewer()->setPlotTitle( name() );
updateEnsembleLegendItem();