fixed elevationDatasetsChanged() signal

qgis · Jul 5, 2011 · 930d124 · 930d124
1 parent 17aca2d
commit 930d124
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -107,15 +107,13 @@ void GlobePlugin::initGui()
            this, SLOT( extentsChanged() ) );
   connect( mQGisIface->mapCanvas(), SIGNAL( layersChanged() ),
            this, SLOT( layersChanged() ) );
-  //FIXME: fix sender objact, must be mSettingsDialog
-  connect( mQGisIface->mapCanvas(), SIGNAL( elevationDatasourcesChanged() ),
+  connect( &mSettingsDialog, SIGNAL( elevationDatasourcesChanged() ),
            this, SLOT( layersChanged() ) );
   connect( mQGisIface->mainWindow(), SIGNAL( projectRead() ), this,
            SLOT( projectReady() ) );
   connect( mQGisIface->mainWindow(), SIGNAL( newProjectCreated() ), this,
            SLOT( blankProjectReady() ) );
-  //FIXME: fix sender objact, must be mSettingsDialog
-  connect( mQGisIface->mainWindow(), SIGNAL( globeClosed() ), this,
+  connect( &viewer, SIGNAL( globeClosed() ), this,
            SLOT( setGlobeNotRunning() ) );
 
 }
@@ -272,7 +270,7 @@ void GlobePlugin::projectReady()
 void GlobePlugin::blankProjectReady()
 {//TODO
   QMessageBox m;
-  m.setText("new");
+  m.setText("new project loaded");
   m.exec();
   mSettingsDialog.elevationDatasources()->clearContents();
   mSettingsDialog.elevationDatasources()->setRowCount(0);
@@ -743,6 +741,9 @@ void GlobePlugin::copyFolder( QString sourceFolder, QString destFolder )
 
 void GlobePlugin::setGlobeNotRunning()
 {
+  QMessageBox m;
+  m.setText("globe not running");
+  m.exec();
   mIsGlobeRunning = false;
 }
 

diff --git a/src/plugins/globe/globe_plugin_dialog.cpp b/src/plugins/globe/globe_plugin_dialog.cpp
@@ -309,6 +309,7 @@ void QgsGlobePluginDialog::saveElevationDatasources()
   if (keysCount > rowsCount )
   {
     //elminate superfluous keys
+    somethingChanged = true;
     for (int i = rowsCount; i < keysCount; ++i) {
       QString iNum;
       iNum.setNum(i);

diff --git a/src/plugins/globe/qgsosgviewer.cpp b/src/plugins/globe/qgsosgviewer.cpp
@@ -89,6 +89,9 @@ void QgsGLWidgetAdapter::wheelEvent(QWheelEvent *event)
 //reimplement the close event to emit a signal
 void QgsGLWidgetAdapter::closeEvent(QCloseEvent *event)
 {
+  QMessageBox m;
+  m.setText("close event");
+  m.exec();
   emit globeClosed();
   event->accept();
 }