Skip to content

Commit 3ada3ae

Browse files
committed
Mouse wheel zoom
1 parent 2fa95c4 commit 3ada3ae

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/plugins/globe/globe_plugin.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,13 @@ void GlobePlugin::run()
117117
// The MapNode will render the Map object in the scene graph.
118118
mMapNode = new osgEarth::MapNode( map );
119119

120+
viewer.setSceneData( mMapNode );
121+
120122
// Set a home viewpoint
121123
manip->setHomeViewpoint(
122124
osgEarthUtil::Viewpoint( osg::Vec3d( -90, 0, 0 ), 0.0, -90.0, 4e7 ),
123125
1.0 );
124126

125-
viewer.setSceneData( mMapNode );
126-
127-
manip->getSettings()->bindMouseDoubleClick(
128-
osgEarthUtil::EarthManipulator::ACTION_GOTO,
129-
osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON );
130-
131127
// add our fly-to handler
132128
viewer.addEventHandler(new FlyToExtentHandler( manip, mQGisIface ));
133129

src/plugins/globe/qgsosgviewer.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ void QgsGLWidgetAdapter::mouseMoveEvent( QMouseEvent* event )
8787
}
8888

8989

90+
void QgsGLWidgetAdapter::wheelEvent(QWheelEvent *event)
91+
{
92+
_gw->getEventQueue()->mouseScroll((event->delta()>0) ? osgGA::GUIEventAdapter::SCROLL_UP : osgGA::GUIEventAdapter::SCROLL_DOWN);
93+
}
94+
9095
// int mainAdapterWidget(QApplication& a, osg::ArgumentParser& arguments)
9196
// {
9297
// // load the scene.

src/plugins/globe/qgsosgviewer.h

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class QgsGLWidgetAdapter : public QGLWidget
4848
virtual void mousePressEvent( QMouseEvent* event );
4949
virtual void mouseReleaseEvent( QMouseEvent* event );
5050
virtual void mouseMoveEvent( QMouseEvent* event );
51+
virtual void wheelEvent( QWheelEvent * event );
5152

5253
osg::ref_ptr<osgViewer::GraphicsWindowEmbedded> _gw;
5354
};

0 commit comments

Comments
 (0)