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

#978 Summary : Trigger auto apply when appearance and case selection is changed

Browse Source
This commit is contained in:
Magne Sjaastad
2016-11-16 08:06:52 +01:00
parent b6f6f6e3ee
commit 11c8b78f53
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
View File

@@ -99,7 +99,7 @@ RimSummaryCurveFilter::RimSummaryCurveFilter()
m_applyButtonField.uiCapability()->setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName());
m_applyButtonField.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&m_autoApplyFilterChanges, "AutoApplyFilterChanges", false, "Auto Apply Changes", "", "", "");
CAF_PDM_InitField(&m_autoApplyChangesToPlot, "AutoApplyFilterChanges", false, "Auto Apply Changes", "", "", "");
CAF_PDM_InitField(&m_showCurves, "IsActive", true, "Show Curves", "", "", "");
m_showCurves.uiCapability()->setUiHidden(true);
@@ -226,7 +226,7 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
m_curveNameConfig->defineUiOrdering(uiConfigName, *autoNameGroup);
uiOrdering.add(&m_plotAxis);
uiOrdering.add(&m_autoApplyFilterChanges);
uiOrdering.add(&m_autoApplyChangesToPlot);
uiOrdering.add(&m_applyButtonField);
uiOrdering.setForgetRemainingFields(true);
@@ -237,12 +237,11 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if(changedField == &m_uiFilterResultMultiSelection)
bool plotNeedsRedraw = false;
if (changedField == &m_uiFilterResultMultiSelection)
{
if (m_autoApplyFilterChanges)
{
loadDataAndUpdatePlot();
}
plotNeedsRedraw = true;
}
else if (changedField == &m_applyButtonField)
{
@@ -275,6 +274,20 @@ void RimSummaryCurveFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedF
{
m_selectionCache = m_selectedSummaryCases.value();
}
plotNeedsRedraw = true;
}
else
{
plotNeedsRedraw = true;
}
if (plotNeedsRedraw)
{
if (m_autoApplyChangesToPlot)
{
loadDataAndUpdatePlot();
}
}
}
@@ -407,7 +420,7 @@ void RimSummaryCurveFilter::defineEditorAttribute(const caf::PdmFieldHandle* fie
if(&m_applyButtonField == field)
{
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute);
attrib->m_buttonText = "Apply" ;
attrib->m_buttonText = "Apply";
}
}
@@ -573,7 +586,7 @@ void RimSummaryCurveFilter::setPlotAxis(RimDefines::PlotAxis plotAxis)
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveFilter::updateCompleteVariableStringFilterChanged()
{
if (m_autoApplyFilterChanges)
if (m_autoApplyChangesToPlot)
{
loadDataAndUpdatePlot();
}

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.h
View File

@@ -117,7 +117,7 @@ private:
caf::PdmChildField<RimSummaryCurveAutoName*> m_curveNameConfig;
caf::PdmField<bool> m_autoApplyFilterChanges;
caf::PdmField<bool> m_autoApplyChangesToPlot;
caf::PdmField<bool> m_applyButtonField;
caf::PdmField<bool> m_useAutoAppearanceAssignment;