Skip to content

Commit 930d124

Browse files
mbernasocchipka
authored andcommittedJul 5, 2011
fixed elevationDatasetsChanged() signal
1 parent 17aca2d commit 930d124

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed
 

‎src/plugins/globe/globe_plugin.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,13 @@ void GlobePlugin::initGui()
107107
this, SLOT( extentsChanged() ) );
108108
connect( mQGisIface->mapCanvas(), SIGNAL( layersChanged() ),
109109
this, SLOT( layersChanged() ) );
110-
//FIXME: fix sender objact, must be mSettingsDialog
111-
connect( mQGisIface->mapCanvas(), SIGNAL( elevationDatasourcesChanged() ),
110+
connect( &mSettingsDialog, SIGNAL( elevationDatasourcesChanged() ),
112111
this, SLOT( layersChanged() ) );
113112
connect( mQGisIface->mainWindow(), SIGNAL( projectRead() ), this,
114113
SLOT( projectReady() ) );
115114
connect( mQGisIface->mainWindow(), SIGNAL( newProjectCreated() ), this,
116115
SLOT( blankProjectReady() ) );
117-
//FIXME: fix sender objact, must be mSettingsDialog
118-
connect( mQGisIface->mainWindow(), SIGNAL( globeClosed() ), this,
116+
connect( &viewer, SIGNAL( globeClosed() ), this,
119117
SLOT( setGlobeNotRunning() ) );
120118

121119
}
@@ -272,7 +270,7 @@ void GlobePlugin::projectReady()
272270
void GlobePlugin::blankProjectReady()
273271
{//TODO
274272
QMessageBox m;
275-
m.setText("new");
273+
m.setText("new project loaded");
276274
m.exec();
277275
mSettingsDialog.elevationDatasources()->clearContents();
278276
mSettingsDialog.elevationDatasources()->setRowCount(0);
@@ -743,6 +741,9 @@ void GlobePlugin::copyFolder( QString sourceFolder, QString destFolder )
743741

744742
void GlobePlugin::setGlobeNotRunning()
745743
{
744+
QMessageBox m;
745+
m.setText("globe not running");
746+
m.exec();
746747
mIsGlobeRunning = false;
747748
}
748749

‎src/plugins/globe/globe_plugin_dialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ void QgsGlobePluginDialog::saveElevationDatasources()
309309
if (keysCount > rowsCount )
310310
{
311311
//elminate superfluous keys
312+
somethingChanged = true;
312313
for (int i = rowsCount; i < keysCount; ++i) {
313314
QString iNum;
314315
iNum.setNum(i);

‎src/plugins/globe/qgsosgviewer.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ void QgsGLWidgetAdapter::wheelEvent(QWheelEvent *event)
8989
//reimplement the close event to emit a signal
9090
void QgsGLWidgetAdapter::closeEvent(QCloseEvent *event)
9191
{
92+
QMessageBox m;
93+
m.setText("close event");
94+
m.exec();
9295
emit globeClosed();
9396
event->accept();
9497
}

0 commit comments

Comments
 (0)
Please sign in to comment.