From c959db73a1b620126c79628c67061564ec72f201 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Wed, 9 May 2018 15:55:54 +0200 Subject: [PATCH] #2887 Tidy up 3D well log curve configuration to more obvious documentation. --- .../ModelVisualization/Riv3dWellLogPlanePartMgr.cpp | 2 +- .../Completions/Rim3dWellLogCurveCollection.cpp | 8 +++----- ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp | 2 +- .../ProjectDataModel/RimWellLogCurveNameConfig.cpp | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp index 73b38e0a62..f7a8e7b50c 100644 --- a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp @@ -114,7 +114,7 @@ void Riv3dWellLogPlanePartMgr::append3dWellLogCurveToModel(cvf::ModelBasicList* if (curveDrawable.notNull() && curveDrawable->boundingBox().isValid()) { caf::MeshEffectGenerator meshEffectGen(rim3dWellLogCurve->color()); - meshEffectGen.setLineWidth(2.0f); + meshEffectGen.setLineWidth(3.0f); cvf::ref effect = meshEffectGen.generateCachedEffect(); cvf::ref part = new cvf::Part; diff --git a/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp index 2ad6866768..f1709c5f69 100644 --- a/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp @@ -202,12 +202,10 @@ caf::PdmFieldHandle* Rim3dWellLogCurveCollection::objectToggleField() //-------------------------------------------------------------------------------------------------- void Rim3dWellLogCurveCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) { - caf::PdmUiGroup* settingsGroup = uiOrdering.addNewGroup("Draw Plane Configuration"); + caf::PdmUiGroup* settingsGroup = uiOrdering.addNewGroup("Draw Plane Appearance"); + settingsGroup->add(&m_showGrid); + settingsGroup->add(&m_showBackground); settingsGroup->add(&m_planeWidthScaling); - - caf::PdmUiGroup* appearanceSettingsGroup = uiOrdering.addNewGroup("Draw Plane Appearance"); - appearanceSettingsGroup->add(&m_showGrid); - appearanceSettingsGroup->add(&m_showBackground); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp index 7fcf8767d3..1c4c13953f 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp @@ -204,7 +204,7 @@ void Rim3dWellLogCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField //-------------------------------------------------------------------------------------------------- void Rim3dWellLogCurve::configurationUiOrdering(caf::PdmUiOrdering& uiOrdering) { - caf::PdmUiGroup* configurationGroup = uiOrdering.addNewGroup("Curve Configuration"); + caf::PdmUiGroup* configurationGroup = uiOrdering.addNewGroup("Curve Appearance"); configurationGroup->add(&m_drawPlane); // Disable filled draw style in the GUI because of triangle stitching issue #2860. // configurationGroup->add(&m_drawStyle); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogCurveNameConfig.cpp b/ApplicationCode/ProjectDataModel/RimWellLogCurveNameConfig.cpp index 579f1d345d..1cd7555830 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogCurveNameConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogCurveNameConfig.cpp @@ -88,7 +88,7 @@ QString RimCurveNameConfig::name() const //-------------------------------------------------------------------------------------------------- caf::PdmUiGroup* RimCurveNameConfig::createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) { - caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name Configuration"); + caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name"); nameGroup->add(&m_isUsingAutoName); return nameGroup; }