From 4cf427ce69ba5184b85f0a38240f00696ed10c60 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Thu, 13 Feb 2020 11:27:31 +0100 Subject: [PATCH] Minor WBS plot layout work --- .../RicNewWellBoreStabilityPlotFeature.cpp | 8 ++++---- .../ProjectDataModel/RimWellLogTrack.cpp | 20 +++++++++++++++++-- .../ProjectDataModel/RimWellLogTrack.h | 2 ++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp index 93356b9816..46cedc1f44 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp @@ -215,7 +215,7 @@ void RicNewWellBoreStabilityPlotFeature::createFormationTrack( RimWellBoreStabil formationTrack->setFormationCase( geoMechCase ); formationTrack->setAnnotationType( RiuPlotAnnotationTool::FORMATION_ANNOTATIONS ); formationTrack->setVisibleXRange( 0.0, 0.0 ); - formationTrack->setColSpan( RimPlot::TWO ); + formationTrack->setColSpan( RimPlot::ONE ); } //-------------------------------------------------------------------------------------------------- @@ -251,7 +251,7 @@ void RicNewWellBoreStabilityPlotFeature::createParametersTrack( RimWellBoreStabi { RimWellLogTrack* paramCurvesTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, "WBS Parameters", plot ); - paramCurvesTrack->setColSpan( RimPlot::THREE ); + paramCurvesTrack->setColSpan( RimPlot::TWO ); paramCurvesTrack->setVisibleXRange( 0.0, 1.0 ); paramCurvesTrack->setAutoScaleXEnabled( true ); paramCurvesTrack->setTickIntervals( 0.5, 0.1 ); @@ -299,7 +299,7 @@ void RicNewWellBoreStabilityPlotFeature::createStabilityCurvesTrack( RimWellBore plot ); stabilityCurvesTrack->setVisibleXRange( 0.0, 2.5 ); - stabilityCurvesTrack->setColSpan( RimPlot::SIX ); + stabilityCurvesTrack->setColSpan( RimPlot::THREE ); stabilityCurvesTrack->setAutoScaleXEnabled( true ); stabilityCurvesTrack->setTickIntervals( 1.0, 0.2 ); stabilityCurvesTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR_AND_MINOR ); @@ -412,7 +412,7 @@ void RicNewWellBoreStabilityPlotFeature::createAnglesTrack( RimWellBoreStability maxValue = cvf::Math::clamp( maxValue, angleIncrement, 720.0 ); minValue = cvf::Math::clamp( minValue, 0.0, maxValue - 90.0 ); } - wellPathAnglesTrack->setColSpan( RimPlot::THREE ); + wellPathAnglesTrack->setColSpan( RimPlot::TWO ); wellPathAnglesTrack->setVisibleXRange( minValue, maxValue ); wellPathAnglesTrack->setTickIntervals( 180.0, 45.0 ); wellPathAnglesTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR_AND_MINOR ); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp index b592e8d2af..e3dc5fa017 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp @@ -235,9 +235,9 @@ RimWellLogTrack::RimWellLogTrack() CAF_PDM_InitField( &m_showformationFluids, "ShowFormationFluids", false, "Show Fluids", "", "", "" ); CAF_PDM_InitField( &m_showWellPathAttributes, "ShowWellPathAttributes", false, "Show Well Attributes", "", "", "" ); - CAF_PDM_InitField( &m_wellPathAttributesInLegend, "WellPathAttributesInLegend", false, "Attributes in Legend", "", "", "" ); + CAF_PDM_InitField( &m_wellPathAttributesInLegend, "WellPathAttributesInLegend", true, "Attributes in Legend", "", "", "" ); CAF_PDM_InitField( &m_showWellPathCompletions, "ShowWellPathCompletions", true, "Show Well Completions", "", "", "" ); - CAF_PDM_InitField( &m_wellPathCompletionsInLegend, "WellPathCompletionsInLegend", false, "Completions in Legend", "", "", "" ); + CAF_PDM_InitField( &m_wellPathCompletionsInLegend, "WellPathCompletionsInLegend", true, "Completions in Legend", "", "", "" ); CAF_PDM_InitField( &m_showWellPathComponentsBothSides, "ShowWellPathAttrBothSides", true, "Show Both Sides", "", "", "" ); CAF_PDM_InitField( &m_showWellPathComponentLabels, "ShowWellPathAttrLabels", false, "Show Labels", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_wellPathComponentSource, "AttributesWellPathSource", "Well Path", "", "", "" ); @@ -1535,6 +1535,22 @@ void RimWellLogTrack::setShowWellPathAttributes( bool on ) m_showWellPathAttributes = on; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellLogTrack::setShowWellPathAttributesInLegend( bool on ) +{ + m_wellPathAttributesInLegend = on; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellLogTrack::setShowWellPathCompletionsInLegend( bool on ) +{ + m_wellPathCompletionsInLegend = on; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.h b/ApplicationCode/ProjectDataModel/RimWellLogTrack.h index 9854a09816..8cbfabd6ad 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.h @@ -172,6 +172,8 @@ public: bool showWellPathAttributes() const; void setShowWellPathAttributes( bool on ); + void setShowWellPathAttributesInLegend( bool on ); + void setShowWellPathCompletionsInLegend( bool on ); void setShowBothSidesOfWell( bool on ); void setWellPathAttributesSource( RimWellPath* wellPath );