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

#1239 Add checkbox to control visibility of fractures

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-22 13:24:07 +01:00
parent e67b9e4f59
commit ac48b31e24
8 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -84,7 +84,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
oilfield->descendantsIncludingThisOfType(oldFractures);
QString fracNum = QString("%1").arg(oldFractures.size(), 2, 10, QChar('0'));
fracture->name = QString("Fracture_") + fracNum;
fracture->setName(QString("Fracture_") + fracNum);
if (oilfield->fractureDefinitionCollection->fractureDefinitions.size() > 0)
{

2
ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp
View File

@ -69,7 +69,7 @@ void RicNewSimWellFractureFeature::onActionTriggered(bool isChecked)
oilfield->descendantsIncludingThisOfType(oldFractures);
QString fracNum = QString("%1").arg(oldFractures.size(), 2, 10, QChar('0'));
fracture->name = QString("Fracture_") + fracNum;
fracture->setName(QString("Fracture_") + fracNum);
if (oilfield->fractureDefinitionCollection->fractureDefinitions.size() > 0)
{

2
ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp
View File

@ -90,7 +90,7 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
oilfield->descendantsIncludingThisOfType(oldFractures);
QString fracNum = QString("%1").arg(oldFractures.size(), 2, 10, QChar('0'));
fracture->name = QString("Fracture_") + fracNum;
fracture->setName(QString("Fracture_") + fracNum);
if (oilfield->fractureDefinitionCollection->fractureDefinitions.size() > 0)

2
ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp
View File

@ -81,7 +81,7 @@ void RicNewWellPathFractureFeature::onActionTriggered(bool isChecked)
oilfield->descendantsIncludingThisOfType(oldFractures);
QString fracNum = QString("%1").arg(oldFractures.size(), 2, 10, QChar('0'));
fracture->name = QString("Fracture_") + fracNum;
fracture->setName(QString("Fracture_") + fracNum);
if (oilfield->fractureDefinitionCollection->fractureDefinitions.size() > 0)
{

10
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@ -71,8 +71,6 @@ RimFracture::RimFracture(void)
{
CAF_PDM_InitObject("Fracture", "", "", "");
CAF_PDM_InitField(&name, "Name", QString("Fracture Name"), "Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_fractureTemplate, "FractureDef", "Fracture Template", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_anchorPosition, "anchorPosition", "Anchor Position", "", "", "");
@ -199,14 +197,6 @@ void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimFracture::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

12
ApplicationCode/ProjectDataModel/RimFracture.h
View File

@ -18,11 +18,7 @@
#pragma once
#include "RimFractureTemplate.h"
#include "cafPdmObject.h"
#include "cafPdmField.h"
#include "RimCheckableNamedObject.h"
#include "cvfBase.h"
#include "cvfObject.h"
@ -40,12 +36,13 @@ class RigFracture;
class RimEclipseCase;
class RimEllipseFractureTemplate;
class RivWellFracturePartMgr;
class RimFractureTemplate;
//==================================================================================================
///
///
//==================================================================================================
class RimFracture : public caf::PdmObject
class RimFracture : public RimCheckableNamedObject
{
CAF_PDM_HEADER_INIT;
@ -53,7 +50,6 @@ public:
RimFracture(void);
virtual ~RimFracture(void);
caf::PdmField<QString> name;
caf::PdmField<double> azimuth;
caf::PdmField<double> perforationLength;
@ -84,10 +80,8 @@ public:
void computeTransmissibility(RimEclipseCase* caseToApply);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
cvf::Vec3d fracturePosition() const;
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;

2
ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
View File

@ -156,7 +156,7 @@ void RimSimWellFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
{
RimFracture::defineUiOrdering(uiConfigName, uiOrdering);
uiOrdering.add(&name);
uiOrdering.add(&m_name);
caf::PdmUiGroup* locationGroup = uiOrdering.addNewGroup("Location / Orientation");
locationGroup->add(&m_location);

2
ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
View File

@ -149,7 +149,7 @@ void RimWellPathFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
{
RimFracture::defineUiOrdering(uiConfigName, uiOrdering);
uiOrdering.add(&name);
uiOrdering.add(&m_name);
caf::PdmUiGroup* locationGroup = uiOrdering.addNewGroup("Location / Orientation");
locationGroup->add(&m_measuredDepth);