Release 2023.06

This commit is contained in:
Magne Sjaastad
2023-06-19 13:48:44 +02:00
committed by GitHub
parent a7108f0a09
commit 77bf792b1a
1390 changed files with 66974 additions and 11511 deletions

View File

@@ -187,8 +187,7 @@ QList<caf::PdmOptionItemInfo> RimStimPlanColors::calculateValueOptions( const ca
//--------------------------------------------------------------------------------------------------
void RimStimPlanColors::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
RimEclipseView* sourceView = nullptr;
this->firstAncestorOrThisOfType( sourceView );
RimEclipseView* sourceView = firstAncestorOrThisOfType<RimEclipseView>();
if ( sourceView )
{
sourceView->scheduleCreateDisplayModelAndRedraw();
@@ -211,8 +210,7 @@ void RimStimPlanColors::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
if ( changedField == &m_stimPlanCellVizMode )
{
Rim3dView* rimView = nullptr;
this->firstAncestorOrThisOfType( rimView );
auto rimView = firstAncestorOrThisOfType<Rim3dView>();
if ( rimView )
{
rimView->createDisplayModelAndRedraw();
@@ -303,8 +301,7 @@ void RimStimPlanColors::updateStimPlanTemplates() const
// Get all frac templates and re-generate stimplan cells
RimProject* proj = RimProject::current();
std::vector<RimFracture*> fractures;
proj->descendantsIncludingThisOfType( fractures );
std::vector<RimFracture*> fractures = proj->descendantsIncludingThisOfType<RimFracture>();
for ( RimFracture* fracture : fractures )
{
fracture->updateFractureGrid();
@@ -395,7 +392,8 @@ void RimStimPlanColors::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderi
colorGroup->add( &m_resultNameAndUnit );
colorGroup->add( &m_defaultColor );
auto hasMeshTemplate = []() {
auto hasMeshTemplate = []()
{
std::vector<RimFractureTemplate*> fracTemplates = RimProject::current()->allFractureTemplates();
for ( auto fractemplate : fracTemplates )
{