From 4d5503afb4557f7cd2eb4493db3656d73eef3b8a Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 19 Jan 2018 10:30:33 +0100 Subject: [PATCH 1/2] #2385 Main Window: More flexible docking restrictions --- ApplicationCode/UserInterface/RiuMainWindowBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ApplicationCode/UserInterface/RiuMainWindowBase.cpp b/ApplicationCode/UserInterface/RiuMainWindowBase.cpp index 0bada423d5..0c09d6e193 100644 --- a/ApplicationCode/UserInterface/RiuMainWindowBase.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindowBase.cpp @@ -27,7 +27,7 @@ //-------------------------------------------------------------------------------------------------- RiuMainWindowBase::RiuMainWindowBase() { - + setDockNestingEnabled(true); } //-------------------------------------------------------------------------------------------------- From 84725ced9b75ebb8e5147f8acebd7507445b4204 Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Fri, 26 Jan 2018 15:49:13 +0100 Subject: [PATCH 2/2] Make branch detection toggle hidden if show formations is toggled off --- ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp index 7ff373fff1..aafbeffed8 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp @@ -1202,6 +1202,7 @@ void RimWellLogTrack::setFormationFieldsUiReadOnly(bool readOnly /*= true*/) m_formationCase.uiCapability()->setUiReadOnly(readOnly); m_formationWellPathForSourceCase.uiCapability()->setUiReadOnly(readOnly); m_formationWellPathForSourceWellPath.uiCapability()->setUiReadOnly(readOnly); + m_formationBranchDetection.uiCapability()->setUiReadOnly(readOnly); m_formationBranchIndex.uiCapability()->setUiReadOnly(readOnly); m_formationLevel.uiCapability()->setUiReadOnly(readOnly); m_showformationFluids.uiCapability()->setUiReadOnly(readOnly);