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

pre-proto - Showing name of fractures / fracture templates in project tree view

Browse Source
This commit is contained in:
astridkbjorke 2017-01-04 10:41:46 +01:00
parent 7b0d1fbd2f
commit d57c1e8f32
11 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp
View File

@ -55,6 +55,7 @@ void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)
{
RimFractureDefinition* fractureDef = new RimFractureDefinition();
fracDefColl->fractureDefinitions.push_back(fractureDef);
fractureDef->name = "Fracture Template";
fracDefColl->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fractureDef);

2
ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -70,7 +70,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
RimSimWellFracture* fracture = new RimSimWellFracture();
fractureCollection->simwellFractures.push_back(fracture);
fracture->name = "New SimWell Fracture";
fracture->name = "Simulation Well Fracture";
fracture->setijk(simWellItem->i, simWellItem->j, simWellItem->k);
fractureCollection->updateConnectedEditors();

2
ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp
View File

@ -57,7 +57,7 @@ void RicNewSimWellFractureFeature::onActionTriggered(bool isChecked)
RimSimWellFracture* fracture = new RimSimWellFracture();
fractureCollection->simwellFractures.push_back(fracture);
fracture->name = "New Simulation Well Fracture";
fracture->name = "Simulation Well Fracture";
fractureCollection->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fracture);

2
ApplicationCode/Commands/RicNewWellPathFractureAtPosFeature.cpp
View File

@ -77,7 +77,7 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
RimWellPathFracture* fracture = new RimWellPathFracture();
fractureCollection->fractures.push_back(fracture);
fracture->name = "New Well Path Fracture";
fracture->name = "Well Path Fracture";
fracture->positionAtWellpath = wellPathItem->m_pipeCenterlineIntersectionInDomainCoords;
fracture->measuredDepth = wellPathItem->m_measuredDepth;

2
ApplicationCode/Commands/RicNewWellPathFractureFeature.cpp
View File

@ -58,7 +58,7 @@ void RicNewWellPathFractureFeature::onActionTriggered(bool isChecked)
RimWellPathFracture* fracture = new RimWellPathFracture();
fractureCollection->fractures.push_back(fracture);
fracture->name = "New Well Path Fracture";
fracture->name = "Well Path Fracture";
fractureCollection->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fracture);

8
ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp
View File

@ -65,6 +65,14 @@ RimFractureDefinition::~RimFractureDefinition()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimFractureDefinition::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

9
ApplicationCode/ProjectDataModel/RimFractureDefinition.h
View File

@ -41,6 +41,9 @@ public:
caf::PdmField<float> height;
caf::PdmField<float> width;
caf::PdmField<float> skinFactor;
caf::PdmField<float> permeability;
enum FracOrientationEnum
{
AZIMUTH,
@ -49,12 +52,8 @@ public:
};
caf::PdmField< caf::AppEnum< FracOrientationEnum > > orientation;
caf::PdmField<float> skinFactor;
caf::PdmField<float> permeability;
virtual caf::PdmFieldHandle* userDescriptionField() override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
};

8
ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
View File

@ -111,6 +111,14 @@ RimFractureDefinition* RimSimWellFracture::attachedFractureDefinition()
return fractureDefinition();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimSimWellFracture::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

27
ApplicationCode/ProjectDataModel/RimSimWellFracture.h
View File

@ -41,26 +41,23 @@ public:
RimSimWellFracture(void);
virtual ~RimSimWellFracture(void);
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition* > fractureDefinition;
size_t gridindex;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
void setijk(size_t i, size_t j, size_t k);
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition*> fractureDefinition;
size_t gridindex;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
void setijk(size_t i, size_t j, size_t k);
// Overrides from RimFracture
virtual cvf::Vec3d centerPointForFracture() override;
virtual RimFractureDefinition* attachedFractureDefinition() override;
virtual cvf::Vec3d centerPointForFracture() override;
virtual RimFractureDefinition* attachedFractureDefinition() override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
private:
caf::PdmField<int> m_i; //Eclipse indexing, lowest value is 1
caf::PdmField<int> m_j;
caf::PdmField<int> m_k;
caf::PdmField<int> m_i; //Eclipse indexing, lowest value is 1
caf::PdmField<int> m_j;
caf::PdmField<int> m_k;
};

8
ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
View File

@ -120,6 +120,14 @@ RimFractureDefinition* RimWellPathFracture::attachedFractureDefinition()
return fractureDefinition();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimWellPathFracture::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

35
ApplicationCode/ProjectDataModel/RimWellPathFracture.h
View File

@ -46,33 +46,28 @@ public:
RimWellPathFracture(void);
virtual ~RimWellPathFracture(void);
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition* > fractureDefinition;
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition* > fractureDefinition;
caf::PdmField<float> measuredDepth;
caf::PdmField<cvf::Vec3d> positionAtWellpath;
caf::PdmField<float> measuredDepth;
caf::PdmField<cvf::Vec3d> positionAtWellpath;
caf::PdmProxyValueField<cvf::Vec3d> ui_positionAtWellpath;
caf::PdmProxyValueField<cvf::Vec3d> ui_positionAtWellpath;
caf::PdmField<int> i;
caf::PdmField<int> j;
caf::PdmField<int> k;
caf::PdmField<int> i;
caf::PdmField<int> j;
caf::PdmField<int> k;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
// Overrides from RimFracture
virtual cvf::Vec3d centerPointForFracture() override;
virtual RimFractureDefinition* attachedFractureDefinition() override;
virtual cvf::Vec3d centerPointForFracture() override;
virtual RimFractureDefinition* attachedFractureDefinition() override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
private:
cvf::Vec3d wellPositionForUi() const;
void setWellPositionFromUi(const cvf::Vec3d& vec);
cvf::Vec3d wellPositionForUi() const;
void setWellPositionFromUi(const cvf::Vec3d& vec);
};