From 86636de274f38184402b5917bec22fd1829993aa Mon Sep 17 00:00:00 2001 From: astridkbjorke Date: Mon, 23 Jan 2017 09:46:33 +0100 Subject: [PATCH] #1090 #1089 - pre-proto - Fix in update of azimuth angle and perforation length update for fracture --- ApplicationCode/ProjectDataModel/RimFracture.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimFracture.cpp b/ApplicationCode/ProjectDataModel/RimFracture.cpp index 2fc8dec403..ee2dbd2732 100644 --- a/ApplicationCode/ProjectDataModel/RimFracture.cpp +++ b/ApplicationCode/ProjectDataModel/RimFracture.cpp @@ -149,12 +149,16 @@ std::vector RimFracture::getPotentiallyFracturedCells() //-------------------------------------------------------------------------------------------------- void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) { + if (changedField == &m_fractureTemplate) + { + perforationLength = m_fractureTemplate->perforationLength(); + azimuth = m_fractureTemplate->azimuthAngle(); + } + if (changedField == &azimuth || changedField == &m_fractureTemplate) { - if (changedField == &m_fractureTemplate) azimuth = m_fractureTemplate->azimuthAngle(); - setRecomputeGeometryFlag(); RimView* rimView = nullptr; @@ -175,10 +179,6 @@ void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons } - if (changedField == &perforationLength || - changedField == & m_fractureTemplate) - perforationLength = m_fractureTemplate->perforationLength(); - azimuth = m_fractureTemplate->azimuthAngle(); } //--------------------------------------------------------------------------------------------------