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

#1440 Merge dev into pre-proto More cleanup of WellPathPartMgr

Browse Source
This commit is contained in:
Jacob Støren
2017-06-22 11:21:50 +02:00
parent 33b037a80b 591e10ee65
commit deedb6a90e
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@@ -38,15 +38,17 @@
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "RimWellPathFractureCollection.h" #include "RimWellPathFractureCollection.h"
#include "RimWellPathFracture.h"
#include "RivFishbonesSubsPartMgr.h" #include "RivFishbonesSubsPartMgr.h"
#include "RivObjectSourceInfo.h" #include "RivObjectSourceInfo.h"
#include "RivPartPriority.h" #include "RivPartPriority.h"
#include "RivPipeGeometryGenerator.h" #include "RivPipeGeometryGenerator.h"
#include "RivWellPathSourceInfo.h"
#include "RivPartPriority.h" #include "RivPartPriority.h"
#include "RivWellFracturePartMgr.h" #include "RivWellFracturePartMgr.h"
#include "RivWellPathPartMgr.h" #include "RivWellPathPartMgr.h"
#include "RivWellPathSourceInfo.h"
#include "cafDisplayCoordTransform.h" #include "cafDisplayCoordTransform.h"
#include "cafEffectGenerator.h" #include "cafEffectGenerator.h"
@@ -58,7 +60,6 @@
#include "cvfScalarMapperDiscreteLinear.h" #include "cvfScalarMapperDiscreteLinear.h"
#include "cvfTransform.h" #include "cvfTransform.h"
#include "cvfqtUtils.h" #include "cvfqtUtils.h"
#include "RimWellPathFracture.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -115,7 +116,9 @@ void RivWellPathPartMgr::appendFracturePartsToModel(cvf::ModelBasicList* model,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivWellPathPartMgr::appendFishbonesPartsToModel(cvf::ModelBasicList* model, const caf::DisplayCoordTransform* displayCoordTransform, double characteristicCellSize) void RivWellPathPartMgr::appendFishboneSubsPartsToModel(cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform,
double characteristicCellSize)
{ {
if ( !m_rimWellPath || !m_rimWellPath->fishbonesCollection()->isChecked() ) return; if ( !m_rimWellPath || !m_rimWellPath->fishbonesCollection()->isChecked() ) return;
@@ -129,7 +132,9 @@ void RivWellPathPartMgr::appendFishbonesPartsToModel(cvf::ModelBasicList* model,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivWellPathPartMgr::appendCompletionsToModel(cvf::ModelBasicList* model, const caf::DisplayCoordTransform* displayCoordTransform, double characteristicCellSize) void RivWellPathPartMgr::appendImportedFishbonesToModel(cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform,
double characteristicCellSize)
{ {
if (!m_rimWellPath || !m_rimWellPath->fishbonesCollection()->wellPathCollection()->isChecked()) return; if (!m_rimWellPath || !m_rimWellPath->fishbonesCollection()->wellPathCollection()->isChecked()) return;
@@ -149,7 +154,10 @@ void RivWellPathPartMgr::appendCompletionsToModel(cvf::ModelBasicList* model, co
cvf::ref<RivObjectSourceInfo> objectSourceInfo = new RivObjectSourceInfo(fbWellPath); cvf::ref<RivObjectSourceInfo> objectSourceInfo = new RivObjectSourceInfo(fbWellPath);
cvf::Collection<cvf::Part> parts; cvf::Collection<cvf::Part> parts;
geoGenerator.cylinderWithCenterLineParts(&parts, displayCoords, m_rimWellPath->wellPathColor(), m_rimWellPath->combinedScaleFactor() * characteristicCellSize * 0.5); geoGenerator.cylinderWithCenterLineParts(&parts,
displayCoords,
m_rimWellPath->wellPathColor(),
m_rimWellPath->combinedScaleFactor() * characteristicCellSize * 0.5);
for (auto part : parts) for (auto part : parts)
{ {
part->setSourceInfo(objectSourceInfo.p()); part->setSourceInfo(objectSourceInfo.p());
@@ -161,7 +169,10 @@ void RivWellPathPartMgr::appendCompletionsToModel(cvf::ModelBasicList* model, co
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivWellPathPartMgr::appendPerforationsToModel(const QDateTime& currentViewDate, cvf::ModelBasicList* model, const caf::DisplayCoordTransform* displayCoordTransform, double characteristicCellSize) void RivWellPathPartMgr::appendPerforationsToModel(const QDateTime& currentViewDate,
cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform,
double characteristicCellSize)
{ {
if (!m_rimWellPath || !m_rimWellPath->perforationIntervalCollection()->isChecked()) return; if (!m_rimWellPath || !m_rimWellPath->perforationIntervalCollection()->isChecked()) return;
@@ -396,8 +407,8 @@ void RivWellPathPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* m
appendFracturePartsToModel(model, displayCoordTransform); appendFracturePartsToModel(model, displayCoordTransform);
appendFishbonesPartsToModel(model, displayCoordTransform, characteristicCellSize); appendFishboneSubsPartsToModel(model, displayCoordTransform, characteristicCellSize);
appendCompletionsToModel(model, displayCoordTransform, characteristicCellSize); appendImportedFishbonesToModel(model, displayCoordTransform, characteristicCellSize);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
View File

@@ -67,11 +67,11 @@ public:
size_t segmentIndexFromTriangleIndex(size_t triangleIndex); size_t segmentIndexFromTriangleIndex(size_t triangleIndex);
private: private:
void appendFishbonesPartsToModel(cvf::ModelBasicList* model, void appendFishboneSubsPartsToModel(cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform, const caf::DisplayCoordTransform* displayCoordTransform,
double characteristicCellSize); double characteristicCellSize);
void appendCompletionsToModel(cvf::ModelBasicList* model, void appendImportedFishbonesToModel(cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform, const caf::DisplayCoordTransform* displayCoordTransform,
double characteristicCellSize); double characteristicCellSize);