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 to fracture, and update visualization

Browse Source
This commit is contained in:
Magne Sjaastad 2017-01-10 13:37:50 +01:00
parent bb89994dbc
commit 6c84f9f59e
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@ -20,8 +20,13 @@
#include "RigFracture.h"
#include "RigTesselatorTools.h"
#include "RimFractureDefinition.h"
#include "RimFractureDefinition.h"
#include "RimView.h"
#include "cafPdmUiDoubleSliderEditor.h"
#include "cvfMatrix4.h"
@ -35,6 +40,7 @@ RimFracture::RimFracture(void)
CAF_PDM_InitObject("Fracture", "", "", "");
CAF_PDM_InitField(&azimuth, "Azimuth", 0.0, "Azimuth", "", "", "");
azimuth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
m_rigFracture = new RigFracture;
m_recomputeGeometry = true;
@ -63,6 +69,24 @@ const std::vector<cvf::Vec3f>& RimFracture::nodeCoords() const
return m_rigFracture->nodeCoords();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &azimuth)
{
computeGeometry();
RimView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
if (rimView)
{
rimView->createDisplayModelAndRedraw();
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -84,10 +108,18 @@ void RimFracture::computeGeometry()
}
// TODO: Modify coords by fracture center and orientation
// Ellipsis geometry is produced in XY-plane, rotate 90 deg around X to get zero azimuth along Y
cvf::Mat4f rotationFromTesselator = cvf::Mat4f::fromRotation(cvf::Vec3f::X_AXIS, cvf::Math::toRadians(90.0f));
// Azimuth rotation
cvf::Mat4f azimuthRotation = cvf::Mat4f::fromRotation(cvf::Vec3f::Z_AXIS, cvf::Math::toRadians(-azimuth()));
cvf::Mat4f m = azimuthRotation * rotationFromTesselator;
m.setTranslation(cvf::Vec3f(center));
for (cvf::Vec3f& v : nodeCoords)
{
v = v + static_cast<cvf::Vec3f>(center);
v.transformPoint(m);
}
m_rigFracture->setGeometry(polygonIndices, nodeCoords);
@ -120,6 +152,22 @@ void RimFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
geometryGroup->add(&azimuth);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFracture::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute)
{
if (field == &azimuth)
{
caf::PdmUiDoubleSliderEditorAttribute* myAttr = dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>(attribute);
if (myAttr)
{
myAttr->m_minimum = 0;
myAttr->m_maximum = 360;
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ProjectDataModel/RimFracture.h
View File

@ -20,6 +20,8 @@
#include "cafPdmObject.h"
#include "cafPdmField.h"
#include "cvfBase.h"
#include "cvfObject.h"
#include "cvfVector3.h"
@ -53,8 +55,12 @@ public:
const std::vector<cvf::uint>& polygonIndices() const;
const std::vector<cvf::Vec3f>& nodeCoords() const;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
private:
bool isRecomputeGeometryFlagSet();