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

Fix tracer selection issues

Browse Source
This commit is contained in:
Jørgen Herje
2023-04-13 14:44:06 +02:00
committed by Magne Sjaastad
parent 2e955f2875
commit 7427e7b6e9
1 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
ApplicationLibCode/ProjectDataModel/Flow/RimWellConnectivityTable.cpp
View File

@@ -212,9 +212,6 @@ void RimWellConnectivityTable::setFromSimulationWell( RimSimWellInView* simWell
// Set valid single time step and time step range selections based on case // Set valid single time step and time step range selections based on case
setValidTimeStepSelectionsForCase(); setValidTimeStepSelectionsForCase();
// Set single time step and current selected time step from active view
m_timeStepSelection = TimeStepSelection::SINGLE_TIME_STEP;
if ( eclCase ) if ( eclCase )
{ {
m_selectedTimeStep = eclCase->timeStepDates().at( eclView->currentTimeStep() ); m_selectedTimeStep = eclCase->timeStepDates().at( eclView->currentTimeStep() );
@@ -231,7 +228,19 @@ void RimWellConnectivityTable::setFromSimulationWell( RimSimWellInView* simWell
} }
connectViewCellVisibilityChangedToSlot( m_cellFilterView ); connectViewCellVisibilityChangedToSlot( m_cellFilterView );
setSelectedProducersAndInjectorsForSingleTimeStep();
// Set single time step and current selected time step from active view
m_timeStepSelection = TimeStepSelection::SINGLE_TIME_STEP;
if ( m_cellFilterView )
{
setWellSelectionFromViewFilter();
}
else
{
setSelectedProducersAndInjectorsForSingleTimeStep();
}
onLoadDataAndUpdate(); onLoadDataAndUpdate();
} }
@@ -292,11 +301,30 @@ void RimWellConnectivityTable::fieldChangedByUi( const caf::PdmFieldHandle* chan
auto* prevCellFilterView = dynamic_cast<RimEclipseView*>( prevValue ); auto* prevCellFilterView = dynamic_cast<RimEclipseView*>( prevValue );
disconnectViewCellVisibilityChangedFromSlots( prevCellFilterView ); disconnectViewCellVisibilityChangedFromSlots( prevCellFilterView );
// Connect signal/slots for current cellFilterView if ( m_cellFilterView )
connectViewCellVisibilityChangedToSlot( m_cellFilterView ); {
// Connect signal/slots for current cellFilterView
connectViewCellVisibilityChangedToSlot( m_cellFilterView );
// Update well selections using current view filter type for the active cell filter view // Update well selections using current view filter type for the active cell filter view
setWellSelectionFromViewFilter(); setWellSelectionFromViewFilter();
}
if ( !m_cellFilterView && m_selectProducersAndInjectorsForTimeSteps )
{
if ( m_timeStepSelection() == TimeStepSelection::SINGLE_TIME_STEP )
{
setSelectedProducersAndInjectorsForSingleTimeStep();
}
if ( m_timeStepSelection() == TimeStepSelection::TIME_STEP_RANGE )
{
setSelectedProducersAndInjectorsForTimeStepRange();
}
}
else
{
m_selectedProducerTracersUiField.setValueWithFieldChanged( {} );
m_selectedInjectorTracersUiField.setValueWithFieldChanged( {} );
}
onLoadDataAndUpdate(); onLoadDataAndUpdate();
} }
@@ -338,6 +366,10 @@ void RimWellConnectivityTable::fieldChangedByUi( const caf::PdmFieldHandle* chan
{ {
setSelectedProducersAndInjectorsForSingleTimeStep(); setSelectedProducersAndInjectorsForSingleTimeStep();
} }
if ( m_cellFilterView )
{
setWellSelectionFromViewFilter();
}
// For singe time step - no apply buttons due to low computation time // For singe time step - no apply buttons due to low computation time
onLoadDataAndUpdate(); onLoadDataAndUpdate();
@@ -350,6 +382,10 @@ void RimWellConnectivityTable::fieldChangedByUi( const caf::PdmFieldHandle* chan
{ {
setSelectedProducersAndInjectorsForTimeStepRange(); setSelectedProducersAndInjectorsForTimeStepRange();
} }
if ( m_cellFilterView )
{
setWellSelectionFromViewFilter();
}
} }
else if ( changedField == &m_applyTimeStepSelections || changedField == &m_applySelectedInectorProducerTracers ) else if ( changedField == &m_applyTimeStepSelections || changedField == &m_applySelectedInectorProducerTracers )
{ {
@@ -1156,8 +1192,7 @@ std::vector<QString> RimWellConnectivityTable::getViewFilteredWellNamesFromFilte
{ {
if ( filterType == ViewFilterType::FILTER_BY_VISIBLE_PRODUCERS ) if ( filterType == ViewFilterType::FILTER_BY_VISIBLE_PRODUCERS )
{ {
return productionType == RiaDefines::WellProductionType::PRODUCER || return productionType == RiaDefines::WellProductionType::PRODUCER;
productionType == RiaDefines::WellProductionType::UNDEFINED_PRODUCTION_TYPE;
} }
if ( filterType == ViewFilterType::FILTER_BY_VISIBLE_INJECTORS ) if ( filterType == ViewFilterType::FILTER_BY_VISIBLE_INJECTORS )
{ {