rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

Should hopefully make log/stop log operations more robust, as well as avoid crashing GCS upon exit in case the user did log during the session...

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2192 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2010-12-04 17:39:32 +00:00 committed by edouard
parent 4e8c6588b6
commit 476d548da9
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ground/src/plugins/logging/loggingplugin.cpp
View File

@ -126,6 +126,24 @@ void LoggingThread::run()
void LoggingThread::stopLogging() void LoggingThread::stopLogging()
{ {
QWriteLocker locker(&lock); QWriteLocker locker(&lock);
// Disconnect all objects we registered with:
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();
QList< QList<UAVObject*> > list;
list = objManager->getObjects();
QList< QList<UAVObject*> >::const_iterator i;
QList<UAVObject*>::const_iterator j;
for (i = list.constBegin(); i != list.constEnd(); ++i)
{
for (j = (*i).constBegin(); j != (*i).constEnd(); ++j)
{
disconnect(*j, SIGNAL(objectUpdated(UAVObject*)), (LoggingThread*) this, SLOT(objectUpdated(UAVObject*)));
}
}
logFile.close(); logFile.close();
qDebug() << "File closed"; qDebug() << "File closed";
quit(); quit();
@ -216,7 +234,8 @@ LoggingPlugin::LoggingPlugin() : state(IDLE)
LoggingPlugin::~LoggingPlugin() LoggingPlugin::~LoggingPlugin()
{ {
// Do nothing if (loggingThread)
delete loggingThread;
} }
/** /**
@ -227,6 +246,9 @@ bool LoggingPlugin::initialize(const QStringList& args, QString *errMsg)
Q_UNUSED(args); Q_UNUSED(args);
Q_UNUSED(errMsg); Q_UNUSED(errMsg);
loggingThread = NULL;
// Add Menu entry // Add Menu entry
Core::ActionManager* am = Core::ICore::instance()->actionManager(); Core::ActionManager* am = Core::ICore::instance()->actionManager();
Core::ActionContainer* ac = am->actionContainer(Core::Constants::M_TOOLS); Core::ActionContainer* ac = am->actionContainer(Core::Constants::M_TOOLS);
@ -314,6 +336,9 @@ void LoggingPlugin::toggleReplay()
void LoggingPlugin::startLogging(QString file) void LoggingPlugin::startLogging(QString file)
{ {
qDebug() << "Logging to " << file; qDebug() << "Logging to " << file;
// We have to delete the previous logging thread if is was still there!
if (loggingThread)
delete loggingThread;
loggingThread = new LoggingThread(); loggingThread = new LoggingThread();
if(loggingThread->openFile(file,this)) if(loggingThread->openFile(file,this))
{ {
@ -359,6 +384,8 @@ void LoggingPlugin::startReplay(QString file)
void LoggingPlugin::stopLogging() void LoggingPlugin::stopLogging()
{ {
emit stopLoggingSignal(); emit stopLoggingSignal();
disconnect( this,SIGNAL(stopLoggingSignal()),0,0);
} }