Skip to content
Permalink
Browse files

Made settings dialog a member of GlobePlugin

  • Loading branch information
pka committed Nov 20, 2010
1 parent c0dca2a commit 99fb079aee078c232086370711dd86952a3e6893
Showing with 4 additions and 5 deletions.
  1. +2 −3 src/plugins/globe/globe_plugin.cpp
  2. +2 −2 src/plugins/globe/globe_plugin.h
@@ -67,6 +67,7 @@ GlobePlugin::GlobePlugin( QgisInterface* theQgisInterface )
mQActionSettingsPointer( NULL ),
viewer(),
mQDockWidget( tr( "Globe" ) ),
mSettingsDialog( theQgisInterface->mainWindow(), QgisGui::ModalDialogFlags ),
mTileSource(0),
mElevationManager( NULL ),
mObjectPlacer( NULL )
@@ -161,9 +162,7 @@ void GlobePlugin::run()

void GlobePlugin::settings()
{
QgsGlobePluginDialog* settingsDialog = new QgsGlobePluginDialog( mQGisIface->mainWindow(), QgisGui::ModalDialogFlags );
settingsDialog->setAttribute( Qt::WA_DeleteOnClose );
settingsDialog->exec();
mSettingsDialog.exec();

//QMessageBox msgBox;
//msgBox.setText(settingsDialog->stereoMode);
@@ -92,6 +92,8 @@ class GlobePlugin : public QObject, public QgisPlugin
QgsOsgViewer viewer;
//! Dock widget for viewer
QDockWidget mQDockWidget;
//! Settings Dialog
QgsGlobePluginDialog mSettingsDialog;
//! OSG root node
osg::Group* mRootNode;
//! Map node
@@ -106,8 +108,6 @@ class GlobePlugin : public QObject, public QgisPlugin
osgEarthUtil::ElevationManager* mElevationManager;
//! Object placer
osgEarthUtil::ObjectPlacer* mObjectPlacer;
//! Settings Dialog
QgsGlobePluginDialog* settingsDialog;
};

class FlyToExtentHandler : public osgGA::GUIEventHandler

0 comments on commit 99fb079

Please sign in to comment.
You can’t perform that action at this time.