From ab7b86111ef6577a75d2fbbca2c85532513f28a6 Mon Sep 17 00:00:00 2001 From: astridkbjorke Date: Fri, 17 Feb 2017 09:32:45 +0100 Subject: [PATCH] pre-proto - Added handling of case where fracture templates have been deleted. --- ApplicationCode/ProjectDataModel/RimFracture.cpp | 3 ++- ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimFracture.cpp b/ApplicationCode/ProjectDataModel/RimFracture.cpp index 4a185ee1ef..44ef2f3a45 100644 --- a/ApplicationCode/ProjectDataModel/RimFracture.cpp +++ b/ApplicationCode/ProjectDataModel/RimFracture.cpp @@ -200,7 +200,8 @@ void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons { //perforationLength = m_fractureTemplate->perforationLength(); //TODO: Find out if performationLength should be in RimFractureTemplate or in RimEllipseFracTemplate - azimuth = m_fractureTemplate->azimuthAngle(); + if (attachedFractureDefinition()) azimuth = m_fractureTemplate->azimuthAngle(); + else azimuth = 0.0; } if (changedField == &azimuth || diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp b/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp index af31f0c02d..043b52690f 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp +++ b/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp @@ -95,7 +95,8 @@ void RimSimWellFracture::setAzimuth() } else //Azimuth value read from template { - azimuth = attachedFractureDefinition()->azimuthAngle; + if (attachedFractureDefinition()) azimuth = attachedFractureDefinition()->azimuthAngle; + else azimuth = 0.0; } }