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

34
ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -659,8 +659,7 @@ void RimEclipseView::onCreateDisplayModel()
updateFaultColors();
}
std::vector<RimFlowCharacteristicsPlot*> characteristicsPlots;
this->objectsWithReferringPtrFieldsOfType( characteristicsPlots );
std::vector<RimFlowCharacteristicsPlot*> characteristicsPlots = this->objectsWithReferringPtrFieldsOfType<RimFlowCharacteristicsPlot>();
for ( auto plot : characteristicsPlots )
{
if ( plot != nullptr )
@@ -669,8 +668,7 @@ void RimEclipseView::onCreateDisplayModel()
}
}
std::vector<RimGridCrossPlotDataSet*> curveSets;
this->objectsWithReferringPtrFieldsOfType( curveSets );
std::vector<RimGridCrossPlotDataSet*> curveSets = objectsWithReferringPtrFieldsOfType<RimGridCrossPlotDataSet>();
for ( auto curveSet : curveSets )
{
if ( curveSet != nullptr )
@@ -680,8 +678,7 @@ void RimEclipseView::onCreateDisplayModel()
}
#ifdef USE_QTCHARTS
std::vector<RimGridStatisticsPlot*> gridStatisticsPlots;
this->objectsWithReferringPtrFieldsOfType( gridStatisticsPlots );
std::vector<RimGridStatisticsPlot*> gridStatisticsPlots = objectsWithReferringPtrFieldsOfType<RimGridStatisticsPlot>();
for ( auto gridStatisticsPlot : gridStatisticsPlots )
{
if ( gridStatisticsPlot != nullptr )
@@ -958,12 +955,10 @@ void RimEclipseView::appendWellsAndFracturesToModel()
cvf::ref<caf::DisplayCoordTransform> transForm = this->displayCoordTransform();
std::vector<RimFracture*> fractures;
this->descendantsIncludingThisOfType( fractures );
std::vector<RimFracture*> fractures = this->descendantsIncludingThisOfType<RimFracture>();
for ( RimFracture* f : fractures )
{
RimSimWellInView* simWell = nullptr;
f->firstAncestorOrThisOfType( simWell );
RimSimWellInView* simWell = f->firstAncestorOrThisOfType<RimSimWellInView>();
if ( simWell )
{
bool isAnyGeometryPresent = simWell->isWellPipeVisible( m_currentTimeStep ) ||
@@ -1086,8 +1081,7 @@ void RimEclipseView::onLoadDataAndUpdate()
{
// Update simulation well fractures after well cell results are imported
std::vector<RimSimWellFracture*> simFractures;
this->descendantsIncludingThisOfType( simFractures );
std::vector<RimSimWellFracture*> simFractures = descendantsIncludingThisOfType<RimSimWellFracture>();
for ( auto fracture : simFractures )
{
fracture->loadDataAndUpdate();
@@ -1222,8 +1216,7 @@ QString RimEclipseView::createAutoName() const
QStringList generatedAutoTags;
RimCase* ownerCase = nullptr;
this->firstAncestorOrThisOfTypeAsserted( ownerCase );
RimCase* ownerCase = firstAncestorOrThisOfTypeAsserted<RimCase>();
if ( nameConfig()->addCaseName() )
{
@@ -1428,10 +1421,7 @@ void RimEclipseView::onUpdateLegends()
{
bool hasAnyVisibleFractures = false;
{
std::vector<RimFracture*> fractures;
RimProject::current()->activeOilField()->descendantsIncludingThisOfType( fractures );
std::vector<RimFracture*> fractures = RimProject::current()->activeOilField()->descendantsIncludingThisOfType<RimFracture>();
for ( const auto& f : fractures )
{
if ( f->isEnabled() ) hasAnyVisibleFractures = true;
@@ -1910,9 +1900,11 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
{
bool showFractureColors = false;
std::vector<RimFracture*> fractures;
m_wellCollection->descendantsIncludingThisOfType( fractures );
wellPathCollection()->descendantsIncludingThisOfType( fractures );
std::vector<RimFracture*> fractures = m_wellCollection->descendantsIncludingThisOfType<RimFracture>();
auto otherFractures = wellPathCollection()->descendantsIncludingThisOfType<RimFracture>();
fractures.insert( fractures.end(), otherFractures.begin(), otherFractures.end() );
if ( !fractures.empty() )
{
showFractureColors = true;