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

#5730 Add a default analysis plot filter that lets everything through.

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-07-31 15:39:01 +02:00
parent 69d782b92f
commit 34f3b0e369
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
View File

@ -19,6 +19,7 @@
#include "RimAnalysisPlotCollection.h"
#include "RimAnalysisPlot.h"
#include "RimPlotDataFilterCollection.h"
#include "RimProject.h"
CAF_PDM_SOURCE_INIT( RimAnalysisPlotCollection, "AnalysisPlotCollection" );
@ -71,10 +72,13 @@ RimAnalysisPlot* RimAnalysisPlotCollection::createAnalysisPlot( RimSummaryCaseCo
plot->setAsPlotMdiWindow();
applyEnsembleFieldAndTimeStepToPlot( plot, ensemble, quantityName.toStdString(), timeStep );
auto filter = plot->plotDataFilterCollection()->addFilter();
// plot->enableAutoPlotTitle( true );
m_analysisPlots.push_back( plot );
plot->loadDataAndUpdate();
filter->updateMaxMinAndDefaultValues( true );
plot->loadDataAndUpdate();
plot->updateConnectedEditors();

6
ApplicationCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp
View File

@ -31,6 +31,8 @@
#include "cafPdmUiListEditor.h"
#include "cafPdmUiPushButtonEditor.h"
#include <limits>
namespace caf
{
template <>
@ -104,9 +106,9 @@ RimPlotDataFilterItem::RimPlotDataFilterItem()
CAF_PDM_InitField( &m_topBottomN, "MinTopN", 20, "N", "", "", "" );
m_topBottomN.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField( &m_max, "Max", 0.0, "Max", "", "", "" );
CAF_PDM_InitField( &m_max, "Max", m_upperLimit, "Max", "", "", "" );
m_max.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_min, "Min", 0.0, "Min", "", "", "" );
CAF_PDM_InitField( &m_min, "Min", m_lowerLimit, "Min", "", "", "" );
m_min.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_ensembleParameterValueCategories, "EnsembleParameterValueCategories", "one of", "", "", "" );

2
ApplicationCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.h
View File

@ -102,6 +102,7 @@ public:
TimeStepSourceType consideredTimeStepsType() const;
std::pair<time_t, time_t> timeRangeMinMax() const;
std::vector<time_t> explicitlySelectedTimeSteps() const;
void updateMaxMinAndDefaultValues( bool forceDefault );
private:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
@ -114,7 +115,6 @@ private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void updateMaxMinAndDefaultValues( bool forceDefault );
EnsembleParameter selectedEnsembleParameter() const;
caf::PdmField<bool> m_isActive;