rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00
Code Issues Releases Activity

Add an object saving completion message, so that the user knows when saving is finished.

Browse Source
This commit is contained in:
elafargue 2011-06-04 14:32:15 +02:00
parent 2387958422
commit 864dbb0ab5
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
View File

@ -172,6 +172,7 @@ void UAVObjectUtilManager::objectPersistenceOperationFailed()
obj->disconnect(this); obj->disconnect(this);
queue.dequeue(); // We can now remove the object, it failed anyway. queue.dequeue(); // We can now remove the object, it failed anyway.
saveState = IDLE; saveState = IDLE;
emit saveCompleted(obj->getField("ObjectID")->getValue().toInt(), false);
saveNextObject(); saveNextObject();
} }
} }
@ -199,6 +200,7 @@ void UAVObjectUtilManager::objectPersistenceUpdated(UAVObject * obj)
obj->disconnect(this); obj->disconnect(this);
queue.dequeue(); // We can now remove the object, it's done. queue.dequeue(); // We can now remove the object, it's done.
saveState = IDLE; saveState = IDLE;
emit saveCompleted(obj->getField("ObjectID")->getValue().toInt(), true);
saveNextObject(); saveNextObject();
} }
} }

2
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.h
View File

@ -67,6 +67,8 @@ public:
UAVObjectManager* getObjectManager(); UAVObjectManager* getObjectManager();
void saveObjectToSD(UAVObject *obj); void saveObjectToSD(UAVObject *obj);
signals:
void saveCompleted(int objectID, bool status);
private: private:
QMutex *mutex; QMutex *mutex;

8
ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.cpp
View File

@ -84,6 +84,7 @@ void ImportSummaryDialog::doTheSaving()
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager *objManager = pm->getObject<UAVObjectManager>(); UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();
UAVObjectUtilManager *utilManager = pm->getObject<UAVObjectUtilManager>(); UAVObjectUtilManager *utilManager = pm->getObject<UAVObjectUtilManager>();
connect(utilManager, SIGNAL(saveCompleted(int,bool)), this, SLOT(updateSaveCompletion()));
for(int i=0; i < ui->importSummaryList->rowCount(); i++) { for(int i=0; i < ui->importSummaryList->rowCount(); i++) {
QString uavObjectName = ui->importSummaryList->item(i,1)->text(); QString uavObjectName = ui->importSummaryList->item(i,1)->text();
@ -91,12 +92,17 @@ void ImportSummaryDialog::doTheSaving()
if (box->isChecked()) { if (box->isChecked()) {
UAVObject* obj = objManager->getObject(uavObjectName); UAVObject* obj = objManager->getObject(uavObjectName);
utilManager->saveObjectToSD(obj); utilManager->saveObjectToSD(obj);
ui->progressBar->setValue(i);
this->repaint(); this->repaint();
} }
} }
} }
void ImportSummaryDialog::updateSaveCompletion()
{
ui->progressBar->setValue(ui->progressBar->value()+1);
}
void ImportSummaryDialog::changeEvent(QEvent *e) void ImportSummaryDialog::changeEvent(QEvent *e)
{ {
QDialog::changeEvent(e); QDialog::changeEvent(e);

4
ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.h
View File

@ -57,8 +57,10 @@ protected:
private: private:
Ui::ImportSummaryDialog *ui; Ui::ImportSummaryDialog *ui;
private slots: public slots:
void updateSaveCompletion();
private slots:
void doTheSaving(); void doTheSaving();
}; };