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

More renaming and reformatting of legend code

Browse Source
This commit is contained in:
Jacob Støren 2018-04-20 11:27:34 +02:00
parent 1f8d4437bf
commit 0192f66a4d
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.cpp
View File

@ -225,7 +225,7 @@ void CategoryLegend::setupTextDrawer(TextDrawer* textDrawer,
m_visibleCategoryLabels.push_back(true);
}
float titleY = static_cast<float>(layout->size.y()) - layout->margins.y() - layout->charHeight / 2.0f;
float titleY = static_cast<float>(layout->overallLegendSize.y()) - layout->margins.y() - layout->charHeight / 2.0f;
for (size_t it = 0; it < this->titleStrings().size(); it++)
{
Vec2f pos(layout->margins.x(), titleY);
@ -478,7 +478,7 @@ void CategoryLegend::layoutInfo(OverlayColorLegendLayoutInfo* layout)
layout->margins = Vec2f(8.0f, 8.0f);
float colorBarWidth = 25.0f;
float colorBarHeight = static_cast<float>(layout->size.y())
float colorBarHeight = static_cast<float>(layout->overallLegendSize.y())
- 2 * layout->margins.y()
- static_cast<float>(this->titleStrings().size()) * layout->lineSpacing
- layout->lineSpacing;

4
Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.h
View File

@ -49,7 +49,7 @@ protected:
tickStartX = 0.0f;
tickMidX = 0.0f;
size = setSize;
overallLegendSize = setSize;
}
float charHeight;
@ -59,7 +59,7 @@ protected:
cvf::Rectf colorBarRect;
cvf::Vec2ui size;
cvf::Vec2ui overallLegendSize;
};
void layoutInfo(OverlayColorLegendLayoutInfo* layout);

25
Fwk/AppFwk/cafVizExtensions/cafOverlayScalarMapperLegend.cpp
View File

@ -154,7 +154,9 @@ bool OverlayScalarMapperLegend::pick(int oglXCoord, int oglYCoord, const Vec2i&
legendBarOrigin.x() += static_cast<uint>(layoutInViewPortCoords.colorBarRect.min().x());
legendBarOrigin.y() += static_cast<uint>(layoutInViewPortCoords.colorBarRect.min().y());
Recti legendBarRect = Recti(legendBarOrigin, static_cast<uint>(layoutInViewPortCoords.colorBarRect.width()), static_cast<uint>(layoutInViewPortCoords.colorBarRect.height()));
Recti legendBarRect = Recti(legendBarOrigin,
static_cast<uint>(layoutInViewPortCoords.colorBarRect.width()),
static_cast<uint>(layoutInViewPortCoords.colorBarRect.height()));
if ((oglXCoord > legendBarRect.min().x()) && (oglXCoord < legendBarRect.max().x()) &&
(oglYCoord > legendBarRect.min().y()) && (oglYCoord < legendBarRect.max().y()))
@ -190,14 +192,27 @@ void OverlayScalarMapperLegend::renderGeneric(OpenGLContext* oglContext, const V
// Do the actual rendering
if (software)
{
if (this->backgroundEnabled()) InternalLegendRenderTools::renderBackgroundImmediateMode(oglContext, backgroundSize, this->backgroundColor(), this->backgroundFrameColor());
if ( this->backgroundEnabled() )
{
InternalLegendRenderTools::renderBackgroundImmediateMode(oglContext,
backgroundSize,
this->backgroundColor(),
this->backgroundFrameColor());
}
renderLegendImmediateMode(oglContext, &m_Layout);
m_textDrawer->renderSoftware(oglContext, camera);
}
else
{
const MatrixState matrixState(camera);
if (this->backgroundEnabled()) InternalLegendRenderTools::renderBackgroundUsingShaders(oglContext, matrixState, backgroundSize, this->backgroundColor(), this->backgroundFrameColor());
if ( this->backgroundEnabled() )
{
InternalLegendRenderTools::renderBackgroundUsingShaders(oglContext,
matrixState,
backgroundSize,
this->backgroundColor(),
this->backgroundFrameColor());
}
renderLegendUsingShaders(oglContext, &m_Layout, matrixState);
m_textDrawer->render(oglContext, camera);
}
@ -276,7 +291,7 @@ void OverlayScalarMapperLegend::setupTextDrawer(TextDrawer* textDrawer, const Ov
m_visibleTickLabels.push_back(true);
}
float titleY = static_cast<float>(layout->size.y()) - layout->margins.y() - layout->charHeight/2.0f;
float titleY = static_cast<float>(layout->overallLegendSize.y()) - layout->margins.y() - layout->charHeight/2.0f;
for (it = 0; it < this->titleStrings().size(); it++)
{
Vec2f pos(layout->margins.x(), titleY);
@ -609,7 +624,7 @@ void OverlayScalarMapperLegend::layoutInfo(OverlayColorLegendLayoutInfo* layout)
layout->margins = Vec2f(8.0f, 8.0f);
float colorBarWidth = 25.0f;
float colorBarHeight = static_cast<float>(layout->size.y())
float colorBarHeight = static_cast<float>(layout->overallLegendSize.y())
- 2*layout->margins.y()
- static_cast<float>(this->titleStrings().size()) * layout->lineSpacing
- layout->lineSpacing;

4
Fwk/AppFwk/cafVizExtensions/cafOverlayScalarMapperLegend.h
View File

@ -95,7 +95,7 @@ protected:
{
OverlayColorLegendLayoutInfo(const Vec2ui& setSize)
{
size = setSize;
overallLegendSize = setSize;
}
float charHeight;
@ -107,7 +107,7 @@ protected:
cvf::ref<DoubleArray> tickYPixelPos;
Vec2ui size;
Vec2ui overallLegendSize;
};
void layoutInfo(OverlayColorLegendLayoutInfo* layout);