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

31
ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp
View File

@@ -322,17 +322,13 @@ QList<caf::PdmOptionItemInfo> RimPlotCurve::calculateValueOptions( const caf::Pd
}
else if ( fieldNeedingOptions == &m_additionalDataSources )
{
std::vector<RimPlotWindow*> parentPlots;
// 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.
this->allAncestorsOfType( parentPlots );
auto parentPlots = this->allAncestorsOfType<RimPlotWindow>();
if ( !parentPlots.empty() )
{
std::vector<RimPlotCurve*> plotCurves;
parentPlots.back()->descendantsOfType( plotCurves );
auto plotCurves = parentPlots.back()->descendantsOfType<RimPlotCurve>();
for ( auto p : plotCurves )
{
caf::PdmOptionItemInfo optionInfo( p->curveName(), p );
@@ -476,8 +472,7 @@ void RimPlotCurve::updateFieldUiState()
//--------------------------------------------------------------------------------------------------
void RimPlotCurve::updatePlotTitle()
{
RimNameConfigHolderInterface* nameConfigHolder = nullptr;
this->firstAncestorOrThisOfType( nameConfigHolder );
auto nameConfigHolder = firstAncestorOrThisOfType<RimNameConfigHolderInterface>();
if ( nameConfigHolder )
{
nameConfigHolder->updateAutoName();
@@ -553,12 +548,10 @@ bool RimPlotCurve::canCurveBeAttached() const
bool isVisibleInPossibleParent = true;
{
RimSummaryCurveCollection* summaryCurveCollection = nullptr;
this->firstAncestorOrThisOfType( summaryCurveCollection );
auto summaryCurveCollection = firstAncestorOrThisOfType<RimSummaryCurveCollection>();
if ( summaryCurveCollection ) isVisibleInPossibleParent = summaryCurveCollection->isCurvesVisible();
RimEnsembleCurveSet* ensembleCurveSet = nullptr;
firstAncestorOrThisOfType( ensembleCurveSet );
auto ensembleCurveSet = firstAncestorOrThisOfType<RimEnsembleCurveSet>();
if ( ensembleCurveSet ) isVisibleInPossibleParent = ensembleCurveSet->isCurvesVisible();
}
@@ -581,8 +574,7 @@ void RimPlotCurve::checkAndApplyDefaultFillColor()
//--------------------------------------------------------------------------------------------------
bool RimPlotCurve::isCrossPlotCurve() const
{
RimSummaryCrossPlot* crossPlot = nullptr;
this->firstAncestorOrThisOfType( crossPlot );
auto crossPlot = firstAncestorOrThisOfType<RimSummaryCrossPlot>();
if ( crossPlot ) return true;
return false;
@@ -900,8 +892,7 @@ void RimPlotCurve::updateLegendEntryVisibilityNoPlotUpdate()
{
if ( !m_plotCurve ) return;
RimEnsembleCurveSet* ensembleCurveSet = nullptr;
this->firstAncestorOrThisOfType( ensembleCurveSet );
auto ensembleCurveSet = firstAncestorOrThisOfType<RimEnsembleCurveSet>();
if ( ensembleCurveSet )
{
return;
@@ -909,8 +900,7 @@ void RimPlotCurve::updateLegendEntryVisibilityNoPlotUpdate()
bool showLegendInPlot = m_showLegend();
RimSummaryPlot* summaryPlot = nullptr;
this->firstAncestorOrThisOfType( summaryPlot );
auto summaryPlot = firstAncestorOrThisOfType<RimSummaryPlot>();
if ( summaryPlot )
{
bool anyCalculated = false;
@@ -1000,8 +990,7 @@ void RimPlotCurve::updateCurveAppearance()
int legendFontSize =
caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultPlotFontSize(), caf::FontTools::RelativeSize::Small );
RimPlotWindow* plotWindow = nullptr;
this->firstAncestorOrThisOfType( plotWindow );
auto plotWindow = firstAncestorOrThisOfType<RimPlotWindow>();
if ( plotWindow )
{
legendFontSize = plotWindow->legendFontSize();
@@ -1145,7 +1134,7 @@ double RimPlotCurve::closestYValueForX( double xValue ) const
//--------------------------------------------------------------------------------------------------
std::vector<RimPlotCurve*> RimPlotCurve::additionalDataSources() const
{
return m_additionalDataSources.ptrReferencedObjects();
return m_additionalDataSources.ptrReferencedObjectsByType();
}
//--------------------------------------------------------------------------------------------------