OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 01:12:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor GUI adjustments

Browse Source 
* Select view when MDI window is activated

* Update linked views when property filter is linked

* Do not ask for restore of cell filters if none are present

* Update tree view when linking of property filters is disabled

* Add check box for multiple results in Result Info box
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2022-12-21 10:50:26 +01:00
1 parent de29b3b0ed
commit e815a02758
4 files changed
+88 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimViewController.cpp
+33 -7
View File
@@ -499,7 +499,28 @@ void RimViewController::updateDisplayNameAndIcon()
//--------------------------------------------------------------------------------------------------
void RimViewController::updateDuplicatedPropertyFilters()
{
if ( !m_duplicatePropertyFilters ) return;
if ( !m_duplicatePropertyFilters )
{
// A chain icon is used to indicate that a property filter is linked. If a property filter is unlinked, update
// the property filters to make sure the chain icon is removed
std::vector<RimPropertyFilterCollection*> eclipsePropertyFilters;
RimProject::current()->descendantsIncludingThisOfType( eclipsePropertyFilters );
for ( auto p : eclipsePropertyFilters )
{
p->updateConnectedEditors();
}
std::vector<RimGeoMechPropertyFilterCollection*> geoMechPropertyFilters;
RimProject::current()->descendantsIncludingThisOfType( geoMechPropertyFilters );
for ( auto p : geoMechPropertyFilters )
{
p->updateConnectedEditors();
}
return;
}
RimViewLinker* viewLinker = ownerViewLinker();
@@ -519,6 +540,9 @@ void RimViewController::updateDuplicatedPropertyFilters()
manEclView->eclipsePropertyFilterCollection()->loadAndInitializePropertyFilters();
manEclView->eclipsePropertyFilterCollection()->setIsDuplicatedFromLinkedView();
manEclView->eclipsePropertyFilterCollection()->updateAllRequiredEditors();
manEclView->scheduleGeometryRegen( PROPERTY_FILTERED );
manEclView->scheduleCreateDisplayModelAndRedraw();
}
auto* masterGeoView = dynamic_cast<RimGeoMechView*>( masterView );
@@ -528,8 +552,11 @@ void RimViewController::updateDuplicatedPropertyFilters()
auto propertyString = masterGeoView->geoMechPropertyFilterCollection()->writeObjectToXmlString();
manGeoView->geoMechPropertyFilterCollection()->readObjectFromXmlString( propertyString,
caf::PdmDefaultObjectFactory::instance() );
managedGeoView()->geoMechPropertyFilterCollection()->loadAndInitializePropertyFilters();
managedGeoView()->geoMechPropertyFilterCollection()->updateAllRequiredEditors();
manGeoView->geoMechPropertyFilterCollection()->loadAndInitializePropertyFilters();
manGeoView->geoMechPropertyFilterCollection()->updateAllRequiredEditors();
manGeoView->scheduleGeometryRegen( PROPERTY_FILTERED );
manGeoView->scheduleCreateDisplayModelAndRedraw();
}
}
}
@@ -1098,15 +1125,14 @@ void RimViewController::applyCellFilterCollectionByUserChoice()
RimViewLinker* viewLinker = ownerViewLinker();
auto* masterView = dynamic_cast<RimGridView*>( viewLinker->masterView() );
bool anyActiveFilter = false;
bool anyActiveCellFilter = false;
if ( masterView )
{
anyActiveFilter = !masterView->cellFilterCollection()->filters().empty() ||
masterView->propertyFilterCollection()->hasActiveFilters();
anyActiveCellFilter = !masterView->cellFilterCollection()->filters().empty();
}
if ( anyActiveFilter && askUserToRestoreOriginalCellFilterCollection( m_managedView->name() ) )
if ( anyActiveCellFilter && askUserToRestoreOriginalCellFilterCollection( m_managedView->name() ) )
{
managedGridView->setOverrideCellFilterCollection( nullptr );
}