OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6230 from OPM/fix-crash-fracture-model-6228

Browse Source 
Fix crash fracture model 6228
This commit is contained in:
Kristian Bendiksen 2020-07-14 14:58:43 +02:00 committed by GitHub
commit 8924d3ec8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp
View File

@ -346,6 +346,7 @@ void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot
bool isPlotLogarithmic ) bool isPlotLogarithmic )
{ {
RimWellLogTrack* plotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, trackTitle, plot ); RimWellLogTrack* plotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, trackTitle, plot );
plotTrack->setFormationCase( eclipseCase );
plotTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() ); plotTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() );
plotTrack->setColSpan( RimPlot::TWO ); plotTrack->setColSpan( RimPlot::TWO );

3
ApplicationCode/Commands/RicWellLogTools.cpp
View File

@ -23,6 +23,7 @@
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RimCase.h" #include "RimCase.h"
#include "RimDepthTrackPlot.h"
#include "RimEclipseResultCase.h" #include "RimEclipseResultCase.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSimWellInView.h" #include "RimSimWellInView.h"
@ -185,7 +186,7 @@ ExtractionCurveType* RicWellLogTools::addExtractionCurve( RimWellLogTrack*
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() ); cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() );
curve->setColor( curveColor ); curve->setColor( curveColor );
RimWellLogPlot* plot = nullptr; RimDepthTrackPlot* plot = nullptr;
plotTrack->firstAncestorOrThisOfTypeAsserted( plot ); plotTrack->firstAncestorOrThisOfTypeAsserted( plot );
RimWellLogCurveCommonDataSource* commonDataSource = plot->commonDataSource(); RimWellLogCurveCommonDataSource* commonDataSource = plot->commonDataSource();

3
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@ -34,6 +34,7 @@
#include "RigWellPathGeometryTools.h" #include "RigWellPathGeometryTools.h"
#include "RigWellPathIntersectionTools.h" #include "RigWellPathIntersectionTools.h"
#include "RimDepthTrackPlot.h"
#include "RimEclipseResultCase.h" #include "RimEclipseResultCase.h"
#include "RimMainPlotCollection.h" #include "RimMainPlotCollection.h"
#include "RimObservedFmuRftData.h" #include "RimObservedFmuRftData.h"
@ -379,7 +380,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot )
if ( isCurveVisible() ) if ( isCurveVisible() )
{ {
RimWellLogPlot* wellLogPlot; RimDepthTrackPlot* wellLogPlot;
firstAncestorOrThisOfType( wellLogPlot ); firstAncestorOrThisOfType( wellLogPlot );
CVF_ASSERT( wellLogPlot ); CVF_ASSERT( wellLogPlot );

4
ApplicationCode/ProjectDataModel/RimWellMeasurementCurve.cpp
View File

@ -21,10 +21,10 @@
#include "RigWellLogCurveData.h" #include "RigWellLogCurveData.h"
#include "RigWellPath.h" #include "RigWellPath.h"
#include "RimDepthTrackPlot.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimTools.h" #include "RimTools.h"
#include "RimWellLogFile.h" #include "RimWellLogFile.h"
#include "RimWellLogPlot.h"
#include "RimWellLogTrack.h" #include "RimWellLogTrack.h"
#include "RimWellMeasurement.h" #include "RimWellMeasurement.h"
#include "RimWellMeasurementCollection.h" #include "RimWellMeasurementCollection.h"
@ -74,7 +74,7 @@ RimWellMeasurementCurve::~RimWellMeasurementCurve()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellMeasurementCurve::onLoadDataAndUpdate( bool updateParentPlot ) void RimWellMeasurementCurve::onLoadDataAndUpdate( bool updateParentPlot )
{ {
RimWellLogPlot* wellLogPlot; RimDepthTrackPlot* wellLogPlot;
firstAncestorOrThisOfType( wellLogPlot ); firstAncestorOrThisOfType( wellLogPlot );
CVF_ASSERT( wellLogPlot ); CVF_ASSERT( wellLogPlot );