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

#3934 Optionally (on default) smooth all contour lines

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-01-08 11:45:16 +01:00
parent 7fccdf7153
commit bac377a4eb
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp
View File

@@ -81,6 +81,7 @@ RimContourMapProjection::RimContourMapProjection()
CAF_PDM_InitField(&m_showContourLines, "ContourLines", true, "Show Contour Lines", "", "", "");
CAF_PDM_InitField(&m_showContourLabels, "ContourLabels", true, "Show Contour Labels", "", "", "");
CAF_PDM_InitField(&m_smoothContourLines, "SmoothContourLines", true, "Smooth Contour Lines", "", "", "");
CAF_PDM_InitField(&m_weightByParameter, "WeightByParameter", false, "Weight by Result Parameter", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_weightingResult, "WeightingResult", "", "", "", "");
@@ -301,9 +302,12 @@ void RimContourMapProjection::generateContourPolygons()
}
contourPolygons[i].push_back(contourPolygon);
}
if (i == 0 || m_smoothContourLines())
{
smoothPolygonLoops(&contourPolygons[i], true);
}
}
smoothPolygonLoops(&contourPolygons[0]);
}
}
}
}
m_contourPolygons = contourPolygons;
@@ -728,7 +732,7 @@ bool RimContourMapProjection::checkForMapIntersection(const cvf::Vec3d& localPoi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimContourMapProjection::smoothPolygonLoops(ContourPolygons* contourPolygons)
void RimContourMapProjection::smoothPolygonLoops(ContourPolygons* contourPolygons, bool favourExpansion)
{
CVF_ASSERT(contourPolygons);
for (size_t i = 0; i < contourPolygons->size(); ++i)
@@ -758,7 +762,7 @@ void RimContourMapProjection::smoothPolygonLoops(ContourPolygons* contourPolygon
cvf::Vec3d tangent3d = vp1 - vm1;
cvf::Vec2d tangent2d(tangent3d.x(), tangent3d.y());
cvf::Vec3d norm3d (tangent2d.getNormalized().perpendicularVector());
if (delta * norm3d > 0)
if (delta * norm3d > 0 && favourExpansion)
{
// Normal is always inwards facing so a positive dot product means inward movement
// Favour expansion rather than contraction by only contracting by half the amount
@@ -870,6 +874,7 @@ void RimContourMapProjection::defineUiOrdering(QString uiConfigName, caf::PdmUiO
mainGroup->add(&m_relativeSampleSpacing);
mainGroup->add(&m_showContourLines);
mainGroup->add(&m_showContourLabels);
mainGroup->add(&m_smoothContourLines);
m_showContourLabels.uiCapability()->setUiReadOnly(!m_showContourLines());
mainGroup->add(&m_resultAggregation);

3
ApplicationCode/ProjectDataModel/RimContourMapProjection.h
View File

@@ -117,7 +117,7 @@ public:
cvf::Vec3d origin3d() const;
protected:
void smoothPolygonLoops(ContourPolygons* contourPolygons);
void smoothPolygonLoops(ContourPolygons* contourPolygons, bool favourExpansion);
double interpolateValue(const cvf::Vec2d& gridPosition2d) const;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
@@ -178,6 +178,7 @@ protected:
caf::PdmField<ResultAggregation> m_resultAggregation;
caf::PdmField<bool> m_showContourLines;
caf::PdmField<bool> m_showContourLabels;
caf::PdmField<bool> m_smoothContourLines;
caf::PdmField<bool> m_weightByParameter;
caf::PdmChildField<RimEclipseResultDefinition*> m_weightingResult;