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

#3924 Measurements : Rename, fix issues with points in multiple views

Browse Source
This commit is contained in:
Magne Sjaastad
2019-01-03 07:18:22 +01:00
parent 31a30f8a94
commit 8f85e49849
5 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ModelVisualization/RivMeasurementPartMgr.cpp
View File

@@ -82,7 +82,7 @@ void RivMeasurementPartMgr::appendGeometryPartsToModel(cvf::ModelBasicList*
}
if (m_measurement.isNull()) return;
if (m_measurement->pointsInDomain().empty()) return;
if (m_measurement->pointsInDomainCoords().empty()) return;
// Check bounding box
if (!isPolylinesInBoundingBox(boundingBox)) return;
@@ -120,7 +120,7 @@ void RivMeasurementPartMgr::clearGeometryCache()
//--------------------------------------------------------------------------------------------------
void RivMeasurementPartMgr::buildPolyLineParts(const caf::DisplayCoordTransform* displayCoordTransform)
{
auto pointsInDisplay = transformPolylinesPointsToDisplay(m_measurement->pointsInDomain(), displayCoordTransform);
auto pointsInDisplay = transformPolylinesPointsToDisplay(m_measurement->pointsInDomainCoords(), displayCoordTransform);
// Measurement lines
{
@@ -234,7 +234,7 @@ std::vector<RivMeasurementPartMgr::Vec3d>
bool RivMeasurementPartMgr::isPolylinesInBoundingBox(const cvf::BoundingBox& boundingBox)
{
auto effectiveBoundingBox = RiaBoundingBoxTools::inflate(boundingBox, 3);
for (const auto& pt : m_measurement->pointsInDomain())
for (const auto& pt : m_measurement->pointsInDomainCoords())
{
if (effectiveBoundingBox.contains(pt)) return true;
}