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

Fixed visibility and rebuild of child items for filters

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-10 23:23:41 +02:00
parent 56907a5c6e
commit 5610bf5a10
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/RicEclipsePropertyFilter.cpp
View File

@ -62,8 +62,7 @@ void RicEclipsePropertyFilter::addPropertyFilter(RimEclipsePropertyFilterCollect
propertyFilterCollection->propertyFilters.push_back(propertyFilter); propertyFilterCollection->propertyFilters.push_back(propertyFilter);
propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED); propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED);
caf::PdmUiFieldHandle::updateConnectedUiEditors(propertyFilterCollection->parentField()); propertyFilterCollection->updateConnectedEditors();
caf::PdmUiFieldHandle::updateConnectedUiEditors(&propertyFilterCollection->propertyFilters);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -77,8 +76,7 @@ void RicEclipsePropertyFilter::insertPropertyFilter(RimEclipsePropertyFilterColl
propertyFilterCollection->propertyFilters.insertAt(index, propertyFilter); propertyFilterCollection->propertyFilters.insertAt(index, propertyFilter);
propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED); propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED);
caf::PdmUiFieldHandle::updateConnectedUiEditors(propertyFilterCollection->parentField()); propertyFilterCollection->updateConnectedEditors();
caf::PdmUiFieldHandle::updateConnectedUiEditors(&propertyFilterCollection->propertyFilters);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp
View File

@ -64,5 +64,6 @@ void RicEclipsePropertyFilterNewExec::redo()
void RicEclipsePropertyFilterNewExec::undo() void RicEclipsePropertyFilterNewExec::undo()
{ {
m_propertyFilterCollection->propertyFilters.erase(m_propertyFilterCollection->propertyFilters.size() - 1); m_propertyFilterCollection->propertyFilters.erase(m_propertyFilterCollection->propertyFilters.size() - 1);
caf::PdmUiFieldHandle::updateConnectedUiEditors(m_propertyFilterCollection->parentField());
m_propertyFilterCollection->updateConnectedEditors();
} }

5
ApplicationCode/Commands/RicRangeFilterNewExec.cpp
View File

@ -103,8 +103,7 @@ void RicRangeFilterNewExec::redo()
cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED); cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED);
cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE); cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE);
caf::PdmUiFieldHandle::updateConnectedUiEditors(cellRangeFilterCollection->parentField()); cellRangeFilterCollection->updateConnectedEditors();
caf::PdmUiFieldHandle::updateConnectedUiEditors(&cellRangeFilterCollection->rangeFilters);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -116,5 +115,5 @@ void RicRangeFilterNewExec::undo()
cellRangeFilterCollection->rangeFilters.erase(cellRangeFilterCollection->rangeFilters.size() - 1); cellRangeFilterCollection->rangeFilters.erase(cellRangeFilterCollection->rangeFilters.size() - 1);
caf::PdmUiFieldHandle::updateConnectedUiEditors(cellRangeFilterCollection->parentField()); cellRangeFilterCollection->updateConnectedEditors();
} }

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -104,7 +104,7 @@ RimEclipseView::RimEclipseView()
CAF_PDM_InitFieldNoDefault(&propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", ""); CAF_PDM_InitFieldNoDefault(&propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", "");
propertyFilterCollection = new RimEclipsePropertyFilterCollection(); propertyFilterCollection = new RimEclipsePropertyFilterCollection();
rangeFilterCollection.uiCapability()->setUiHidden(true); propertyFilterCollection.uiCapability()->setUiHidden(true);
propertyFilterCollection->setReservoirView(this); propertyFilterCollection->setReservoirView(this);
// Visualization fields // Visualization fields