mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#1240 Use last stimplan time step as default, improved UI updates
This commit is contained in:
parent
36b4238f13
commit
855960287d
@ -30,7 +30,6 @@
|
|||||||
#include "RimGeoMechPropertyFilterCollection.h"
|
#include "RimGeoMechPropertyFilterCollection.h"
|
||||||
#include "RimIntersectionCollection.h"
|
#include "RimIntersectionCollection.h"
|
||||||
#include "RimProject.h"
|
#include "RimProject.h"
|
||||||
#include "RimSimWellFractureCollection.h"
|
|
||||||
#include "RimView.h"
|
#include "RimView.h"
|
||||||
#include "RimViewLinkerCollection.h"
|
#include "RimViewLinkerCollection.h"
|
||||||
#include "RimWellLogPlot.h"
|
#include "RimWellLogPlot.h"
|
||||||
|
@ -90,18 +90,12 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
|
|||||||
{
|
{
|
||||||
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
|
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
|
||||||
fracture->setFractureTemplate(fracDef);
|
fracture->setFractureTemplate(fracDef);
|
||||||
|
|
||||||
fracture->azimuth = fracDef->azimuthAngle();
|
|
||||||
fracture->setAzimuth();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
simWellObject->updateConnectedEditors();
|
||||||
fractureCollection->updateConnectedEditors();
|
|
||||||
RiuMainWindow::instance()->selectAsCurrentItem(fracture);
|
RiuMainWindow::instance()->selectAsCurrentItem(fracture);
|
||||||
|
|
||||||
activeView->scheduleCreateDisplayModelAndRedraw();
|
activeView->scheduleCreateDisplayModelAndRedraw();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -71,9 +71,6 @@ void RicNewSimWellFractureFeature::onActionTriggered(bool isChecked)
|
|||||||
{
|
{
|
||||||
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
|
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
|
||||||
fracture->setFractureTemplate(fracDef);
|
fracture->setFractureTemplate(fracDef);
|
||||||
|
|
||||||
fracture->azimuth = fracDef->azimuthAngle();
|
|
||||||
fracture->setAzimuth();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fracture->updateFracturePositionFromLocation();
|
fracture->updateFracturePositionFromLocation();
|
||||||
|
@ -97,13 +97,10 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
|
|||||||
{
|
{
|
||||||
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
|
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
|
||||||
fracture->setFractureTemplate(fracDef);
|
fracture->setFractureTemplate(fracDef);
|
||||||
|
|
||||||
fracture->azimuth = fracDef->azimuthAngle();
|
|
||||||
fracture->setAzimuth();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fractureCollection->updateConnectedEditors();
|
wellPathObj->updateConnectedEditors();
|
||||||
RiuMainWindow::instance()->selectAsCurrentItem(fracture);
|
RiuMainWindow::instance()->selectAsCurrentItem(fracture);
|
||||||
|
|
||||||
activeView->scheduleCreateDisplayModelAndRedraw();
|
activeView->scheduleCreateDisplayModelAndRedraw();
|
||||||
|
@ -80,9 +80,6 @@ void RicNewWellPathFractureFeature::onActionTriggered(bool isChecked)
|
|||||||
{
|
{
|
||||||
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
|
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
|
||||||
fracture->setFractureTemplate(fracDef);
|
fracture->setFractureTemplate(fracDef);
|
||||||
|
|
||||||
fracture->azimuth = fracDef->azimuthAngle();
|
|
||||||
fracture->setAzimuth();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wellPath->updateConnectedEditors();
|
wellPath->updateConnectedEditors();
|
||||||
|
@ -19,8 +19,9 @@
|
|||||||
|
|
||||||
#include "RicSimWellFracturesDeleteAllFeature.h"
|
#include "RicSimWellFracturesDeleteAllFeature.h"
|
||||||
|
|
||||||
#include "RimSimWellFractureCollection.h"
|
|
||||||
#include "RimEclipseView.h"
|
#include "RimEclipseView.h"
|
||||||
|
#include "RimEclipseWell.h"
|
||||||
|
#include "RimSimWellFractureCollection.h"
|
||||||
|
|
||||||
#include "cafSelectionManager.h"
|
#include "cafSelectionManager.h"
|
||||||
|
|
||||||
@ -61,7 +62,10 @@ void RicSimWellFracturesDeleteAllFeature::onActionTriggered(bool isChecked)
|
|||||||
{
|
{
|
||||||
fractureCollection = objects[0];
|
fractureCollection = objects[0];
|
||||||
fractureCollection->deleteFractures();
|
fractureCollection->deleteFractures();
|
||||||
fractureCollection->uiCapability()->updateConnectedEditors();
|
|
||||||
|
RimEclipseWell* eclipseWell = nullptr;
|
||||||
|
fractureCollection->firstAncestorOrThisOfType(eclipseWell);
|
||||||
|
if (eclipseWell) eclipseWell->updateConnectedEditors();
|
||||||
|
|
||||||
RimEclipseView* mainView = nullptr;
|
RimEclipseView* mainView = nullptr;
|
||||||
fractureCollection->firstAncestorOrThisOfType(mainView);
|
fractureCollection->firstAncestorOrThisOfType(mainView);
|
||||||
|
@ -51,7 +51,6 @@
|
|||||||
#include "RimIntersectionCollection.h"
|
#include "RimIntersectionCollection.h"
|
||||||
#include "RimScriptCollection.h"
|
#include "RimScriptCollection.h"
|
||||||
#include "RimSimWellFracture.h"
|
#include "RimSimWellFracture.h"
|
||||||
#include "RimSimWellFractureCollection.h"
|
|
||||||
#include "RimSummaryCase.h"
|
#include "RimSummaryCase.h"
|
||||||
#include "RimSummaryCurve.h"
|
#include "RimSummaryCurve.h"
|
||||||
#include "RimSummaryCurveFilter.h"
|
#include "RimSummaryCurveFilter.h"
|
||||||
|
@ -168,6 +168,12 @@ void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
|
|||||||
if (attachedFractureDefinition()) azimuth = m_fractureTemplate->azimuthAngle();
|
if (attachedFractureDefinition()) azimuth = m_fractureTemplate->azimuthAngle();
|
||||||
else azimuth = 0.0;
|
else azimuth = 0.0;
|
||||||
setAzimuth();
|
setAzimuth();
|
||||||
|
|
||||||
|
RimStimPlanFractureTemplate* stimPlanFracTemplate = dynamic_cast<RimStimPlanFractureTemplate*>(attachedFractureDefinition());
|
||||||
|
if (stimPlanFracTemplate)
|
||||||
|
{
|
||||||
|
stimPlanTimeIndexToPlot = static_cast<int>(stimPlanFracTemplate->getStimPlanTimeValues().size() - 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (changedField == &azimuth ||
|
if (changedField == &azimuth ||
|
||||||
@ -719,6 +725,14 @@ const RigFracture* RimFracture::attachedRigFracture() const
|
|||||||
void RimFracture::setFractureTemplate(RimFractureTemplate* fractureTemplate)
|
void RimFracture::setFractureTemplate(RimFractureTemplate* fractureTemplate)
|
||||||
{
|
{
|
||||||
m_fractureTemplate = fractureTemplate;
|
m_fractureTemplate = fractureTemplate;
|
||||||
|
|
||||||
|
RimStimPlanFractureTemplate* stimPlanFracTemplate = dynamic_cast<RimStimPlanFractureTemplate*>(attachedFractureDefinition());
|
||||||
|
if (stimPlanFracTemplate)
|
||||||
|
{
|
||||||
|
stimPlanTimeIndexToPlot = static_cast<int>(stimPlanFracTemplate->getStimPlanTimeValues().size() - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
this->setAzimuth();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user