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

#3573 Draw axis lines across the whole view for 2d Contour Maps.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-10-31 12:13:04 +01:00
parent e9de865c1f
commit 78d81d2630
8 changed files with 164 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -826,7 +826,7 @@ void RiuViewer::updateGridBoxData(double scaleZ,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::showEdgeTickMarksXY(bool enable)
void RiuViewer::showEdgeTickMarksXY(bool enable, bool showAxisLines)
{
m_mainRendering->removeOverlayItem(m_windowEdgeAxisOverlay.p());
@@ -834,16 +834,16 @@ void RiuViewer::showEdgeTickMarksXY(bool enable)
{
m_windowEdgeAxisOverlay->setDomainAxes(RivWindowEdgeAxesOverlayItem::XY_AXES);
m_windowEdgeAxisOverlay->setIsSwitchingYAxisSign(false);
m_windowEdgeAxisOverlay->setShowAxisLines(showAxisLines);
m_mainRendering->addOverlayItem(m_windowEdgeAxisOverlay.p());
}
m_showWindowEdgeAxes = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::showEdgeTickMarksXZ(bool enable)
void RiuViewer::showEdgeTickMarksXZ(bool enable, bool showAxisLines)
{
m_mainRendering->removeOverlayItem(m_windowEdgeAxisOverlay.p());
@@ -851,9 +851,9 @@ void RiuViewer::showEdgeTickMarksXZ(bool enable)
{
m_windowEdgeAxisOverlay->setDomainAxes(RivWindowEdgeAxesOverlayItem::XZ_AXES);
m_windowEdgeAxisOverlay->setIsSwitchingYAxisSign(true);
m_windowEdgeAxisOverlay->setShowAxisLines(showAxisLines);
m_mainRendering->addOverlayItem(m_windowEdgeAxisOverlay.p());
}
m_showWindowEdgeAxes = enable;
}

4
ApplicationCode/UserInterface/RiuViewer.h
View File

@@ -90,8 +90,8 @@ public:
const cvf::Vec3d& displayModelOffset,
const cvf::Color3f& backgroundColor,
const cvf::BoundingBox& domainCoordBoundingBox);
void showEdgeTickMarksXY(bool enable);
void showEdgeTickMarksXZ(bool enable);
void showEdgeTickMarksXY(bool enable, bool showAxisLines = false);
void showEdgeTickMarksXZ(bool enable, bool showAxisLines = false);
void updateAnnotationItems();