From f7f9f933034af018a04cf59a4838e880b87dedcf Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Tue, 14 Jul 2020 14:04:50 +0200 Subject: [PATCH 1/2] #6228 Fix crash when creating user-defined curves in fracture model plot. --- ApplicationCode/Commands/RicWellLogTools.cpp | 3 ++- ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp | 3 ++- ApplicationCode/ProjectDataModel/RimWellMeasurementCurve.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/Commands/RicWellLogTools.cpp b/ApplicationCode/Commands/RicWellLogTools.cpp index 8f7dde6b93..6b4c2ef8ce 100644 --- a/ApplicationCode/Commands/RicWellLogTools.cpp +++ b/ApplicationCode/Commands/RicWellLogTools.cpp @@ -23,6 +23,7 @@ #include "Rim3dView.h" #include "RimCase.h" +#include "RimDepthTrackPlot.h" #include "RimEclipseResultCase.h" #include "RimProject.h" #include "RimSimWellInView.h" @@ -185,7 +186,7 @@ ExtractionCurveType* RicWellLogTools::addExtractionCurve( RimWellLogTrack* cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() ); curve->setColor( curveColor ); - RimWellLogPlot* plot = nullptr; + RimDepthTrackPlot* plot = nullptr; plotTrack->firstAncestorOrThisOfTypeAsserted( plot ); RimWellLogCurveCommonDataSource* commonDataSource = plot->commonDataSource(); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp index 7021266bab..6ba3d21116 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp @@ -34,6 +34,7 @@ #include "RigWellPathGeometryTools.h" #include "RigWellPathIntersectionTools.h" +#include "RimDepthTrackPlot.h" #include "RimEclipseResultCase.h" #include "RimMainPlotCollection.h" #include "RimObservedFmuRftData.h" @@ -379,7 +380,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot ) if ( isCurveVisible() ) { - RimWellLogPlot* wellLogPlot; + RimDepthTrackPlot* wellLogPlot; firstAncestorOrThisOfType( wellLogPlot ); CVF_ASSERT( wellLogPlot ); diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurementCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellMeasurementCurve.cpp index 16811645b4..d69c984a5b 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurementCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurementCurve.cpp @@ -21,10 +21,10 @@ #include "RigWellLogCurveData.h" #include "RigWellPath.h" +#include "RimDepthTrackPlot.h" #include "RimProject.h" #include "RimTools.h" #include "RimWellLogFile.h" -#include "RimWellLogPlot.h" #include "RimWellLogTrack.h" #include "RimWellMeasurement.h" #include "RimWellMeasurementCollection.h" @@ -74,7 +74,7 @@ RimWellMeasurementCurve::~RimWellMeasurementCurve() //-------------------------------------------------------------------------------------------------- void RimWellMeasurementCurve::onLoadDataAndUpdate( bool updateParentPlot ) { - RimWellLogPlot* wellLogPlot; + RimDepthTrackPlot* wellLogPlot; firstAncestorOrThisOfType( wellLogPlot ); CVF_ASSERT( wellLogPlot ); From 3971f0dde3b74dddfbe9713ddef432e94dbe8605 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Tue, 14 Jul 2020 14:17:50 +0200 Subject: [PATCH 2/2] #6224 Fracture Model: fix "Result Property" track annotations. --- .../CompletionCommands/RicNewFractureModelPlotFeature.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp index 4c6645b20d..54cc7f7243 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp @@ -346,6 +346,7 @@ void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot bool isPlotLogarithmic ) { RimWellLogTrack* plotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, trackTitle, plot ); + plotTrack->setFormationCase( eclipseCase ); plotTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() ); plotTrack->setColSpan( RimPlot::TWO );