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

(#401) Updated sensitivity and GUI of ViewLink to reflect the visible cells possibilities

Browse Source
This commit is contained in:
Jacob Støren
2015-09-21 18:53:08 +02:00
parent 7cf61eb636
commit a0dabca6ed
2 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
ApplicationCode/ProjectDataModel/RimViewLink.cpp
View File

@@ -65,7 +65,7 @@ RimViewLink::RimViewLink(void)
CAF_PDM_InitField(&syncTimeStep, "SyncTimeStep", true, "Time Step", "", "", "");
CAF_PDM_InitField(&syncCellResult, "SyncCellResult", false, "Cell Result", "", "", "");
CAF_PDM_InitField(&syncVisibleCells, "SyncVisibleCells", false, "Visible Cells", "", "", "");
CAF_PDM_InitField(&m_syncVisibleCells, "SyncVisibleCells", false, "Visible Cells", "", "", "");
//syncVisibleCells.uiCapability()->setUiHidden(true); // For now
CAF_PDM_InitField(&syncRangeFilters, "SyncRangeFilters", true, "Range Filters", "", "", "");
@@ -221,7 +221,7 @@ void RimViewLink::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
name.uiCapability()->updateConnectedEditors();
}
else if (&syncVisibleCells == changedField)
else if (&m_syncVisibleCells == changedField)
{
updateOptionSensitivity();
configureOverrides();
@@ -287,16 +287,12 @@ void RimViewLink::configureOverrides()
if (manEclView) manEclView->setOverridePropertyFilterCollection(NULL);
if (manGeoView) manGeoView->setOverridePropertyFilterCollection(NULL);
}
else if (syncVisibleCells)
else if (syncVisibleCells())
{
m_managedView->setOverrideRangeFilterCollection(NULL);
if (manEclView) manEclView->setOverridePropertyFilterCollection(NULL);
if (manGeoView) manGeoView->setOverridePropertyFilterCollection(NULL);
// Todo: set up the managed view with the visible cell override.
// Create Cell-mapping if necessary
// Set VisibleCellsOverrider object on the managed view,
// with master view and mapper object
}
else
{
@@ -360,17 +356,17 @@ void RimViewLink::updateOptionSensitivity()
RimEclipseView* eclipseMasterView = dynamic_cast<RimEclipseView*>(mainView);
RimGeoMechView* geoMasterView = dynamic_cast<RimGeoMechView*>(mainView);
bool hideCapabilities = false;
bool isMasterAndDependentViewDifferentType = false;
if (eclipseMasterView && !managedEclipseView())
{
hideCapabilities = true;
isMasterAndDependentViewDifferentType = true;
}
if (geoMasterView && !managedGeoView())
{
hideCapabilities = true;
isMasterAndDependentViewDifferentType = true;
}
if (hideCapabilities)
if (isMasterAndDependentViewDifferentType)
{
this->syncCellResult.uiCapability()->setUiReadOnly(true);
this->syncCellResult = false;
@@ -382,11 +378,12 @@ void RimViewLink::updateOptionSensitivity()
else
{
this->syncCellResult.uiCapability()->setUiReadOnly(false);
bool filterSyncBlocked = syncVisibleCells();
this->syncRangeFilters.uiCapability()->setUiReadOnly(filterSyncBlocked);
this->syncPropertyFilters.uiCapability()->setUiReadOnly(filterSyncBlocked);
this->syncRangeFilters.uiCapability()->setUiReadOnly(false);
this->syncPropertyFilters.uiCapability()->setUiReadOnly(false);
}
m_syncVisibleCells.uiCapability()->setUiReadOnly(!this->isVisibleCellsSyncPossible());
}
//--------------------------------------------------------------------------------------------------
@@ -410,6 +407,7 @@ void RimViewLink::setManagedView(RimView* view)
//--------------------------------------------------------------------------------------------------
void RimViewLink::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
updateOptionSensitivity();
uiOrdering.add(&m_managedView);
caf::PdmUiGroup* scriptGroup = uiOrdering.addNewGroup("Link Options");
@@ -419,7 +417,7 @@ void RimViewLink::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
scriptGroup->add(&syncCellResult);
caf::PdmUiGroup* visibleCells = uiOrdering.addNewGroup("Link Cell Filters");
visibleCells->add(&syncVisibleCells);
visibleCells->add(&m_syncVisibleCells);
visibleCells->add(&syncRangeFilters);
visibleCells->add(&syncPropertyFilters);
}
@@ -603,3 +601,39 @@ RimView* RimViewLink::masterView()
return ownerViewLinker()->mainView();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimViewLink::isVisibleCellsSyncPossible()
{
RimEclipseView* eclipseMasterView = dynamic_cast<RimEclipseView*>(masterView());
RimGeoMechView* geoMasterView = dynamic_cast<RimGeoMechView*>(masterView());
bool isMasterAndDependentViewDifferentType = false;
if (eclipseMasterView && !managedEclipseView())
{
isMasterAndDependentViewDifferentType = true;
}
if (geoMasterView && !managedGeoView())
{
isMasterAndDependentViewDifferentType = true;
}
return isMasterAndDependentViewDifferentType;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimViewLink::syncVisibleCells()
{
if (isVisibleCellsSyncPossible())
{
return m_syncVisibleCells();
}
else
{
return false;
}
}

5
ApplicationCode/ProjectDataModel/RimViewLink.h
View File

@@ -60,7 +60,7 @@ public:
// Overridden properties
caf::PdmField<bool> syncCellResult;
caf::PdmField<bool> syncVisibleCells;
bool syncVisibleCells();
caf::PdmField<bool> syncRangeFilters;
caf::PdmField<bool> syncPropertyFilters;
@@ -85,11 +85,14 @@ private:
void doSyncTimeStep();
void doSyncCellResult();
bool isVisibleCellsSyncPossible();
RimEclipseView* managedEclipseView();
RimGeoMechView* managedGeoView();
caf::PdmPtrField<RimView*> m_managedView;
QIcon m_originalIcon;
cvf::ref<RigCaseToCaseCellMapper> m_caseToCaseCellMapper;
caf::PdmField<bool> m_syncVisibleCells;
};