From 591e10ee65c8b714373753f4d1af0ccf954b42eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 22 Jun 2017 11:01:44 +0200 Subject: [PATCH] #1440 RivWellPathPartMgr Rename and argument alignment --- .../ModelVisualization/RivWellPathPartMgr.cpp | 32 ++++++++++++------- .../ModelVisualization/RivWellPathPartMgr.h | 12 +++---- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp index 5ddbf86777..e8800228a3 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp @@ -94,7 +94,9 @@ RivWellPathPartMgr::~RivWellPathPartMgr() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -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; @@ -108,7 +110,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; @@ -128,7 +132,10 @@ void RivWellPathPartMgr::appendCompletionsToModel(cvf::ModelBasicList* model, co cvf::ref objectSourceInfo = new RivObjectSourceInfo(fbWellPath); cvf::Collection 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) { part->setSourceInfo(objectSourceInfo.p()); @@ -140,7 +147,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; @@ -369,18 +379,18 @@ void RivWellPathPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* m model->addPart(m_wellLabelPart.p()); } - appendFishbonesPartsToModel(model, displayCoordTransform, characteristicCellSize); - appendCompletionsToModel(model, displayCoordTransform, characteristicCellSize); + appendFishboneSubsPartsToModel(model, displayCoordTransform, characteristicCellSize); + appendImportedFishbonesToModel(model, displayCoordTransform, characteristicCellSize); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivWellPathPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, - const QDateTime& timeStamp, - double characteristicCellSize, - const cvf::BoundingBox& wellPathClipBoundingBox, - const caf::DisplayCoordTransform* displayCoordTransform) +void RivWellPathPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, + const QDateTime& timeStamp, + double characteristicCellSize, + const cvf::BoundingBox& wellPathClipBoundingBox, + const caf::DisplayCoordTransform* displayCoordTransform) { CVF_ASSERT(model); diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h index 5af7e431cc..6546090f7d 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h @@ -66,13 +66,13 @@ public: size_t segmentIndexFromTriangleIndex(size_t triangleIndex); private: - void appendFishbonesPartsToModel(cvf::ModelBasicList* model, - const caf::DisplayCoordTransform* displayCoordTransform, - double characteristicCellSize); + void appendFishboneSubsPartsToModel(cvf::ModelBasicList* model, + const caf::DisplayCoordTransform* displayCoordTransform, + double characteristicCellSize); - void appendCompletionsToModel(cvf::ModelBasicList* model, - const caf::DisplayCoordTransform* displayCoordTransform, - double characteristicCellSize); + void appendImportedFishbonesToModel(cvf::ModelBasicList* model, + const caf::DisplayCoordTransform* displayCoordTransform, + double characteristicCellSize); void appendPerforationsToModel(const QDateTime& currentViewDate, cvf::ModelBasicList* model,