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

#4210 Fix crash when creating contour map

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-03-22 08:49:39 +01:00
parent 64fc6447f4
commit 4c3c01a661
7 changed files with 82 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp
View File

@@ -13,6 +13,7 @@
#include "cafEffectGenerator.h"
#include "cafFixedAtlasFont.h"
#include "cafCategoryMapper.h"
#include "cvfCamera.h"
#include "cvfDrawableText.h"
@@ -365,13 +366,17 @@ std::vector<cvf::ref<cvf::Drawable>>
{
CVF_ASSERT(camera && displayCoordTransform && labelBBoxes);
std::vector<cvf::ref<cvf::Drawable>> labelDrawables;
labelBBoxes->clear();
labelBBoxes->resize(m_contourLinePolygons.size());
const cvf::ScalarMapper* mapper = m_contourMapProjection->legendConfig()->scalarMapper();
if (dynamic_cast<const caf::CategoryMapper*>(mapper) != nullptr)
return labelDrawables;
std::vector<double> tickValues;
mapper->majorTickValues(&tickValues);
std::vector<cvf::ref<cvf::Drawable>> labelDrawables;
labelBBoxes->clear();
labelBBoxes->resize(m_contourLinePolygons.size());
const RimContourMapProjection::ContourPolygons* previousLevel = nullptr;
for (int64_t i = (int64_t)m_contourLinePolygons.size() - 1; i > 0; --i)
{