From e10c7fd63380f48fbc6036966479d11439bc2868 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 15 Dec 2017 12:34:22 +0100 Subject: [PATCH] #2265 Xml Keywords : Remove fishbones prefix --- .../ProjectDataModel/Completions/RimFishboneWellPath.cpp | 3 ++- .../ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp index 0473d60b0c..85288c01cd 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp @@ -34,8 +34,10 @@ RimFishboneWellPath::RimFishboneWellPath() CAF_PDM_InitObject("WellPathCompletion", ":/FishBoneLateralFromFile16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_coordinates, "Coordinates", "Coordinates", "", "", ""); m_coordinates.uiCapability()->setUiHidden(true); + CAF_PDM_InitFieldNoDefault(&m_measuredDepths, "MeasuredDepth", "MeasuredDepth", "", "", ""); m_measuredDepths.uiCapability()->setUiHidden(true); + userDescriptionField()->uiCapability()->setUiHidden(true); CAF_PDM_InitFieldNoDefault(&m_displayCoordinates, "DisplayCoordinates", "Coordinates", "", "", ""); @@ -45,7 +47,6 @@ RimFishboneWellPath::RimFishboneWellPath() m_displayCoordinates.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LabelPosType::TOP); } - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp index f95c68576b..cdbf165d62 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp @@ -61,7 +61,7 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs() { CAF_PDM_InitObject("FishbonesMultipleSubs", ":/FishBoneGroup16x16.png", "", ""); - CAF_PDM_InitField(&fishbonesColor, "FishbonesColor", cvf::Color3f(0.999f, 0.333f, 0.999f), "Fishbones Color", "", "", ""); + CAF_PDM_InitField(&fishbonesColor, "Color", cvf::Color3f(0.999f, 0.333f, 0.999f), "Fishbones Color", "", "", ""); CAF_PDM_InitField(&m_lateralCountPerSub, "LateralCountPerSub", size_t(3), "Laterals Per Sub", "", "", ""); CAF_PDM_InitField(&m_lateralLength, "LateralLength", QString("11.0"), "Length(s) [m]", "", "Specify multiple length values if the sub lengths differ", "");