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

#2337 Window Edge axis overlay item working.

Browse Source
This commit is contained in:
Jacob Støren
2018-02-08 19:42:34 +01:00
parent c3ea8f3415
commit 911571e267
7 changed files with 657 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -59,6 +59,7 @@
#include <QLabel>
#include <QMouseEvent>
#include <QProgressBar>
#include "WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h"
using cvf::ManipulatorTrackball;
@@ -175,6 +176,8 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
m_gridBoxGenerator = new RivGridBoxGenerator;
m_cursorPositionDomainCoords = cvf::Vec3d::UNDEFINED;
m_windowEdgeAxisOverlay = new RivWindowEdgeAxesOverlayItem(standardFont);
}
//--------------------------------------------------------------------------------------------------
@@ -697,8 +700,9 @@ RimViewWindow* RiuViewer::ownerViewWindow() const
//--------------------------------------------------------------------------------------------------
void RiuViewer::optimizeClippingPlanes()
{
m_windowEdgeAxisOverlay->setDisplayCoordTransform(m_rimView->displayCoordTransform().p());
m_gridBoxGenerator->updateFromCamera(mainCamera());
m_windowEdgeAxisOverlay->updateFromCamera(this->mainCamera());
caf::Viewer::optimizeClippingPlanes();
}
@@ -789,6 +793,19 @@ void RiuViewer::updateGridBoxData(double scaleZ,
m_gridBoxGenerator->createGridBoxParts();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::showEdgeTickMarks(bool enable)
{
m_mainRendering->removeOverlayItem(m_windowEdgeAxisOverlay.p());
if (enable)
{
m_mainRendering->addOverlayItem(m_windowEdgeAxisOverlay.p());
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------