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

@@ -32,7 +32,6 @@
#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmUiLineEditor.h"
#include "cafPdmUiListEditor.h"
#include "cafPdmUiPushButtonEditor.h"
#include <QDateTime>
@@ -83,7 +82,6 @@ RimTimeStepFilter::RimTimeStepFilter()
CAF_PDM_InitFieldNoDefault( &m_filteredTimeStepsUi, "TimeStepIndicesUi", "Select From TimeSteps" );
m_filteredTimeStepsUi.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
m_filteredTimeStepsUi.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
m_filteredTimeStepsUi.xmlCapability()->disableIO();
CAF_PDM_InitField( &m_readOnlyLastFrame, "OnlyLastFrame", false, "Load Only Last Frame Of Each Time Step" );
@@ -415,10 +413,7 @@ void RimTimeStepFilter::updateFieldVisibility()
//--------------------------------------------------------------------------------------------------
RimEclipseResultCase* RimTimeStepFilter::parentEclipseResultCase() const
{
RimEclipseResultCase* rimEclipseResultCase = nullptr;
this->firstAncestorOrThisOfType( rimEclipseResultCase );
return rimEclipseResultCase;
return firstAncestorOrThisOfType<RimEclipseResultCase>();
}
//--------------------------------------------------------------------------------------------------
@@ -426,9 +421,7 @@ RimEclipseResultCase* RimTimeStepFilter::parentEclipseResultCase() const
//--------------------------------------------------------------------------------------------------
RimGeoMechCase* RimTimeStepFilter::parentGeoMechCase() const
{
RimGeoMechCase* rimGeoMechCase = nullptr;
this->firstAncestorOrThisOfType( rimGeoMechCase );
return rimGeoMechCase;
return firstAncestorOrThisOfType<RimGeoMechCase>();
}
//--------------------------------------------------------------------------------------------------