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

#3633 2d Maps: Make contour lines optional

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-11-05 16:19:04 +01:00
parent c8ebb0a4d1
commit a842f3d445
3 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ModelVisualization/Riv2dGridProjectionPartMgr.cpp
View File

@ -46,22 +46,25 @@ void Riv2dGridProjectionPartMgr::appendProjectionToModel(cvf::ModelBasicList* mo
model->addPart(part.p()); model->addPart(part.p());
} }
std::vector<cvf::ref<cvf::DrawableGeo>> contourDrawables = createContourPolygons(displayCoordTransform); if (m_2dGridProjection->showContourLines())
for (cvf::ref<cvf::DrawableGeo> contourDrawable : contourDrawables)
{ {
if (contourDrawable.notNull() && contourDrawable->boundingBox().isValid()) std::vector<cvf::ref<cvf::DrawableGeo>> contourDrawables = createContourPolygons(displayCoordTransform);
for (cvf::ref<cvf::DrawableGeo> contourDrawable : contourDrawables)
{ {
caf::MeshEffectGenerator meshEffectGen(cvf::Color3::BLACK); if (contourDrawable.notNull() && contourDrawable->boundingBox().isValid())
meshEffectGen.setLineWidth(1.0f); {
meshEffectGen.createAndConfigurePolygonOffsetRenderState(caf::PO_2); caf::MeshEffectGenerator meshEffectGen(cvf::Color3::BLACK);
cvf::ref<cvf::Effect> effect = meshEffectGen.generateCachedEffect(); meshEffectGen.setLineWidth(1.0f);
meshEffectGen.createAndConfigurePolygonOffsetRenderState(caf::PO_2);
cvf::ref<cvf::Effect> effect = meshEffectGen.generateCachedEffect();
cvf::ref<cvf::Part> part = new cvf::Part; cvf::ref<cvf::Part> part = new cvf::Part;
part->setDrawable(contourDrawable.p()); part->setDrawable(contourDrawable.p());
part->setEffect(effect.p()); part->setEffect(effect.p());
part->setSourceInfo(new RivMeshLinesSourceInfo(m_2dGridProjection.p())); part->setSourceInfo(new RivMeshLinesSourceInfo(m_2dGridProjection.p()));
model->addPart(part.p()); model->addPart(part.p());
}
} }
} }
} }

28
ApplicationCode/ProjectDataModel/Rim2dGridProjection.cpp
View File

@ -68,6 +68,8 @@ Rim2dGridProjection::Rim2dGridProjection()
CAF_PDM_InitFieldNoDefault(&m_resultAggregation, "ResultAggregation", "Result Aggregation", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_resultAggregation, "ResultAggregation", "Result Aggregation", "", "", "");
CAF_PDM_InitField(&m_showContourLines, "ContourLines", true, "Show Contour Lines", "", "", "");
setName("2d Grid Projection"); setName("2d Grid Projection");
nameField()->uiCapability()->setUiReadOnly(true); nameField()->uiCapability()->setUiReadOnly(true);
@ -297,6 +299,14 @@ double Rim2dGridProjection::sampleSpacing() const
return m_sampleSpacing; return m_sampleSpacing;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool Rim2dGridProjection::showContourLines() const
{
return m_showContourLines();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -882,20 +892,18 @@ RigMainGrid* Rim2dGridProjection::mainGrid() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void Rim2dGridProjection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void Rim2dGridProjection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
if (changedField == &m_isChecked || changedField == &m_sampleSpacing || changedField == &m_resultAggregation)
{
RimEclipseView* view = nullptr;
this->firstAncestorOrThisOfTypeAsserted(view);
view->updateConnectedEditors();
RimProject* proj;
view->firstAncestorOrThisOfTypeAsserted(proj);
proj->scheduleCreateDisplayModelAndRedrawAllViews();
}
if (changedField == &m_resultAggregation) if (changedField == &m_resultAggregation)
{ {
legendConfig()->disableAllTimeStepsRange(isSummationResult()); legendConfig()->disableAllTimeStepsRange(isSummationResult());
} }
RimEclipseView* view = nullptr;
this->firstAncestorOrThisOfTypeAsserted(view);
view->updateConnectedEditors();
RimProject* proj;
view->firstAncestorOrThisOfTypeAsserted(proj);
proj->scheduleCreateDisplayModelAndRedrawAllViews();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Rim2dGridProjection.h
View File

@ -69,6 +69,8 @@ public:
double maxValue() const; double maxValue() const;
double minValue() const; double minValue() const;
double sampleSpacing() const; double sampleSpacing() const;
bool showContourLines() const;
void updateDefaultSampleSpacingFromGrid(); void updateDefaultSampleSpacingFromGrid();
const std::vector<double>& aggregatedResults() const; const std::vector<double>& aggregatedResults() const;
bool isSummationResult() const; bool isSummationResult() const;
@ -111,6 +113,8 @@ protected:
protected: protected:
caf::PdmField<double> m_sampleSpacing; caf::PdmField<double> m_sampleSpacing;
caf::PdmField<ResultAggregation> m_resultAggregation; caf::PdmField<ResultAggregation> m_resultAggregation;
caf::PdmField<bool> m_showContourLines;
std::map<size_t, cvf::ref<cvf::UByteArray>> m_cellGridIdxVisibilityMap; std::map<size_t, cvf::ref<cvf::UByteArray>> m_cellGridIdxVisibilityMap;
std::vector<double> m_aggregatedResults; std::vector<double> m_aggregatedResults;