OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-11 13:45:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pre-proto' into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-06-09 09:35:59 +02:00
parent dd912b4f97 f46e31e673
commit 7d1deb319f
8 changed files with 289 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
+6 -3
View File
@@ -24,6 +24,7 @@
#include "cafPdmField.h"
#include "cafPdmFieldHandle.h"
#include "cafPdmObject.h"
#include "cafPdmChildField.h"
#include "cafPdmFieldCvfVec3d.h"
#include "cvfBase.h"
@@ -33,6 +34,7 @@
class RigEclipseCaseData;
class RigFractureGrid;
class RimFractureContainment;
//==================================================================================================
///
@@ -72,9 +74,6 @@ public:
caf::PdmField< RimUnitSystem::UnitSystemType > fractureTemplateUnit;
void setDefaultWellDiameterFromUnit();
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void fractureGeometry(std::vector<cvf::Vec3f>* nodeCoords, std::vector<cvf::uint>* triangleIndices, RimUnitSystem::UnitSystem fractureTemplateUnit) = 0;
virtual std::vector<cvf::Vec3f> fracturePolygon(RimUnitSystem::UnitSystem fractureTemplateUnit) = 0;
@@ -82,6 +81,10 @@ public:
virtual const RigFractureGrid* fractureGrid() const = 0;
protected:
caf::PdmChildField<RimFractureContainment*> m_fractureContainmentField;
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;