OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure duplication of RFT plot works as expected

Browse Source
This commit is contained in:
Magne Sjaastad
2025-08-01 21:57:42 +02:00
committed by GitHub
parent 2fc12a35e2
commit 79a7e94c8b
3 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/Commands/WellLogCommands/RicCreateRftPlotsFeature.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ void RicCreateRftPlotsFeature::appendRftPlotForWell( const QString& wellName, Ri
rftPlot->setSimWellOrWellPathName( wellName );
rftPlotColl->addPlot( rftPlot );
rftPlot->resolveReferencesRecursively();
rftPlot->applyInitialSelections( sourcePlot->dataSource() );
rftPlot->initializeDataSources( sourcePlot );
const auto generatedName = rftPlot->simWellOrWellPathName(); // We may have been given a default well name
const QString plotName = QString( RimWellRftPlot::plotNameFormatString() ).arg( generatedName );
@@ -142,7 +142,7 @@ void RicCreateRftPlotsFeature::appendRftPlotForWell( const QString& wellName, Ri
plotTrack->setDescription( QString( "Track %1" ).arg( rftPlot->plotCount() ) );
rftPlotColl->addPlot( rftPlot );
rftPlot->applyInitialSelections( {} );
rftPlot->initializeDataSources( nullptr );
const auto generatedName = rftPlot->simWellOrWellPathName(); // We may have been given a default well name
const QString plotName = QString( RimWellRftPlot::plotNameFormatString() ).arg( generatedName );
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
+40 -29
View File
@@ -237,7 +237,7 @@ QString RimWellRftPlot::associatedSimWellName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource )
void RimWellRftPlot::setOrInitializeDataSources( const std::vector<RifDataSourceForRftPlt>& sourcesToSelect )
{
std::map<QString, QStringList> wellSources = findWellSources();
if ( m_wellPathNameOrSimWellName() == "None" && !wellSources.empty() )
@@ -245,50 +245,38 @@ void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSu
m_wellPathNameOrSimWellName = wellSources.begin()->first;
}
RimSummaryEnsemble* ensemble = nullptr;
RimSummaryCase* summaryCase = nullptr;
if ( auto summaryCollection = std::get_if<RimSummaryEnsemble*>( &dataSource ) )
{
ensemble = *summaryCollection;
}
else if ( auto sumCase = std::get_if<RimSummaryCase*>( &dataSource ) )
{
summaryCase = *sumCase;
}
bool summaryOrEnsembleSelected = ( summaryCase || ensemble );
std::vector<RifDataSourceForRftPlt> sourcesToSelect;
std::vector<RifDataSourceForRftPlt> dataSources;
const QString simWellName = associatedSimWellName();
if ( !summaryOrEnsembleSelected )
if ( !sourcesToSelect.empty() )
{
// If the selection is provided, use it directly
dataSources = sourcesToSelect;
}
else
{
// If no selection is provided, build the selection based on available data sources
for ( RimEclipseResultCase* const rftCase : RimWellPlotTools::rftCasesForWell( simWellName ) )
{
sourcesToSelect.push_back( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::RFT_SIM_WELL_DATA, rftCase ) );
dataSources.push_back( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::RFT_SIM_WELL_DATA, rftCase ) );
}
for ( RimEclipseResultCase* const gridCase : RimWellPlotTools::gridCasesForWell( simWellName ) )
{
sourcesToSelect.push_back( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA, gridCase ) );
dataSources.push_back( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA, gridCase ) );
}
for ( RimSummaryEnsemble* const ensemble : RimWellPlotTools::rftEnsemblesForWell( simWellName ) )
{
sourcesToSelect.push_back( RifDataSourceForRftPlt( ensemble ) );
dataSources.push_back( RifDataSourceForRftPlt( ensemble ) );
}
for ( auto singleCase : RiaSummaryTools::singleTopLevelSummaryCases() )
{
sourcesToSelect.push_back( RifDataSourceForRftPlt( singleCase, nullptr, nullptr ) );
dataSources.push_back( RifDataSourceForRftPlt( singleCase, nullptr, nullptr ) );
}
}
else
{
if ( summaryCase ) sourcesToSelect.push_back( RifDataSourceForRftPlt( summaryCase, nullptr, nullptr ) );
if ( ensemble ) sourcesToSelect.push_back( RifDataSourceForRftPlt( ensemble ) );
}
std::vector<RimWellLogFile*> wellLogFiles = RimWellPlotTools::wellLogFilesContainingPressure( m_wellPathNameOrSimWellName );
if ( !wellLogFiles.empty() )
@@ -297,17 +285,17 @@ void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSu
{
if ( auto wellLogLasFile = dynamic_cast<RimWellLogLasFile*>( wellLogFile ) )
{
sourcesToSelect.push_back( RifDataSourceForRftPlt( wellLogLasFile ) );
dataSources.push_back( RifDataSourceForRftPlt( wellLogLasFile ) );
}
}
}
for ( RimObservedFmuRftData* const observedFmuRftData : RimWellPlotTools::observedFmuRftDataForWell( m_wellPathNameOrSimWellName ) )
{
sourcesToSelect.push_back( RifDataSourceForRftPlt( observedFmuRftData ) );
dataSources.push_back( RifDataSourceForRftPlt( observedFmuRftData ) );
}
m_selectedSources = sourcesToSelect;
m_selectedSources = dataSources;
{
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse = RifEclipseRftAddress::rftPlotChannelTypes();
@@ -1662,6 +1650,29 @@ void RimWellRftPlot::rebuildCurves()
syncCurvesFromUiSelection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::initializeDataSources( RimWellRftPlot* source )
{
for ( auto curveSet : m_ensembleCurveSets )
{
// Clear the ensemble statistics before applying initial selections
// This is necessary to ensure that the statistics are recalculated based on the initial selections
curveSet->clearEnsembleStatistics();
}
if ( source )
{
setOrInitializeDataSources( source->m_selectedSources );
}
else
{
// If no source is provided, initialize with empty sources
setOrInitializeDataSources( {} );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h
+4 -1
View File
@@ -83,7 +83,6 @@ public:
int branchIndex() const;
std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource() const;
void applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource );
static const char* plotNameFormatString();
@@ -96,6 +95,8 @@ public:
void rebuildCurves();
void initializeDataSources( RimWellRftPlot* source );
private:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;
@@ -122,6 +123,8 @@ private:
std::set<RiaRftPltCurveDefinition> selectedCurveDefs() const;
std::set<RiaRftPltCurveDefinition> curveDefsFromCurves() const;
void setOrInitializeDataSources( const std::vector<RifDataSourceForRftPlt>& sourcesToSelect );
void updateCurvesInPlot( const std::set<RiaRftPltCurveDefinition>& allCurveDefs,
const std::set<RiaRftPltCurveDefinition>& curveDefsToAdd,
const std::set<RimWellLogCurve*>& curvesToDelete );