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

#1029 Removed updateFieldVisibility methods. Replaced with simpler control in the defineUiOrdering method. Prep. for Flow Diag.

Browse Source
This commit is contained in:
Jacob Støren
2016-12-14 11:13:54 +01:00
parent afa381b4b9
commit 3d49651b0c
7 changed files with 30 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@@ -78,7 +78,7 @@ RimEclipsePropertyFilter::RimEclipsePropertyFilter()
CAF_PDM_InitField(&m_upperBound, "UpperBound", 0.0, "Max", "", "", "");
m_upperBound.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
CAF_PDM_InitField(&m_categorySelection, "CategorySelection", false, "Category Selection", "", "", "");
CAF_PDM_InitField(&m_useCategorySelection, "CategorySelection", false, "Category Selection", "", "", "");
m_upperBound.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
updateIconState();
@@ -109,7 +109,7 @@ void RimEclipsePropertyFilter::rangeValues(double* lower, double* upper) const
//--------------------------------------------------------------------------------------------------
bool RimEclipsePropertyFilter::isCategorySelectionActive() const
{
if (resultDefinition->hasCategoryResult() && m_categorySelection)
if (resultDefinition->hasCategoryResult() && m_useCategorySelection)
{
return true;
}
@@ -122,10 +122,6 @@ bool RimEclipsePropertyFilter::isCategorySelectionActive() const
//--------------------------------------------------------------------------------------------------
void RimEclipsePropertyFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (&m_categorySelection == changedField)
{
updateFieldVisibility();
}
if ( &m_lowerBound == changedField
|| &m_upperBound == changedField
@@ -133,7 +129,7 @@ void RimEclipsePropertyFilter::fieldChangedByUi(const caf::PdmFieldHandle* chang
|| &isActive == changedField
|| &filterMode == changedField
|| &m_selectedCategoryValues == changedField
|| &m_categorySelection == changedField)
|| &m_useCategorySelection == changedField)
{
updateFilterName();
this->updateIconState();
@@ -164,9 +160,8 @@ void RimEclipsePropertyFilter::setToDefaultValues()
m_upperBound = m_maximumResultValue;
m_selectedCategoryValues = m_categoryValues;
m_categorySelection = true;
m_useCategorySelection = true;
updateFieldVisibility();
}
//--------------------------------------------------------------------------------------------------
@@ -183,13 +178,21 @@ void RimEclipsePropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUi
// Fields declared in RimCellFilter
uiOrdering.add(&filterMode);
uiOrdering.add(&m_categorySelection);
// Fields declared in this class (RimCellPropertyFilter)
uiOrdering.add(&m_lowerBound);
uiOrdering.add(&m_upperBound);
if (resultDefinition->hasCategoryResult())
{
uiOrdering.add(&m_useCategorySelection);
}
uiOrdering.add(&m_selectedCategoryValues);
if ( resultDefinition->hasCategoryResult() && m_useCategorySelection() )
{
uiOrdering.add(&m_selectedCategoryValues);
}
else
{
uiOrdering.add(&m_lowerBound);
uiOrdering.add(&m_upperBound);
}
uiOrdering.setForgetRemainingFields(true);
@@ -254,38 +257,6 @@ void RimEclipsePropertyFilter::updateActiveState()
isActive.uiCapability()->setUiReadOnly(isPropertyFilterControlled());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipsePropertyFilter::updateFieldVisibility()
{
if (resultDefinition->hasCategoryResult())
{
m_categorySelection.uiCapability()->setUiHidden(false);
if (!m_categorySelection)
{
m_selectedCategoryValues.uiCapability()->setUiHidden(true);
m_lowerBound.uiCapability()->setUiHidden(false);
m_upperBound.uiCapability()->setUiHidden(false);
}
else
{
m_selectedCategoryValues.uiCapability()->setUiHidden(false);
m_lowerBound.uiCapability()->setUiHidden(true);
m_upperBound.uiCapability()->setUiHidden(true);
}
}
else
{
m_lowerBound.uiCapability()->setUiHidden(false);
m_upperBound.uiCapability()->setUiHidden(false);
m_selectedCategoryValues.uiCapability()->setUiHidden(true);
m_categorySelection.uiCapability()->setUiHidden(true);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -410,6 +381,5 @@ void RimEclipsePropertyFilter::initAfterRead()
resultDefinition->loadResult();
updateIconState();
computeResultValueRange();
updateFieldVisibility();
}