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

#1101 Added azimuth

Browse Source
This commit is contained in:
Magne Sjaastad
2017-01-10 10:53:54 +01:00
parent 082960d887
commit bb89994dbc
4 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ModelVisualization/RivWellFracturesPartMgr.cpp
View File

@@ -68,18 +68,17 @@ void RivWellFracturesPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicL
if (fractures.size() > 0) if (fractures.size() > 0)
{ {
caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(fractures.at(0)); caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(fractures.at(0));
if (!objHandle) return; if (!objHandle) return;
RimEclipseView* mainView = nullptr; RimEclipseView* mainView = nullptr;
objHandle->firstAncestorOrThisOfType(mainView); objHandle->firstAncestorOrThisOfType(mainView);
if (!mainView) return; if (!mainView) return;
cvf::ref<caf::DisplayCoordTransform> transForm = mainView->displayCoordTransform(); cvf::ref<caf::DisplayCoordTransform> transForm = mainView->displayCoordTransform();
appendFracturePartsToModel(fractures, model, transForm.p()); appendFracturePartsToModel(fractures, model, transForm.p());
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

15
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@@ -34,6 +34,8 @@ RimFracture::RimFracture(void)
{ {
CAF_PDM_InitObject("Fracture", "", "", ""); CAF_PDM_InitObject("Fracture", "", "", "");
CAF_PDM_InitField(&azimuth, "Azimuth", 0.0, "Azimuth", "", "", "");
m_rigFracture = new RigFracture; m_rigFracture = new RigFracture;
m_recomputeGeometry = true; m_recomputeGeometry = true;
} }
@@ -83,9 +85,9 @@ void RimFracture::computeGeometry()
} }
// TODO: Modify coords by fracture center and orientation // TODO: Modify coords by fracture center and orientation
for (int i = 0; i < nodeCoords.size(); i++ ) for (cvf::Vec3f& v : nodeCoords)
{ {
nodeCoords[i] = nodeCoords[i] + static_cast<cvf::Vec3f>(center); v = v + static_cast<cvf::Vec3f>(center);
} }
m_rigFracture->setGeometry(polygonIndices, nodeCoords); m_rigFracture->setGeometry(polygonIndices, nodeCoords);
@@ -109,6 +111,15 @@ bool RimFracture::isRecomputeGeometryFlagSet()
return m_recomputeGeometry; return m_recomputeGeometry;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Properties");
geometryGroup->add(&azimuth);
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

9
ApplicationCode/ProjectDataModel/RimFracture.h
View File

@@ -40,9 +40,11 @@ public:
RimFracture(void); RimFracture(void);
virtual ~RimFracture(void); virtual ~RimFracture(void);
caf::PdmField<double> azimuth;
virtual cvf::Vec3d centerPointForFracture() = 0; virtual cvf::Vec3d centerPointForFracture() = 0;
virtual RimFractureDefinition* attachedFractureDefinition() = 0; virtual RimFractureDefinition* attachedFractureDefinition() = 0;
bool hasValidGeometry() const; bool hasValidGeometry() const;
void computeGeometry(); void computeGeometry();
@@ -51,12 +53,17 @@ public:
const std::vector<cvf::uint>& polygonIndices() const; const std::vector<cvf::uint>& polygonIndices() const;
const std::vector<cvf::Vec3f>& nodeCoords() const; const std::vector<cvf::Vec3f>& nodeCoords() const;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private: private:
bool isRecomputeGeometryFlagSet(); bool isRecomputeGeometryFlagSet();
// cvf::Vec3d fracturePositionForUi() const; // cvf::Vec3d fracturePositionForUi() const;
private: private:
cvf::ref<RigFracture> m_rigFracture; cvf::ref<RigFracture> m_rigFracture;
bool m_recomputeGeometry; bool m_recomputeGeometry;
}; };

2
ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
View File

@@ -193,6 +193,8 @@ void RimSimWellFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
{ {
uiOrdering.add(&name); uiOrdering.add(&name);
RimFracture::defineUiOrdering(uiConfigName, uiOrdering);
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Fractures"); caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Fractures");
geometryGroup->add(&fractureDefinition); geometryGroup->add(&fractureDefinition);