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

#3698 Scale bar. Support for both horizontal and vertical orientation

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-11-16 13:50:15 +01:00
parent 05e04bb588
commit 75c923d102
3 changed files with 229 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -54,6 +54,7 @@
#include "cvfFont.h"
#include "cvfOpenGLResourceManager.h"
#include "cvfOverlayAxisCross.h"
#include "cvfOverlayItem.h"
#include "cvfPartRenderHintCollection.h"
#include "cvfRenderQueueSorter.h"
#include "cvfRenderSequence.h"
@@ -191,6 +192,7 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
m_selectionVisualizerManager = new caf::PdmUiSelectionVisualizer3d(this);
m_scaleLegend = new caf::OverlayScaleLegend(standardFont);
m_scaleLegend->setOrientation(caf::OverlayScaleLegend::HORIZONTAL);
}
//--------------------------------------------------------------------------------------------------
@@ -630,6 +632,12 @@ void RiuViewer::updateLegendLayout()
{
legend->setRenderSize(cvf::Vec2ui(maxColumnWidht, legend->renderSize().y()));
}
int margin = 5;
auto scaleLegendSize = m_scaleLegend->renderSize();
auto otherItemsHeight = m_versionInfoLabel->size().height();
m_scaleLegend->setLayoutFixedPosition({ width() - (int)scaleLegendSize.x() - margin - edgeAxisBorderWidth,
margin + edgeAxisBorderHeight + margin + otherItemsHeight});
}
//--------------------------------------------------------------------------------------------------
@@ -964,7 +972,12 @@ void RiuViewer::showScaleLegend(bool show)
{
if (show)
{
addColorLegendToBottomLeftCorner(m_scaleLegend.p());
if(m_scaleLegend->orientation() == caf::OverlayScaleLegend::HORIZONTAL)
m_scaleLegend->setRenderSize({400, 50});
else
m_scaleLegend->setRenderSize({70, 400});
m_mainRendering->addOverlayItem(m_scaleLegend.p());
}
else
{