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

Release 2023.06

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp
View File

@@ -154,7 +154,7 @@ RimDepthTrackPlot::RimDepthTrackPlot()
CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSet, "FilterEnsembleCurveSet", "Filter by Ensemble Curve Set" );
CAF_PDM_InitFieldNoDefault( &m_depthEqualization, "DepthEqualization", "Depth Equalization" );
CAF_PDM_InitFieldNoDefault( &m_plots, "Tracks", "" );
CAF_PDM_InitFieldNoDefault( &m_plots, "Tracks", "Tracks" );
m_plots.uiCapability()->setUiTreeHidden( true );
auto reorderability = caf::PdmFieldReorderCapability::addToField( &m_plots );
reorderability->orderChanged.connect( this, &RimDepthTrackPlot::onPlotsReordered );
@@ -197,7 +197,7 @@ RimDepthTrackPlot& RimDepthTrackPlot::operator=( RimDepthTrackPlot&& rhs )
RimPlotWindow::operator=( std::move( rhs ) );
// Move all tracks
auto plots = rhs.m_plots.children();
auto plots = rhs.m_plots.childrenByType();
rhs.m_plots.clearWithoutDelete();
for ( auto plot : plots )
{
@@ -290,7 +290,7 @@ std::vector<RimPlot*> RimDepthTrackPlot::plots() const
{
std::vector<RimPlot*> baseClassPlots;
for ( auto p : m_plots.children() )
for ( auto p : m_plots.childrenByType() )
{
baseClassPlots.push_back( p );
}
@@ -498,7 +498,7 @@ void RimDepthTrackPlot::clearDepthAnnotations()
//--------------------------------------------------------------------------------------------------
std::vector<RimPlotAxisAnnotation*> RimDepthTrackPlot::depthAxisAnnotations() const
{
return m_depthAnnotations.children();
return m_depthAnnotations.childrenByType();
}
//--------------------------------------------------------------------------------------------------
@@ -1050,8 +1050,7 @@ void RimDepthTrackPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
{
m_isAutoScaleDepthEnabled = true;
RimWellAllocationPlot* parentWellAllocation = nullptr;
this->firstAncestorOrThisOfType( parentWellAllocation );
RimWellAllocationPlot* parentWellAllocation = firstAncestorOrThisOfType<RimWellAllocationPlot>();
if ( parentWellAllocation )
{
parentWellAllocation->loadDataAndUpdate();
@@ -1080,8 +1079,7 @@ void RimDepthTrackPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
}
else if ( changedField == &m_depthEqualization )
{
std::vector<RimEnsembleWellLogCurveSet*> ensembleWellLogCurveSets;
descendantsOfType( ensembleWellLogCurveSets );
std::vector<RimEnsembleWellLogCurveSet*> ensembleWellLogCurveSets = descendantsOfType<RimEnsembleWellLogCurveSet>();
for ( auto ensembleWellLogCurveSet : ensembleWellLogCurveSets )
{
ensembleWellLogCurveSet->setDepthEqualization( m_depthEqualization() );
@@ -1090,8 +1088,7 @@ void RimDepthTrackPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
}
else if ( changedField == &m_ensembleCurveSet )
{
std::vector<RimEnsembleWellLogCurveSet*> ensembleWellLogCurveSets;
descendantsOfType( ensembleWellLogCurveSets );
std::vector<RimEnsembleWellLogCurveSet*> ensembleWellLogCurveSets = descendantsOfType<RimEnsembleWellLogCurveSet>();
for ( auto ensembleWellLogCurveSet : ensembleWellLogCurveSets )
{
ensembleWellLogCurveSet->setFilterByEnsembleCurveSet( m_ensembleCurveSet() );
@@ -1140,8 +1137,7 @@ void RimDepthTrackPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderi
fontGroup->add( &m_axisTitleFontSize );
fontGroup->add( &m_axisValueFontSize );
std::vector<RimEnsembleWellLogCurveSet*> ensembleWellLogCurveSets;
descendantsOfType( ensembleWellLogCurveSets );
std::vector<RimEnsembleWellLogCurveSet*> ensembleWellLogCurveSets = descendantsOfType<RimEnsembleWellLogCurveSet>();
if ( !ensembleWellLogCurveSets.empty() )
{
caf::PdmUiGroup* ensembleWellLogGroup = uiOrdering.addNewGroup( "Ensemble Well Log" );
@@ -1546,7 +1542,7 @@ void RimDepthTrackPlot::updateTrackVisibility()
//--------------------------------------------------------------------------------------------------
void RimDepthTrackPlot::setAutoScalePropertyValuesEnabled( bool enabled )
{
for ( auto plot : m_plots.children() )
for ( auto plot : m_plots.childrenByType() )
{
plot->setAutoScalePropertyValuesEnabled( enabled );
}