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

#3030 Ensemble curve filter. Move filters to table in property editor

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-13 09:06:34 +02:00
parent 6ee84b598c
commit 661ce06553
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/SummaryPlotCommands/RicNewEnsembleCurveFilterFeature.cpp
View File

@@ -53,7 +53,7 @@ void RicNewEnsembleCurveFilterFeature::onActionTriggered(bool isChecked)
{
auto newFilter = filterColls[0]->addFilter();
filterColls[0]->updateConnectedEditors();
RiuPlotMainWindowTools::selectAsCurrentItem(newFilter);
RiuPlotMainWindowTools::selectAsCurrentItem(filterColls.front());
}
}

14
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
View File

@@ -145,17 +145,11 @@ void RimEnsembleCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
{
auto eParam = selectedEnsembleParameter();
uiOrdering.add(&m_active);
uiOrdering.add(&m_ensembleParameterName);
if (eParam.isNumeric())
{
uiOrdering.add(&m_minValue);
uiOrdering.add(&m_maxValue);
}
else if (eParam.isText())
{
uiOrdering.add(&m_categories);
}
uiOrdering.add(&m_minValue);
uiOrdering.add(&m_maxValue);
uiOrdering.add(&m_categories);
uiOrdering.skipRemainingFields(true);
}

16
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp
View File

@@ -23,6 +23,9 @@
#include "RimEnsembleCurveFilter.h"
#include "RimEnsembleCurveSet.h"
#include <cafPdmUiTableViewEditor.h>
#include <cafPdmUiTreeOrdering.h>
#include <algorithm>
@@ -36,10 +39,11 @@ RimEnsembleCurveFilterCollection::RimEnsembleCurveFilterCollection()
CAF_PDM_InitObject("Curve Filters", ":/SummaryCurveFilter16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_active, "Active", "Active", "", "", "");
m_active.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_filters, "CurveFilters", "", "", "", "");
m_filters.uiCapability()->setUiHidden(true);
m_filters.uiCapability()->setUiTreeChildrenHidden(true);
m_filters.uiCapability()->setUiEditorTypeName(caf::PdmUiTableViewEditor::uiEditorTypeName());
m_filters.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
}
//--------------------------------------------------------------------------------------------------
@@ -107,6 +111,14 @@ void RimEnsembleCurveFilterCollection::defineUiOrdering(QString uiConfigName, ca
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilterCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /* = "" */)
{
uiTreeOrdering.skipRemainingChildren(true);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.h
View File

@@ -45,6 +45,7 @@ public:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /* = "" */);
void loadDataAndUpdate();