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

#3919 Apply contrast colours to contour lines as well.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-12-21 09:06:01 +01:00
parent 68fb72311e
commit 22f054c6b9
2 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp
View File

@@ -35,6 +35,8 @@ RivContourMapProjectionPartMgr::RivContourMapProjectionPartMgr(RimContourMapProj
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivContourMapProjectionPartMgr::appendProjectionToModel(cvf::ModelBasicList* model, const caf::DisplayCoordTransform* displayCoordTransform) const void RivContourMapProjectionPartMgr::appendProjectionToModel(cvf::ModelBasicList* model, const caf::DisplayCoordTransform* displayCoordTransform) const
{ {
cvf::ScalarMapper* mapper = m_contourMapProjection->legendConfig()->scalarMapper();
cvf::ref<cvf::DrawableGeo> drawable = createProjectionMapDrawable(displayCoordTransform); cvf::ref<cvf::DrawableGeo> drawable = createProjectionMapDrawable(displayCoordTransform);
if (drawable.notNull() && drawable->boundingBox().isValid()) if (drawable.notNull() && drawable->boundingBox().isValid())
{ {
@@ -42,7 +44,6 @@ void RivContourMapProjectionPartMgr::appendProjectionToModel(cvf::ModelBasicList
part->setDrawable(drawable.p()); part->setDrawable(drawable.p());
cvf::ref<cvf::Vec2fArray> textureCoords = createTextureCoords(); cvf::ref<cvf::Vec2fArray> textureCoords = createTextureCoords();
cvf::ScalarMapper* mapper = m_contourMapProjection->legendConfig()->scalarMapper();
RivScalarMapperUtils::applyTextureResultsToPart(part.p(), textureCoords.p(), mapper, 1.0f, caf::FC_NONE, true, m_parentContourMap->backgroundColor()); RivScalarMapperUtils::applyTextureResultsToPart(part.p(), textureCoords.p(), mapper, 1.0f, caf::FC_NONE, true, m_parentContourMap->backgroundColor());
part->setSourceInfo(new RivObjectSourceInfo(m_contourMapProjection.p())); part->setSourceInfo(new RivObjectSourceInfo(m_contourMapProjection.p()));
@@ -52,22 +53,34 @@ void RivContourMapProjectionPartMgr::appendProjectionToModel(cvf::ModelBasicList
if (m_contourMapProjection->showContourLines()) if (m_contourMapProjection->showContourLines())
{ {
std::vector<cvf::ref<cvf::Drawable>> contourDrawables = createContourPolygons(displayCoordTransform); std::vector<double> tickValues;
for (cvf::ref<cvf::Drawable> contourDrawable : contourDrawables) mapper->majorTickValues(&tickValues);
std::vector<std::vector<cvf::ref<cvf::Drawable>>> contourDrawablesForAllLevels = createContourPolygons(displayCoordTransform);
for (size_t i = 0; i < contourDrawablesForAllLevels.size(); ++i)
{ {
if (contourDrawable.notNull() && contourDrawable->boundingBox().isValid()) std::vector<cvf::ref<cvf::Drawable>> contourDrawables = contourDrawablesForAllLevels[i];
cvf::Color3f backgroundColor(mapper->mapToColor(tickValues[i]));
cvf::Color3f lineColor = RiaColorTools::constrastColor(backgroundColor);
for (cvf::ref<cvf::Drawable> contourDrawable : contourDrawables)
{ {
caf::MeshEffectGenerator meshEffectGen(cvf::Color3::BLACK); if (contourDrawable.notNull() && contourDrawable->boundingBox().isValid())
meshEffectGen.setLineWidth(1.0f); {
meshEffectGen.createAndConfigurePolygonOffsetRenderState(caf::PO_1); caf::MeshEffectGenerator meshEffectGen(lineColor);
cvf::ref<cvf::Effect> effect = meshEffectGen.generateCachedEffect(); meshEffectGen.setLineWidth(1.0f);
meshEffectGen.createAndConfigurePolygonOffsetRenderState(caf::PO_1);
cvf::ref<cvf::Part> part = new cvf::Part; cvf::ref<cvf::Effect> effect = meshEffectGen.generateCachedEffect();
part->setDrawable(contourDrawable.p());
part->setEffect(effect.p());
part->setSourceInfo(new RivMeshLinesSourceInfo(m_contourMapProjection.p()));
model->addPart(part.p()); cvf::ref<cvf::Part> part = new cvf::Part;
part->setDrawable(contourDrawable.p());
part->setEffect(effect.p());
part->setSourceInfo(new RivMeshLinesSourceInfo(m_contourMapProjection.p()));
model->addPart(part.p());
}
} }
} }
} }
@@ -155,7 +168,7 @@ cvf::ref<cvf::Vec2fArray> RivContourMapProjectionPartMgr::createTextureCoords()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<cvf::DrawableText> RivContourMapProjectionPartMgr::createTextLabel(const cvf::Color3f& backgroundColor) cvf::ref<cvf::DrawableText> RivContourMapProjectionPartMgr::createTextLabel(const cvf::Color3f& textColor, const cvf::Color3f& backgroundColor)
{ {
auto font = RiaFontCache::getFont(RiaFontCache::FONT_SIZE_8); auto font = RiaFontCache::getFont(RiaFontCache::FONT_SIZE_8);
@@ -167,7 +180,6 @@ cvf::ref<cvf::DrawableText> RivContourMapProjectionPartMgr::createTextLabel(cons
labelDrawable->setDrawBackground(true); labelDrawable->setDrawBackground(true);
labelDrawable->setBackgroundColor(backgroundColor); labelDrawable->setBackgroundColor(backgroundColor);
labelDrawable->setVerticalAlignment(cvf::TextDrawer::BASELINE); labelDrawable->setVerticalAlignment(cvf::TextDrawer::BASELINE);
cvf::Color3f textColor = RiaColorTools::constrastColor(backgroundColor);
labelDrawable->setTextColor(textColor); labelDrawable->setTextColor(textColor);
return labelDrawable; return labelDrawable;
@@ -206,7 +218,7 @@ cvf::ref<cvf::DrawableGeo> RivContourMapProjectionPartMgr::createProjectionMapDr
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<cvf::ref<cvf::Drawable>> RivContourMapProjectionPartMgr::createContourPolygons(const caf::DisplayCoordTransform* displayCoordTransform) const std::vector<std::vector<cvf::ref<cvf::Drawable>>> RivContourMapProjectionPartMgr::createContourPolygons(const caf::DisplayCoordTransform* displayCoordTransform) const
{ {
m_contourMapProjection->generateContourPolygons(); m_contourMapProjection->generateContourPolygons();
const std::vector<RimContourMapProjection::ContourPolygons>& contourPolygons = m_contourMapProjection->contourPolygons(); const std::vector<RimContourMapProjection::ContourPolygons>& contourPolygons = m_contourMapProjection->contourPolygons();
@@ -215,11 +227,14 @@ std::vector<cvf::ref<cvf::Drawable>> RivContourMapProjectionPartMgr::createConto
std::vector<double> tickValues; std::vector<double> tickValues;
mapper->majorTickValues(&tickValues); mapper->majorTickValues(&tickValues);
std::vector<cvf::ref<cvf::Drawable>> contourDrawables; std::vector<std::vector<cvf::ref<cvf::Drawable>>> contourDrawablesForAllLevels;
std::vector<cvf::ref<cvf::Drawable>> labelDrawables; std::vector<cvf::ref<cvf::Drawable>> labelDrawables;
for (int64_t i = (int64_t) contourPolygons.size() - 1; i > 0; --i) for (int64_t i = (int64_t) contourPolygons.size() - 1; i > 0; --i)
{ {
std::vector<cvf::ref<cvf::Drawable>> contourDrawables;
cvf::Color3f backgroundColor(mapper->mapToColor(tickValues[i])); cvf::Color3f backgroundColor(mapper->mapToColor(tickValues[i]));
cvf::Color3f textColor = RiaColorTools::constrastColor(backgroundColor);
for (size_t j = 0; j < contourPolygons[i].size(); ++j) for (size_t j = 0; j < contourPolygons[i].size(); ++j)
{ {
@@ -229,7 +244,7 @@ std::vector<cvf::ref<cvf::Drawable>> RivContourMapProjectionPartMgr::createConto
size_t nLabels = m_contourMapProjection->showContourLabels() ? std::max((size_t)1, nVertices / 150u) : 0u; size_t nLabels = m_contourMapProjection->showContourLabels() ? std::max((size_t)1, nVertices / 150u) : 0u;
for (size_t l = 0; l < nLabels; ++l) for (size_t l = 0; l < nLabels; ++l)
{ {
cvf::ref<cvf::DrawableText> label = createTextLabel(backgroundColor); cvf::ref<cvf::DrawableText> label = createTextLabel(textColor, backgroundColor);
cvf::Vec3f labelVertex(displayCoordTransform->transformToDisplayCoord(contourPolygons[i][j].vertices[(nVertices * l) / nLabels])); cvf::Vec3f labelVertex(displayCoordTransform->transformToDisplayCoord(contourPolygons[i][j].vertices[(nVertices * l) / nLabels]));
labelVertex.z() += 3.0f; labelVertex.z() += 3.0f;
label->addText(contourPolygons[i][j].label, labelVertex); label->addText(contourPolygons[i][j].label, labelVertex);
@@ -274,13 +289,15 @@ std::vector<cvf::ref<cvf::Drawable>> RivContourMapProjectionPartMgr::createConto
geo->setVertexArray(vertexArray.p()); geo->setVertexArray(vertexArray.p());
contourDrawables.push_back(geo); contourDrawables.push_back(geo);
} }
} for (cvf::ref<cvf::Drawable> labelDrawable : labelDrawables)
for (cvf::ref<cvf::Drawable> labelDrawable : labelDrawables) {
{ contourDrawables.push_back(labelDrawable);
contourDrawables.push_back(labelDrawable); }
contourDrawablesForAllLevels.push_back(contourDrawables);
} }
return contourDrawables; return contourDrawablesForAllLevels;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.h
View File

@@ -43,10 +43,10 @@ public:
cvf::ref<cvf::Vec2fArray> createTextureCoords() const; cvf::ref<cvf::Vec2fArray> createTextureCoords() const;
private: private:
static cvf::ref<cvf::DrawableText> createTextLabel(const cvf::Color3f& backgroundColor); static cvf::ref<cvf::DrawableText> createTextLabel(const cvf::Color3f& textColor, const cvf::Color3f& backgroundColor);
cvf::ref<cvf::DrawableGeo> createProjectionMapDrawable(const caf::DisplayCoordTransform* displayCoordTransform) const; cvf::ref<cvf::DrawableGeo> createProjectionMapDrawable(const caf::DisplayCoordTransform* displayCoordTransform) const;
std::vector<cvf::ref<cvf::Drawable>> createContourPolygons(const caf::DisplayCoordTransform* displayCoordTransform) const; std::vector<std::vector<cvf::ref<cvf::Drawable>>> createContourPolygons(const caf::DisplayCoordTransform* displayCoordTransform) const;
cvf::ref<cvf::DrawableGeo> createPickPointVisDrawable(const caf::DisplayCoordTransform* displayCoordTransform) const; cvf::ref<cvf::DrawableGeo> createPickPointVisDrawable(const caf::DisplayCoordTransform* displayCoordTransform) const;
private: private:
caf::PdmPointer<RimContourMapProjection> m_contourMapProjection; caf::PdmPointer<RimContourMapProjection> m_contourMapProjection;
caf::PdmPointer<RimContourMapView> m_parentContourMap; caf::PdmPointer<RimContourMapView> m_parentContourMap;