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

#805 Use defineUiTreeOrdering instead of setUiHidden

Browse Source
This commit is contained in:
Magne Sjaastad 2016-08-05 15:06:50 +02:00
parent 23bd3c9b0c
commit 3abd849230
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@ -28,6 +28,7 @@
#include "RimViewLinker.h" #include "RimViewLinker.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeOrdering.h"
CAF_PDM_SOURCE_INIT(RimEclipseCellColors, "ResultSlot"); CAF_PDM_SOURCE_INIT(RimEclipseCellColors, "ResultSlot");
@ -40,22 +41,14 @@ RimEclipseCellColors::RimEclipseCellColors()
CAF_PDM_InitObject("Cell Result", ":/CellResult.png", "", ""); CAF_PDM_InitObject("Cell Result", ":/CellResult.png", "", "");
CAF_PDM_InitFieldNoDefault(&obsoleteField_legendConfig, "LegendDefinition", "Legend Definition", "", "", ""); CAF_PDM_InitFieldNoDefault(&obsoleteField_legendConfig, "LegendDefinition", "Legend Definition", "", "", "");
this->obsoleteField_legendConfig.uiCapability()->setUiHidden(true);
this->obsoleteField_legendConfig.uiCapability()->setUiChildrenHidden(true);
this->obsoleteField_legendConfig.xmlCapability()->setIOWritable(false); this->obsoleteField_legendConfig.xmlCapability()->setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&m_legendConfigData, "ResultVarLegendDefinitionList", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_legendConfigData, "ResultVarLegendDefinitionList", "", "", "", "");
m_legendConfigData.uiCapability()->setUiHidden(true);
m_legendConfigData.uiCapability()->setUiChildrenHidden(true);
CAF_PDM_InitFieldNoDefault(&ternaryLegendConfig, "TernaryLegendDefinition", "Ternary Legend Definition", "", "", ""); CAF_PDM_InitFieldNoDefault(&ternaryLegendConfig, "TernaryLegendDefinition", "Ternary Legend Definition", "", "", "");
this->ternaryLegendConfig = new RimTernaryLegendConfig(); this->ternaryLegendConfig = new RimTernaryLegendConfig();
this->ternaryLegendConfig.uiCapability()->setUiHidden(true);
this->ternaryLegendConfig.uiCapability()->setUiChildrenHidden(true);
CAF_PDM_InitFieldNoDefault(&m_legendConfigPtrField, "LegendDefinitionPtrField", "Legend Definition PtrField", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_legendConfigPtrField, "LegendDefinitionPtrField", "Legend Definition PtrField", "", "", "");
this->m_legendConfigPtrField.uiCapability()->setUiHidden(true);
this->m_legendConfigPtrField.uiCapability()->setUiChildrenHidden(true);
// Make sure we have a created legend for the default/undefined result variable // Make sure we have a created legend for the default/undefined result variable
changeLegendConfig(this->resultVariable()); changeLegendConfig(this->resultVariable());
@ -108,15 +101,8 @@ void RimEclipseCellColors::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipseCellColors::changeLegendConfig(QString resultVarNameOfNewLegend) void RimEclipseCellColors::changeLegendConfig(QString resultVarNameOfNewLegend)
{ {
if (resultVarNameOfNewLegend == RimDefines::ternarySaturationResultName()) if (resultVarNameOfNewLegend != RimDefines::ternarySaturationResultName())
{ {
this->ternaryLegendConfig.uiCapability()->setUiChildrenHidden(false);
this->m_legendConfigPtrField.uiCapability()->setUiChildrenHidden(true);
}
else
{
this->ternaryLegendConfig.uiCapability()->setUiChildrenHidden(true);
bool found = false; bool found = false;
QString legendResultVariable; QString legendResultVariable;
@ -149,8 +135,6 @@ void RimEclipseCellColors::changeLegendConfig(QString resultVarNameOfNewLegend)
this->m_legendConfigPtrField = newLegend; this->m_legendConfigPtrField = newLegend;
} }
} }
this->m_legendConfigPtrField.uiCapability()->setUiChildrenHidden(false);
} }
} }
@ -188,7 +172,16 @@ void RimEclipseCellColors::initAfterRead()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipseCellColors::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) void RimEclipseCellColors::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{ {
uiTreeOrdering.add(m_legendConfigPtrField()); if (this->resultVariable() == RimDefines::ternarySaturationResultName())
{
uiTreeOrdering.add(ternaryLegendConfig());
}
else
{
uiTreeOrdering.add(m_legendConfigPtrField());
}
uiTreeOrdering.setForgetRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -207,6 +200,7 @@ void RimEclipseCellColors::setReservoirView(RimEclipseView* ownerReservoirView)
this->ternaryLegendConfig()->setReservoirView(ownerReservoirView); this->ternaryLegendConfig()->setReservoirView(ownerReservoirView);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -215,7 +209,6 @@ RimEclipseView* RimEclipseCellColors::reservoirView()
return m_reservoirView; return m_reservoirView;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------