fixed elevationDatasetsChanged() signal

mbernasocchi · pka · commit 930d124899eb · 2011-07-05T23:46:43.000+02:00
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();
 }

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,7 @@ void QgsGlobePluginDialog::saveElevationDatasources()`
`309`	`309`	`if (keysCount > rowsCount )`
`310`	`310`	`{`
`311`	`311`	`//elminate superfluous keys`
	`312`	`+ somethingChanged = true;`
`312`	`313`	`for (int i = rowsCount; i < keysCount; ++i) {`
`313`	`314`	`QString iNum;`
`314`	`315`	`iNum.setNum(i);`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,9 @@ void QgsGLWidgetAdapter::wheelEvent(QWheelEvent *event)`
`89`	`89`	`//reimplement the close event to emit a signal`
`90`	`90`	`void QgsGLWidgetAdapter::closeEvent(QCloseEvent *event)`
`91`	`91`	`{`
	`92`	`+ QMessageBox m;`
	`93`	`+ m.setText("close event");`
	`94`	`+ m.exec();`
`92`	`95`	`emit globeClosed();`
`93`	`96`	`event->accept();`
`94`	`97`	`}`