#3355 Completion Type Viz : Missing calculation of completion type when scaling changes

This commit is contained in:
Magne Sjaastad 2018-09-11 15:03:59 +02:00
parent 6f555c495a
commit 1a1fcfa6ea
2 changed files with 17 additions and 6 deletions

View File

@ -19,6 +19,7 @@
#include "RimEllipseFractureTemplate.h" #include "RimEllipseFractureTemplate.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaCompletionTypeCalculationScheduler.h"
#include "RiaEclipseUnitTools.h" #include "RiaEclipseUnitTools.h"
#include "RiaFractureDefines.h" #include "RiaFractureDefines.h"
#include "RiaLogging.h" #include "RiaLogging.h"
@ -29,6 +30,7 @@
#include "RigStatisticsMath.h" #include "RigStatisticsMath.h"
#include "RigTesselatorTools.h" #include "RigTesselatorTools.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h" #include "RimEclipseView.h"
#include "RimFracture.h" #include "RimFracture.h"
#include "RimFractureContainment.h" #include "RimFractureContainment.h"
@ -231,7 +233,8 @@ void RimEllipseFractureTemplate::assignConductivityToCellsInsideEllipse()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
FractureWidthAndConductivity RimEllipseFractureTemplate::widthAndConductivityAtWellPathIntersection(const RimFracture* fractureInstance) const FractureWidthAndConductivity
RimEllipseFractureTemplate::widthAndConductivityAtWellPathIntersection(const RimFracture* fractureInstance) const
{ {
FractureWidthAndConductivity values; FractureWidthAndConductivity values;
values.m_width = m_width; values.m_width = m_width;
@ -348,13 +351,18 @@ std::vector<std::pair<QString, QString>> RimEllipseFractureTemplate::uiResultNam
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEllipseFractureTemplate::reload() void RimEllipseFractureTemplate::reload()
{ {
RimProject* proj; RimEclipseCase* eclipseCase = nullptr;
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(eclipseCase);
if (proj) if (eclipseCase)
{ {
proj->reloadCompletionTypeResultsInAllViews(); RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews(eclipseCase);
assignConductivityToCellsInsideEllipse();
} }
else
{
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews();
}
assignConductivityToCellsInsideEllipse();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -19,6 +19,7 @@
#include "RimStimPlanFractureTemplate.h" #include "RimStimPlanFractureTemplate.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaCompletionTypeCalculationScheduler.h"
#include "RiaFractureDefines.h" #include "RiaFractureDefines.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaWeightedAverageCalculator.h" #include "RiaWeightedAverageCalculator.h"
@ -693,6 +694,8 @@ void RimStimPlanFractureTemplate::reload()
if (proj) if (proj)
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->createDisplayModelAndRedrawAllViews();
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews();
} }
} }