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

#4220 Apply picking cursor only when over a 3d View

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-03-22 15:55:51 +01:00
parent ef182da8a9
commit 44f3882ecb
5 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -77,6 +77,8 @@ using cvf::ManipulatorTrackball;
const double RI_MIN_NEARPLANE_DISTANCE = 0.1;
std::unique_ptr<QCursor> RiuViewer::s_hoverCursor;
//==================================================================================================
///
/// \class RiuViewer
@@ -841,11 +843,24 @@ void RiuViewer::mouseMoveEvent(QMouseEvent* mouseEvent)
caf::Viewer::mouseMoveEvent(mouseEvent);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::enterEvent(QEvent*)
{
if (s_hoverCursor)
{
QApplication::setOverrideCursor(*s_hoverCursor);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::leaveEvent(QEvent*)
{
QApplication::restoreOverrideCursor();
if (m_rimView && m_rimView->assosiatedViewLinker())
{
RimViewLinker* viewLinker = m_rimView->assosiatedViewLinker();
@@ -1026,6 +1041,22 @@ void RiuViewer::showScaleLegend(bool show)
updateLegendLayout();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::setHoverCursor(const QCursor& cursor)
{
s_hoverCursor.reset(new QCursor(cursor));
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::clearHoverCursor()
{
s_hoverCursor.reset();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

16
ApplicationCode/UserInterface/RiuViewer.h
View File

@@ -21,15 +21,17 @@
#pragma once
#include "RiuViewerToViewInterface.h"
#include "cafViewer.h"
#include "RiuInterfaceToViewWindow.h"
#include "cafMouseState.h"
#include "cafPdmObject.h"
#include "cafPdmPointer.h"
#include "cafPdmInterfacePointer.h"
#include "cafViewer.h"
#include "cafMouseState.h"
#include "cvfStructGrid.h"
#include "RiuInterfaceToViewWindow.h"
#include <memory>
class RicCommandFeature;
class Rim3dView;
@@ -127,6 +129,9 @@ public:
void showScaleLegend(bool show);
static void setHoverCursor(const QCursor& cursor);
static void clearHoverCursor();
public slots:
void slotSetCurrentFrame(int frameIndex) override;
void slotEndAnimation() override;
@@ -135,7 +140,8 @@ protected:
void optimizeClippingPlanes() override;
void resizeGL(int width, int height) override;
void mouseMoveEvent(QMouseEvent* e) override;
void leaveEvent(QEvent *) override;
void enterEvent(QEvent*) override;
void leaveEvent(QEvent*) override;
private:
void updateLegendLayout();
@@ -191,5 +197,7 @@ private:
bool m_isNavigationRotationEnabled;
cvf::ref<caf::OverlayScaleLegend> m_scaleLegend;
static std::unique_ptr<QCursor> s_hoverCursor;
};