Skip to content

Commit b2f62df

Browse files
committed
include cleanup
1 parent 3ada3ae commit b2f62df

File tree

1 file changed

+0
-55
lines changed

1 file changed

+0
-55
lines changed

src/plugins/globe/qgsosgviewer.cpp

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,7 @@
1919
#include "qgsosgviewer.h"
2020

2121
#include <osgViewer/ViewerEventHandlers>
22-
#include <osgGA/TrackballManipulator>
23-
#include <osgDB/ReadFile>
2422

25-
#include <QtCore/QString>
26-
#include <QtGui/QApplication>
27-
#include <QtGui/QMainWindow>
28-
#include <QtGui/QMdiSubWindow>
29-
#include <QtGui/QMdiArea>
30-
31-
#include <iostream>
3223

3324
QgsGLWidgetAdapter::QgsGLWidgetAdapter( QWidget * parent, const char * name, const QGLWidget * shareWidget, WindowFlags f):
3425
QGLWidget(parent, shareWidget, f)
@@ -86,53 +77,7 @@ void QgsGLWidgetAdapter::mouseMoveEvent( QMouseEvent* event )
8677
_gw->getEventQueue()->mouseMotion(event->x(), event->y());
8778
}
8879

89-
9080
void QgsGLWidgetAdapter::wheelEvent(QWheelEvent *event)
9181
{
9282
_gw->getEventQueue()->mouseScroll((event->delta()>0) ? osgGA::GUIEventAdapter::SCROLL_UP : osgGA::GUIEventAdapter::SCROLL_DOWN);
9383
}
94-
95-
// int mainAdapterWidget(QApplication& a, osg::ArgumentParser& arguments)
96-
// {
97-
// // load the scene.
98-
// osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
99-
// if (!loadedModel)
100-
// {
101-
// std::cout << arguments[0] <<": No data loaded." << std::endl;
102-
// return 1;
103-
// }
104-
//
105-
// std::cout<<"Using AdapterWidget - QGLWidget subclassed to integrate with osgViewer using its embedded graphics window support."<<std::endl;
106-
//
107-
// if (arguments.read("--mdi")) {
108-
// std::cout<<"Using ViewetQT MDI version"<<std::endl;
109-
// /*
110-
// Following problems are found here:
111-
// - miminize causes loaded model to disappear (some problem with Camera matrix? - clampProjectionMatrix is invalid)
112-
// */
113-
// QgsOsgViewer* viewerWindow = new QgsOsgViewer;
114-
// viewerWindow->setCameraManipulator(new osgGA::TrackballManipulator);
115-
// viewerWindow->setSceneData(loadedModel.get());
116-
//
117-
// QMainWindow* mw = new QMainWindow();
118-
// QMdiArea* mdiArea = new QMdiArea(mw);
119-
// mw->setCentralWidget(mdiArea);
120-
//
121-
// QMdiSubWindow *subWindow = mdiArea->addSubWindow(viewerWindow);
122-
// subWindow->showMaximized();
123-
// subWindow->setWindowTitle("New Window");
124-
// mw->show();
125-
// } else {
126-
// QgsOsgViewer* viewerWindow = new QgsOsgViewer;
127-
//
128-
// viewerWindow->setCameraManipulator(new osgGA::TrackballManipulator);
129-
// viewerWindow->setSceneData(loadedModel.get());
130-
//
131-
// viewerWindow->show();
132-
// }
133-
//
134-
//
135-
// a.connect( &a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()) );
136-
//
137-
// return a.exec();
138-
// }

0 commit comments

Comments
 (0)