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

Add summary multi plot

Browse Source 
Improve robustness related to update of Summary Plot Manager

Add RimSummaryMultiPlot
Move shared code into RiaSummaryStringTools
Added "Create Summary Multi Plot" to menu of MultiPlot in project tree
This commit is contained in:
Magne Sjaastad
2021-12-23 09:30:36 +01:00
committed by GitHub
parent 21f0988493
commit 4d21f90bf9
21 changed files with 993 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@@ -37,6 +37,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunction.h
${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunctionTools.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotManager.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryMultiPlot.h
)
set(SOURCE_GROUP_SOURCE_FILES
@@ -78,6 +79,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunction.cpp
${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunctionTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotManager.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryMultiPlot.cpp
)
list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})

9
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -94,6 +94,7 @@ void addCaseRealizationParametersIfFound( RimSummaryCase& sumCase, const QString
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseMainCollection::RimSummaryCaseMainCollection()
: dataSourceHasChanged( this )
{
CAF_PDM_InitObject( "Summary Cases", ":/SummaryCases16x16.png", "", "" );
@@ -233,6 +234,8 @@ void RimSummaryCaseMainCollection::addCase( RimSummaryCase* summaryCase )
{
m_cases.push_back( summaryCase );
summaryCase->nameChanged.connect( this, &RimSummaryCaseMainCollection::onCaseNameChanged );
dataSourceHasChanged.send();
}
//--------------------------------------------------------------------------------------------------
@@ -267,6 +270,8 @@ void RimSummaryCaseMainCollection::removeCase( RimSummaryCase* summaryCase )
{
derEnsemble->createDerivedEnsembleCases();
}
dataSourceHasChanged.send();
}
//--------------------------------------------------------------------------------------------------
@@ -313,6 +318,8 @@ RimSummaryCaseCollection*
summaryCaseCollection->caseNameChanged.connect( this, &RimSummaryCaseMainCollection::onCaseNameChanged );
m_caseCollections.push_back( summaryCaseCollection );
dataSourceHasChanged.send();
return summaryCaseCollection;
}
@@ -322,6 +329,8 @@ RimSummaryCaseCollection*
void RimSummaryCaseMainCollection::removeCaseCollection( RimSummaryCaseCollection* caseCollection )
{
m_caseCollections.removeChildObject( caseCollection );
dataSourceHasChanged.send();
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
View File

@@ -19,6 +19,7 @@
#include "cafPdmChildArrayField.h"
#include "cafPdmObject.h"
#include "cafSignal.h"
#include <functional>
#include <vector>
@@ -37,6 +38,9 @@ class RimSummaryCaseMainCollection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
caf::Signal<> dataSourceHasChanged;
public:
RimSummaryCaseMainCollection();
~RimSummaryCaseMainCollection() override;

307
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp Normal file
View File

@@ -0,0 +1,307 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021 Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimMultiPlot.h"
#include "RiaSummaryStringTools.h"
#include "RimMainPlotCollection.h"
#include "RimMultiPlotCollection.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RiuSummaryVectorSelectionUi.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiTreeSelectionEditor.h"
CAF_PDM_SOURCE_INIT( RimSummaryMultiPlot, "MultiSummaryPlot" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot::RimSummaryMultiPlot()
{
CAF_PDM_InitObject( "Multi Summary Plot Plot", "", "", "" );
this->setDeletable( true );
CAF_PDM_InitFieldNoDefault( &m_filterText, "FilterText", "Filter Text" );
m_filterText.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_individualPlotPerVector, "IndividualPlotPerVector", false, "One plot per Vector" );
CAF_PDM_InitField( &m_individualPlotPerDataSource, "IndividualPlotPerDataSource", false, "One plot per Data Source" );
CAF_PDM_InitField( &m_showMultiPlotInProjectTree, "ShowMultiPlotInProjectTree", false, "Show Multi Plot In Project Tree" );
CAF_PDM_InitFieldNoDefault( &m_multiPlot, "MultiPlot", "Multi Plot" );
m_multiPlot = new RimMultiPlot;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot::~RimSummaryMultiPlot()
{
removeMdiWindowFromMdiArea();
m_multiPlot->cleanupBeforeClose();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* RimSummaryMultiPlot::viewWidget()
{
return m_multiPlot->viewWidget();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QImage RimSummaryMultiPlot::snapshotWindowContent()
{
return m_multiPlot->snapshotWindowContent();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::zoomAll()
{
m_multiPlot->zoomAll();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryMultiPlot::description() const
{
return "RimMultiSummaryPlot Placeholder Text";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::addPlot( RimPlot* plot )
{
m_multiPlot->addPlot( plot );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RimSummaryMultiPlot::createAndAppendMultiPlot( const std::vector<RimPlot*>& plots )
{
RimProject* project = RimProject::current();
auto* plotCollection = project->mainPlotCollection()->multiPlotCollection();
auto* plotWindow = new RimSummaryMultiPlot;
plotWindow->setAsPlotMdiWindow();
plotCollection->addMultiSummaryPlot( plotWindow );
for ( auto plot : plots )
{
plotWindow->addPlot( plot );
plot->resolveReferencesRecursively();
plot->revokeMdiWindowStatus();
plot->setShowWindow( true );
plot->loadDataAndUpdate();
}
plotCollection->updateAllRequiredEditors();
plotWindow->loadDataAndUpdate();
return plotWindow;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* RimSummaryMultiPlot::createViewWidget( QWidget* mainWindowParent /*= nullptr*/ )
{
return m_multiPlot->createViewWidget( mainWindowParent );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::deleteViewWidget()
{
m_multiPlot->deleteViewWidget();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::onLoadDataAndUpdate()
{
updateMdiWindowVisibility();
m_multiPlot->onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::doRenderWindowContent( QPaintDevice* paintDevice )
{
m_multiPlot->doRenderWindowContent( paintDevice );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimSummaryMultiPlot::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;
return options;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_filterText );
uiOrdering.add( &m_individualPlotPerVector );
uiOrdering.add( &m_individualPlotPerDataSource );
auto group = uiOrdering.addNewGroup( "Multi Plot Options" );
m_multiPlot->uiOrderingForSummaryMultiPlot( *group );
uiOrdering.add( &m_showMultiPlotInProjectTree );
uiOrdering.skipRemainingFields();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
RimPlotWindow::fieldChangedByUi( changedField, oldValue, newValue );
if ( changedField == &m_showWindow && m_showWindow() )
{
// Plots contained in a RimMultiPlot will automatically be set invisible
// Restore plot visibility
for ( auto p : m_multiPlot->plots() )
{
p->setShowWindow( true );
}
}
else if ( changedField == &m_filterText || changedField == &m_individualPlotPerDataSource ||
changedField == &m_individualPlotPerVector )
{
updatePlots();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_filterText )
{
auto attr = dynamic_cast<caf::PdmUiComboBoxEditorAttribute*>( attribute );
if ( attr )
{
attr->enableEditableContent = true;
attr->enableAutoComplete = false;
attr->adjustWidthToContents = true;
attr->notifyWhenTextIsEdited = true;
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName )
{
uiTreeOrdering.skipRemainingChildren( !m_showMultiPlotInProjectTree );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::updatePlots()
{
auto [addressFilters, dataSourceFilters] =
RiaSummaryStringTools::splitIntoAddressAndDataSourceFilters( m_filterText() );
auto [matchingSummaryCases, matchingEnsembles] = RiaSummaryStringTools::dataSourcesMatchingFilters( dataSourceFilters );
std::set<RifEclipseSummaryAddress> allAddresses;
if ( !matchingSummaryCases.empty() )
{
allAddresses = RicSummaryPlotBuilder::addressesForSource( matchingSummaryCases.front() );
}
else if ( !matchingEnsembles.empty() )
{
allAddresses = RicSummaryPlotBuilder::addressesForSource( matchingEnsembles.front() );
}
bool includeDiffCurves = false;
auto filteredAddresses =
RiaSummaryStringTools::computeFilteredAddresses( addressFilters, allAddresses, includeDiffCurves );
{
// Remove existing plots
m_multiPlot->deleteAllPlots();
// Add new plots
RicSummaryPlotBuilder plotBuilder;
plotBuilder.setAddresses( filteredAddresses );
plotBuilder.setDataSources( matchingSummaryCases, matchingEnsembles );
plotBuilder.setIndividualPlotPerAddress( m_individualPlotPerVector );
plotBuilder.setIndividualPlotPerDataSource( m_individualPlotPerDataSource );
auto plots = plotBuilder.createPlots();
std::vector<RimPlot*> plotsForMultiPlot;
for ( auto p : plots )
{
plotsForMultiPlot.push_back( dynamic_cast<RimPlot*>( p ) );
}
for ( auto plot : plotsForMultiPlot )
{
this->addPlot( plot );
plot->resolveReferencesRecursively();
plot->revokeMdiWindowStatus();
plot->setShowWindow( true );
}
m_multiPlot->loadDataAndUpdate();
}
}

76
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h Normal file
View File

@@ -0,0 +1,76 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021 Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RimPlotWindow.h"
#include "cafPdmChildField.h"
#include "cafPdmObject.h"
#include "cafPdmPtrArrayField.h"
class RimMultiPlot;
//==================================================================================================
///
///
//==================================================================================================
class RimSummaryMultiPlot : public RimPlotWindow
{
CAF_PDM_HEADER_INIT;
public:
RimSummaryMultiPlot();
~RimSummaryMultiPlot();
QWidget* viewWidget() override;
QImage snapshotWindowContent() override;
void zoomAll() override;
QString description() const override;
void addPlot( RimPlot* plot );
static RimSummaryMultiPlot* createAndAppendMultiPlot( const std::vector<RimPlot*>& plots );
private:
QWidget* createViewWidget( QWidget* mainWindowParent = nullptr ) override;
void deleteViewWidget() override;
void onLoadDataAndUpdate() override;
void doRenderWindowContent( QPaintDevice* paintDevice ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;
void updatePlots();
private:
caf::PdmField<QString> m_filterText;
caf::PdmField<bool> m_individualPlotPerVector;
caf::PdmField<bool> m_individualPlotPerDataSource;
caf::PdmField<bool> m_showMultiPlotInProjectTree;
caf::PdmChildField<RimMultiPlot*> m_multiPlot;
};

198
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotManager.cpp
View File

@@ -28,6 +28,9 @@
#include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RimMainPlotCollection.h"
#include "RimMultiPlotCollection.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
@@ -113,6 +116,14 @@ void RimSummaryPlotManager::setFocusToFilterText()
setFocusToEditorWidget( m_filterText.uiCapability() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlotManager::resetDataSourceSelection()
{
m_previousDataSourceText.clear();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -128,8 +139,10 @@ void RimSummaryPlotManager::fieldChangedByUi( const caf::PdmFieldHandle* changed
const QVariant& oldValue,
const QVariant& newValue )
{
if ( changedField == &m_summaryPlot || changedField == &m_filterText || changedField == &m_includeDiffCurves )
if ( changedField == &m_summaryPlot || changedField == &m_filterText || changedField == &m_includeDiffCurves ||
changedField == &m_selectedDataSources )
{
updateSelectionFromUiChange();
updateCurveCandidates();
}
else if ( changedField == &m_pushButtonReplace )
@@ -175,32 +188,12 @@ QList<caf::PdmOptionItemInfo>
}
else if ( fieldNeedingOptions == &m_selectedDataSources )
{
auto [summaryCases, ensembles] = allDataSourcesInProject();
std::vector<QString> dataSourceDisplayNames;
bool resetCheckedItems = false;
std::vector<std::pair<QString, PdmObject*>> dataSources = findDataSourceCandidates();
for ( const auto& dataSource : dataSources )
for ( const auto& displayName : dataSourceDisplayNames() )
{
auto displayName = dataSource.first;
dataSourceDisplayNames.push_back( displayName );
options.push_back( caf::PdmOptionItemInfo( displayName, displayName ) );
if ( m_previousDataSourceSelection.count( displayName ) == 0 ) resetCheckedItems = true;
}
if ( m_previousDataSourceSelection.size() != dataSourceDisplayNames.size() ) resetCheckedItems = true;
if ( resetCheckedItems )
{
// By default select all available data sources
m_selectedDataSources = dataSourceDisplayNames;
}
m_previousDataSourceSelection.clear();
m_previousDataSourceSelection.insert( dataSourceDisplayNames.begin(), dataSourceDisplayNames.end() );
updateSelectionFromUiChange();
}
return options;
@@ -230,59 +223,33 @@ std::vector<std::pair<QString, caf::PdmObject*>> RimSummaryPlotManager::findData
{
std::vector<std::pair<QString, PdmObject*>> candidates;
QStringList addressFilters;
QStringList dataSourceFilters;
splitIntoAddressAndDataSourceFilters( addressFilters, dataSourceFilters );
QStringList dataSourceFilters = extractDataSourceFilters();
// If no filter on data source is specified, use wildcard to match all
if ( dataSourceFilters.empty() ) dataSourceFilters.push_back( "*" );
auto [summaryCases, ensembles] = RiaSummaryStringTools::dataSourcesMatchingFilters( dataSourceFilters );
auto [summaryCases, ensembles] = allDataSourcesInProject();
for ( const auto& dsFilter : dataSourceFilters )
for ( auto ensemble : ensembles )
{
QString searchString = dsFilter.left( dsFilter.indexOf( ':' ) );
QRegExp searcher( searchString, Qt::CaseInsensitive, QRegExp::WildcardUnix );
auto ensembleName = ensemble->name();
for ( const auto& ensemble : ensembles )
candidates.push_back( std::make_pair( ensembleName, ensemble ) );
}
for ( const auto& summaryCase : summaryCases )
{
auto summaryCaseName = summaryCase->displayCaseName();
QString displayName;
auto ensemble = summaryCase->ensemble();
if ( ensemble )
{
auto ensembleName = ensemble->name();
if ( searcher.exactMatch( ensembleName ) )
{
if ( searchString == dsFilter )
{
// Match on ensemble name without realization filter
candidates.push_back( std::make_pair( ensembleName, ensemble ) );
}
else
{
// Match on subset of realisations in ensemble
QString realizationSearchString = dsFilter.right( dsFilter.size() - dsFilter.indexOf( ':' ) - 1 );
QRegExp realizationSearcher( realizationSearchString, Qt::CaseInsensitive, QRegExp::WildcardUnix );
for ( const auto& summaryCase : ensemble->allSummaryCases() )
{
auto realizationName = summaryCase->displayCaseName();
if ( realizationSearcher.exactMatch( realizationName ) )
{
QString displayName = ensembleName + ":" + realizationName;
candidates.push_back( std::make_pair( displayName, summaryCase ) );
}
}
}
}
displayName = ensemble->name() + ":" + summaryCaseName;
}
else
{
displayName = summaryCaseName;
}
for ( const auto& summaryCase : summaryCases )
{
auto summaryCaseName = summaryCase->displayCaseName();
if ( searcher.exactMatch( summaryCaseName ) )
{
candidates.push_back( std::make_pair( summaryCase->displayCaseName(), summaryCase ) );
}
}
candidates.push_back( std::make_pair( displayName, summaryCase ) );
}
return candidates;
@@ -291,28 +258,17 @@ std::vector<std::pair<QString, caf::PdmObject*>> RimSummaryPlotManager::findData
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RifEclipseSummaryAddress>
RimSummaryPlotManager::computeFilteredAddresses( const QStringList& textFilters,
const std::set<RifEclipseSummaryAddress>& sourceAddresses )
std::vector<QString> RimSummaryPlotManager::dataSourceDisplayNames() const
{
std::set<RifEclipseSummaryAddress> addresses;
std::vector<bool> usedFilters;
RicSummaryPlotFeatureImpl::insertFilteredAddressesInSet( textFilters, sourceAddresses, &addresses, &usedFilters );
if ( m_includeDiffCurves ) return addresses;
const auto diffText = RifReaderEclipseSummary::differenceIdentifier();
std::set<RifEclipseSummaryAddress> addressesWithoutDiffVectors;
for ( const auto& adr : addresses )
std::vector<QString> displayNames;
std::vector<std::pair<QString, PdmObject*>> dataSources = findDataSourceCandidates();
for ( const auto& dataSource : dataSources )
{
if ( RiaStdStringTools::endsWith( adr.quantityName(), diffText ) ) continue;
addressesWithoutDiffVectors.insert( adr );
auto displayName = dataSource.first;
displayNames.push_back( displayName );
}
return addressesWithoutDiffVectors;
return displayNames;
}
//--------------------------------------------------------------------------------------------------
@@ -429,6 +385,7 @@ void RimSummaryPlotManager::createNewPlot()
p->loadDataAndUpdate();
plotsForMultiPlot.push_back( dynamic_cast<RimPlot*>( p ) );
}
RicSummaryPlotBuilder::createAndAppendMultiPlot( plotsForMultiPlot );
}
else
@@ -472,20 +429,6 @@ bool RimSummaryPlotManager::eventFilter( QObject* obj, QEvent* event )
return QObject::eventFilter( obj, event );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryCaseCollection*>>
RimSummaryPlotManager::allDataSourcesInProject() const
{
auto sumCaseMainColl = RiaSummaryTools::summaryCaseMainCollection();
auto summaryCases = sumCaseMainColl->topLevelSummaryCases();
auto ensembles = sumCaseMainColl->summaryCaseCollections();
return { summaryCases, ensembles };
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -500,6 +443,7 @@ void RimSummaryPlotManager::updateUiFromSelection()
{
m_summaryPlot = summaryPlot;
updateSelectionFromUiChange();
updateCurveCandidates();
}
@@ -508,8 +452,7 @@ void RimSummaryPlotManager::updateUiFromSelection()
m_summaryPlot = nullptr;
std::vector<QString> tmp;
m_addressCandidates = tmp;
m_selectedDataSources = tmp;
m_addressCandidates = tmp;
}
updateConnectedEditors();
@@ -538,7 +481,7 @@ std::set<RifEclipseSummaryAddress> RimSummaryPlotManager::filteredAddresses()
QStringList allCurveAddressFilters = m_filterText().split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
return computeFilteredAddresses( allCurveAddressFilters, nativeAddresses );
return RiaSummaryStringTools::computeFilteredAddresses( allCurveAddressFilters, nativeAddresses, m_includeDiffCurves );
}
//--------------------------------------------------------------------------------------------------
@@ -585,6 +528,20 @@ void RimSummaryPlotManager::updateProjectTreeAndRefresUi()
setFocusToFilterText();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlotManager::updateSelectionFromUiChange()
{
QStringList dataSourceFilters = extractDataSourceFilters();
if ( m_previousDataSourceText != dataSourceFilters )
{
m_selectedDataSources = dataSourceDisplayNames();
m_previousDataSourceText = dataSourceFilters;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -611,28 +568,12 @@ void RimSummaryPlotManager::setFocusToEditorWidget( caf::PdmUiFieldHandle* uiFie
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlotManager::splitIntoAddressAndDataSourceFilters( QStringList& addressFilters,
QStringList& dataSourceFilters ) const
QStringList RimSummaryPlotManager::extractDataSourceFilters() const
{
QStringList filterItems = m_filterText().split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
auto [addressFilters, dataSourceFilters] =
RiaSummaryStringTools::splitIntoAddressAndDataSourceFilters( m_filterText() );
auto [summaryCases, ensembles] = allDataSourcesInProject();
QStringList dataSourceNames;
for ( const auto& summaryCase : summaryCases )
{
dataSourceNames.push_back( summaryCase->displayCaseName() );
}
for ( const auto& ensemble : ensembles )
{
dataSourceNames.push_back( ensemble->name() );
}
RiaSummaryStringTools::splitIntoAddressAndDataSourceFilters( filterItems,
dataSourceNames,
addressFilters,
dataSourceFilters );
return dataSourceFilters;
}
//--------------------------------------------------------------------------------------------------
@@ -671,3 +612,12 @@ QString RimSummaryPlotManager::curveFilterRecentlyUsedRegistryKey()
{
return "SummaryPlotManagerCurveFilterStrings";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlotManager::onSummaryDataSourceHasChanged( const caf::SignalEmitter* emitter )
{
resetDataSourceSelection();
updateSelectionFromUiChange();
}

14
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotManager.h
View File

@@ -42,6 +42,8 @@ public:
RimSummaryPlotManager();
void setFocusToFilterText();
void resetDataSourceSelection();
void onSummaryDataSourceHasChanged( const caf::SignalEmitter* emitter );
private:
void appendCurves();
@@ -66,11 +68,7 @@ private:
void updateCurveCandidates();
std::vector<std::pair<QString, caf::PdmObject*>> findDataSourceCandidates() const;
std::set<RifEclipseSummaryAddress> computeFilteredAddresses( const QStringList& textFilters,
const std::set<RifEclipseSummaryAddress>& sourceAddresses );
std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryCaseCollection*>> allDataSourcesInProject() const;
std::vector<QString> dataSourceDisplayNames() const;
std::set<RifEclipseSummaryAddress> filteredAddresses();
@@ -78,8 +76,10 @@ private:
void appendCurvesToPlot( RimSummaryPlot* destinationPlot );
void updateFilterTextHistory();
void updateProjectTreeAndRefresUi();
void updateSelectionFromUiChange();
QStringList extractDataSourceFilters() const;
void splitIntoAddressAndDataSourceFilters( QStringList& addressFilters, QStringList& dataSourceFilters ) const;
void findFilteredSummaryCasesAndEnsembles( std::vector<RimSummaryCase*>& summaryCases,
std::vector<RimSummaryCaseCollection*>& ensembles ) const;
@@ -106,5 +106,5 @@ private:
caf::PdmField<QString> m_labelA;
caf::PdmField<QString> m_labelB;
std::set<QString> m_previousDataSourceSelection;
QStringList m_previousDataSourceText;
};