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

#1240 Use last stimplan time step as default, improved UI updates

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-23 09:22:19 +01:00
parent 36b4238f13
commit 855960287d
8 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -30,7 +30,6 @@
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimIntersectionCollection.h"
#include "RimProject.h"
#include "RimSimWellFractureCollection.h"
#include "RimView.h"
#include "RimViewLinkerCollection.h"
#include "RimWellLogPlot.h"

8
ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -90,18 +90,12 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
{
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
fracture->setFractureTemplate(fracDef);
fracture->azimuth = fracDef->azimuthAngle();
fracture->setAzimuth();
}
fractureCollection->updateConnectedEditors();
simWellObject->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fracture);
activeView->scheduleCreateDisplayModelAndRedraw();
}
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp
View File

@ -71,9 +71,6 @@ void RicNewSimWellFractureFeature::onActionTriggered(bool isChecked)
{
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
fracture->setFractureTemplate(fracDef);
fracture->azimuth = fracDef->azimuthAngle();
fracture->setAzimuth();
}
fracture->updateFracturePositionFromLocation();

5
ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp
View File

@ -97,13 +97,10 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
{
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
fracture->setFractureTemplate(fracDef);
fracture->azimuth = fracDef->azimuthAngle();
fracture->setAzimuth();
}
fractureCollection->updateConnectedEditors();
wellPathObj->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fracture);
activeView->scheduleCreateDisplayModelAndRedraw();

3
ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp
View File

@ -80,9 +80,6 @@ void RicNewWellPathFractureFeature::onActionTriggered(bool isChecked)
{
RimFractureTemplate* fracDef = oilfield->fractureDefinitionCollection->fractureDefinitions[0];
fracture->setFractureTemplate(fracDef);
fracture->azimuth = fracDef->azimuthAngle();
fracture->setAzimuth();
}
wellPath->updateConnectedEditors();

8
ApplicationCode/Commands/RicSimWellFracturesDeleteAllFeature.cpp
View File

@ -19,8 +19,9 @@
#include "RicSimWellFracturesDeleteAllFeature.h"
#include "RimSimWellFractureCollection.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimSimWellFractureCollection.h"
#include "cafSelectionManager.h"
@ -61,7 +62,10 @@ void RicSimWellFracturesDeleteAllFeature::onActionTriggered(bool isChecked)
{
fractureCollection = objects[0];
fractureCollection->deleteFractures();
fractureCollection->uiCapability()->updateConnectedEditors();
RimEclipseWell* eclipseWell = nullptr;
fractureCollection->firstAncestorOrThisOfType(eclipseWell);
if (eclipseWell) eclipseWell->updateConnectedEditors();
RimEclipseView* mainView = nullptr;
fractureCollection->firstAncestorOrThisOfType(mainView);

1
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -51,7 +51,6 @@
#include "RimIntersectionCollection.h"
#include "RimScriptCollection.h"
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveFilter.h"

14
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@ -168,6 +168,12 @@ void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
if (attachedFractureDefinition()) azimuth = m_fractureTemplate->azimuthAngle();
else azimuth = 0.0;
setAzimuth();
RimStimPlanFractureTemplate* stimPlanFracTemplate = dynamic_cast<RimStimPlanFractureTemplate*>(attachedFractureDefinition());
if (stimPlanFracTemplate)
{
stimPlanTimeIndexToPlot = static_cast<int>(stimPlanFracTemplate->getStimPlanTimeValues().size() - 1);
}
}
if (changedField == &azimuth ||
@ -719,6 +725,14 @@ const RigFracture* RimFracture::attachedRigFracture() const
void RimFracture::setFractureTemplate(RimFractureTemplate* fractureTemplate)
{
m_fractureTemplate = fractureTemplate;
RimStimPlanFractureTemplate* stimPlanFracTemplate = dynamic_cast<RimStimPlanFractureTemplate*>(attachedFractureDefinition());
if (stimPlanFracTemplate)
{
stimPlanTimeIndexToPlot = static_cast<int>(stimPlanFracTemplate->getStimPlanTimeValues().size() - 1);
}
this->setAzimuth();
}
//--------------------------------------------------------------------------------------------------