OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

(#483) Improved disabled state (gray icon) for range filters/filtercollection

Browse Source
This commit is contained in:
Magne Sjaastad
2015-11-02 09:50:43 +01:00
parent 572601c3db
commit b10fedb997
5 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
+25 -4
View File
@@ -29,6 +29,7 @@
#include "RimEclipseCase.h"
#include "RimCellRangeFilterCollection.h"
#include "RimEclipseView.h"
#include "RimViewController.h"
#include "cafPdmUiSliderEditor.h"
#include "cvfAssert.h"
@@ -229,20 +230,40 @@ void RimCellRangeFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
firstAnchestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
bool isFilterOverride = false;
if (rimView->overrideRangeFilterCollection())
bool isRangeFilterControlled = false;
if (rimView->viewController() && rimView->viewController()->isRangeFiltersControlled())
{
isFilterOverride = true;
isRangeFilterControlled = true;
}
std::vector<caf::PdmFieldHandle*> objFields;
this->fields(objFields);
for (size_t i = 0; i < objFields.size(); i ++)
{
objFields[i]->uiCapability()->setUiReadOnly(isFilterOverride);
objFields[i]->uiCapability()->setUiReadOnly(isRangeFilterControlled);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilter::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName)
{
RimCellFilter::defineUiTreeOrdering(uiTreeOrdering, uiConfigName);
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
bool isRangeFilterControlled = false;
if (rimView->viewController() && rimView->viewController()->isRangeFiltersControlled())
{
isRangeFilterControlled = true;
}
isActive.uiCapability()->setUiReadOnly(isRangeFilterControlled);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------