OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-04 13:16:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#667) Make Grids toggle follow toggle button in toolbar

Browse Source 
Renamed toolbar text to "Hide Grid Cells"
This commit is contained in:
Magne Sjaastad committed 2015-11-27 13:47:02 +01:00
1 parent a42b0d2c8e
commit f33a3174ee
8 files changed
+25 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/RimGridCollection.cpp
+7 -7
View File
@@ -30,8 +30,8 @@ RimGridCollection::RimGridCollection()
{
CAF_PDM_InitObject("Grids", ":/draw_style_faults_24x24.png", "", "");
CAF_PDM_InitField(&m_isActive, "IsActive", true, "Show grid cells", "", "", "");
m_isActive.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&isActive, "IsActive", true, "Show grid cells", "", "", "");
isActive.uiCapability()->setUiHidden(true);
}
//--------------------------------------------------------------------------------------------------
@@ -47,7 +47,7 @@ RimGridCollection::~RimGridCollection()
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimGridCollection::objectToggleField()
{
return &m_isActive;
return &isActive;
}
//--------------------------------------------------------------------------------------------------
@@ -55,15 +55,15 @@ caf::PdmFieldHandle* RimGridCollection::objectToggleField()
//--------------------------------------------------------------------------------------------------
void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &m_isActive)
if (changedField == &isActive)
{
RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
rimView->setShowFaultsOnly(!m_isActive);
rimView->showGridCells(isActive);
updateUiIconFromState(m_isActive);
updateUiIconFromState(isActive);
}
}
@@ -72,5 +72,5 @@ void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField
//--------------------------------------------------------------------------------------------------
void RimGridCollection::initAfterRead()
{
updateUiIconFromState(m_isActive);
updateUiIconFromState(isActive);
}