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

Cleanup includes

Browse Source
This commit is contained in:
Magne Sjaastad 2017-01-19 13:35:07 +01:00
parent 4a2bf34ec1
commit 93e9b04655
7 changed files with 36 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -28,6 +28,7 @@
#include "RimProject.h"
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#include "RimView.h"
#include "RiuMainWindow.h"
#include "RiuSelectionManager.h"

20
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@ -63,7 +63,7 @@ RimFracture::RimFracture(void)
CAF_PDM_InitFieldNoDefault(&m_anchorPosition, "anchorPosition", "Anchor Position", "", "", "");
m_anchorPosition.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_uiAnchorPosition, "ui_positionAtWellpath", "Fracture Position at Well Path", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_uiAnchorPosition, "ui_positionAtWellpath", "Fracture Position", "", "", "");
m_uiAnchorPosition.registerGetMethod(this, &RimFracture::fracturePositionForUi);
m_uiAnchorPosition.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitField(&azimuth, "Azimuth", 0.0, "Azimuth", "", "", "");
@ -169,6 +169,14 @@ void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimFracture::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -515,7 +523,7 @@ cvf::Vec3d RimFracture::fracturePositionForUi() const
//--------------------------------------------------------------------------------------------------
QString RimFracture::createOneBasedIJK() const
{
return QString("I: %1 J: %2 K:%3 ").arg(m_i + 1).arg(m_j + 1).arg(m_k + 1);
return QString("Cell : [%1, %2, %3]").arg(m_i + 1).arg(m_j + 1).arg(m_k + 1);
}
@ -557,11 +565,9 @@ void RimFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
geometryGroup->add(&azimuth);
geometryGroup->add(&m_fractureTemplate);
geometryGroup->add(&m_i);
geometryGroup->add(&m_j);
geometryGroup->add(&m_k);
geometryGroup->add(&m_uiAnchorPosition);
caf::PdmUiGroup* fractureCenterGroup = uiOrdering.addNewGroup("Fracture Center Info");
fractureCenterGroup->add(&m_uiAnchorPosition);
fractureCenterGroup->add(&m_displayIJK);
}
//--------------------------------------------------------------------------------------------------

18
ApplicationCode/ProjectDataModel/RimFracture.h
View File

@ -71,10 +71,11 @@ public:
const std::vector<cvf::Vec3f>& nodeCoords() const;
virtual std::vector<size_t> getPotentiallyFracturedCells();
std::vector<size_t> getPotentiallyFracturedCells();
void computeTransmissibility();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
@ -94,20 +95,19 @@ private:
std::vector<cvf::Vec3f> fracturePolygon, double & area);
private:
protected:
caf::PdmPtrField<RimEllipseFractureTemplate*> m_fractureTemplate;
caf::PdmField<cvf::Vec3d> m_anchorPosition;
caf::PdmProxyValueField<cvf::Vec3d> m_uiAnchorPosition;
caf::PdmProxyValueField<QString> m_displayIJK;
private:
caf::PdmField<cvf::Vec3d> m_anchorPosition;
cvf::ref<RigFracture> m_rigFracture;
bool m_recomputeGeometry;
caf::PdmProxyValueField<QString> m_displayIJK;
caf::PdmField<int> m_i;
caf::PdmField<int> m_j;
caf::PdmField<int> m_k;
caf::PdmField<int> m_i; // Zero based indexing
caf::PdmField<int> m_j; // Zero based indexing
caf::PdmField<int> m_k; // Zero based indexing
cvf::ref<RivWellFracturePartMgr> m_rivFracture;
};

88
ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
View File

@ -18,30 +18,11 @@
#include "RimSimWellFracture.h"
#include "RiaApplication.h"
#include "RigCell.h"
#include "RigMainGrid.h"
#include "RigTesselatorTools.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseView.h"
#include "RimEllipseFractureTemplate.h"
#include "RimFractureDefinitionCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimWellPath.h"
#include "cafPdmFieldHandle.h"
#include "cafPdmObject.h"
#include "cafPdmUiItem.h"
#include "cafDisplayCoordTransform.h"
#include "cvfVector3.h"
#include <QToolBox>
#include <QList>
#include "RigGridBase.h"
@ -63,50 +44,6 @@ RimSimWellFracture::~RimSimWellFracture()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimSimWellFracture::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
return RimFracture::calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
}
// --------------------------------------------------------------------------------------------------
// /
// --------------------------------------------------------------------------------------------------
// std::vector<std::pair<size_t, size_t>> RimSimWellFracture::getFracturedCells()
// {
// std::vector<std::pair<size_t, size_t>> cells;
//
// size_t gridindex = 0; //TODO! For now assuming only one grid
//
//
// caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(this);
// if (!objHandle) return cells;
//
// RimEclipseView* mainView = nullptr;
// objHandle->firstAncestorOrThisOfType(mainView);
// if (!mainView) return cells;
//
// const RigMainGrid* mainGrid = mainView->mainGrid();
// if (!mainGrid) return cells;
//
// size_t cellIndex = mainGrid->cellIndexFromIJK(m_i - 1, m_j - 1, m_k - 1); // cellIndexFromIJK uses 0-based indexing
//
// cells.push_back(std::make_pair(cellIndex, gridindex));
//
// return cells;
// }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimSimWellFracture::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -120,29 +57,6 @@ void RimSimWellFracture::setIJK(size_t i, size_t j, size_t k)
if (proj) proj->createDisplayModelAndRedrawAllViews();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSimWellFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
return RimFracture::defineUiOrdering(uiConfigName, uiOrdering);
/*
uiOrdering.add(&name);
RimFracture::defineUiOrdering(uiConfigName, uiOrdering);
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Fractures");
geometryGroup->add(&m_fractureTemplate);
geometryGroup->add(&m_i);
geometryGroup->add(&m_j);
geometryGroup->add(&m_k);
geometryGroup->add(&ui_cellCenterPosition);
uiOrdering.setForgetRemainingFields(true);
*/
}
//--------------------------------------------------------------------------------------------------
///

20
ApplicationCode/ProjectDataModel/RimSimWellFracture.h
View File

@ -19,19 +19,7 @@
#pragma once
#include "RimFracture.h"
#include "RimView.h"
#include "cafAppEnum.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmProxyValueField.h"
#include "cafPdmPtrField.h"
#include "cvfBase.h"
#include "cvfVector3.h"
class RimEllipseFractureTemplate;
//==================================================================================================
///
@ -45,14 +33,8 @@ public:
RimSimWellFracture(void);
virtual ~RimSimWellFracture(void);
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);
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
cvf::Vec3d findCellCenterPosition(size_t i, size_t j, size_t k) const;
private:
cvf::Vec3d findCellCenterPosition(size_t i, size_t j, size_t k) const;
};

47
ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
View File

@ -18,27 +18,10 @@
#include "RimWellPathFracture.h"
#include "RiaApplication.h"
#include "RigTesselatorTools.h"
#include "RimEllipseFractureTemplate.h"
#include "RimFractureDefinitionCollection.h"
#include "RimOilField.h"
#include "RigWellPath.h"
#include "RimProject.h"
#include "RimWellPath.h"
#include "RivWellPathPartMgr.h"
#include "cafPdmFieldHandle.h"
#include "cafPdmObject.h"
#include "cafPdmUiItem.h"
#include "cvfVector3.h"
#include <QToolBox>
#include <QList>
CAF_PDM_SOURCE_INIT(RimWellPathFracture, "WellPathFracture");
@ -50,7 +33,7 @@ RimWellPathFracture::RimWellPathFracture(void)
{
CAF_PDM_InitObject("Fracture", ":/FractureSymbol16x16.png", "", "");
CAF_PDM_InitField( &measuredDepth, "MeasuredDepth", 0.0f, "Measured Depth Location (if along well path)", "", "", "");
CAF_PDM_InitField( &measuredDepth, "MeasuredDepth", 0.0f, "Measured Depth Location", "", "", "");
}
//--------------------------------------------------------------------------------------------------
@ -60,14 +43,6 @@ RimWellPathFracture::~RimWellPathFracture()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimWellPathFracture::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
return RimFracture::calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -97,21 +72,21 @@ void RimWellPathFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimWellPathFracture::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
RimFracture::defineUiOrdering(uiConfigName, uiOrdering);
uiOrdering.add(&name);
uiOrdering.add(&measuredDepth);
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Properties");
geometryGroup->add(&azimuth);
geometryGroup->add(&m_fractureTemplate);
caf::PdmUiGroup* fractureCenterGroup = uiOrdering.addNewGroup("Fracture Center Info");
fractureCenterGroup->add(&m_uiAnchorPosition);
fractureCenterGroup->add(&m_displayIJK);
}

17
ApplicationCode/ProjectDataModel/RimWellPathFracture.h
View File

@ -18,22 +18,8 @@
#pragma once
#include "RimView.h"
#include "RimFracture.h"
#include "cafAppEnum.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
#include "cvfBase.h"
#include "cvfVector3.h"
#include "cafPdmProxyValueField.h"
class RimEllipseFractureTemplate;
class RimWellPath;
//==================================================================================================
///
///
@ -48,11 +34,8 @@ public:
caf::PdmField<float> measuredDepth;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
};