rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-19 09:54:15 +01:00
Code Issues Releases Activity

Fix segfault on close. Fix _terrible_ variable naming. Fix excessive qDebug messages.

Browse Source
This commit is contained in:
David Buzz Carlson 2011-05-31 23:31:40 -07:00
parent bd35d9bff4
commit 2691b80576
3 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/libs/utils/xmlconfig.cpp
View File

@ -245,8 +245,9 @@ QString XmlConfig::variantToString(const QVariant &v)
result = QLatin1String("@Variant(");
result += QString::fromLatin1(a.toBase64().constData());
result += QLatin1Char(')');
qDebug() << "Variant Type: " << v.type();
qDebug()<< "Variant: " << result;
// These were being much too noisy!!
//qDebug() << "Variant Type: " << v.type();
//qDebug()<< "Variant: " << result;
#else
Q_ASSERT(!"QSettings: Cannot save custom types without QDataStream support");
#endif

64
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -35,6 +35,8 @@ UploaderGadgetWidget::UploaderGadgetWidget(QWidget *parent) : QWidget(parent)
currentStep = IAP_STATE_READY;
resetOnly=false;
dfu = NULL;
m_timer = 0;
m_progress = 0;
// Listen to autopilot connection events
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
@ -430,28 +432,28 @@ void UploaderGadgetWidget::systemRescue()
log("** Follow those instructions to attempt a system rescue **");
log("**********************************************************");
log("You will be prompted to first connect USB, then system power");
pd = new QProgressDialog(tr("Please connect the board (USB only!)"), tr("Cancel"), 0, 20);
QProgressBar * bar=new QProgressBar(pd);
m_progress = new QProgressDialog(tr("Please connect the board (USB only!)"), tr("Cancel"), 0, 20);
QProgressBar * bar=new QProgressBar(m_progress);
bar->setFormat("Timeout");
pd->setBar(bar);
pd->setMinimumDuration(0);
pd->setRange(0,20);
connect(pd, SIGNAL(canceled()), this, SLOT(cancel()));
t = new QTimer(this);
connect(t, SIGNAL(timeout()), this, SLOT(perform()));
t->start(1000);
connect(USBMonitor::instance(), SIGNAL(deviceDiscovered(USBPortInfo)),&q, SLOT(quit()));
q.exec();
if(!t->isActive())
m_progress->setBar(bar);
m_progress->setMinimumDuration(0);
m_progress->setRange(0,20);
connect(m_progress, SIGNAL(canceled()), this, SLOT(cancel()));
m_timer = new QTimer(this);
connect(m_timer, SIGNAL(timeout()), this, SLOT(perform()));
m_timer->start(1000);
connect(USBMonitor::instance(), SIGNAL(deviceDiscovered(USBPortInfo)),&m_eventloop, SLOT(quit()));
m_eventloop.exec();
if(!m_timer->isActive())
{
pd->close();
t->stop();
m_progress->close();
m_timer->stop();
QMessageBox::warning(this,tr("Openpilot Uploader"),tr("No board connection was detected!"));
m_config->rescueButton->setEnabled(true);
return;
}
pd->close();
t->stop();
m_progress->close();
m_timer->stop();
log("... Detecting First Board...");
repaint();
dfu = new DFUObject(DFU_DEBUG, false, QString());
@ -477,8 +479,8 @@ void UploaderGadgetWidget::systemRescue()
if(QMessageBox::question(this,tr("OpenPilot Uploader"),tr("If you want to search for other boards connect power now and press Yes"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes)
{
log("\nWaiting...");
QTimer::singleShot(3000, &q, SLOT(quit()));
q.exec();
QTimer::singleShot(3000, &m_eventloop, SLOT(quit()));
m_eventloop.exec();
log("Detecting second board...");
repaint();
if(!dfu->findDevices())
@ -517,17 +519,17 @@ void UploaderGadgetWidget::systemRescue()
}
void UploaderGadgetWidget::perform()
{
if(pd->value()==19)
if(m_progress->value()==19)
{
t->stop();
q.exit();
m_timer->stop();
m_eventloop.exit();
}
pd->setValue(pd->value()+1);
m_progress->setValue(m_progress->value()+1);
}
void UploaderGadgetWidget::cancel()
{
t->stop();
q.exit();
m_timer->stop();
m_eventloop.exit();
}
/**
@ -554,12 +556,16 @@ UploaderGadgetWidget::~UploaderGadgetWidget()
QWidget *qw = m_config->systemElements->widget(0);
m_config->systemElements->removeTab(0);
delete qw;
qw = 0;
}
if (m_progress) {
delete m_progress;
m_progress = 0;
}
if (m_timer) {
delete m_timer;
m_timer = 0;
}
if (pd)
delete pd;
if (t)
delete t;
}

6
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h
View File

@ -78,10 +78,10 @@ private:
bool resetOnly;
void clearLog();
QString getPortDevice(const QString &friendName);
QProgressDialog* pd;
QTimer* t;
QProgressDialog* m_progress;
QTimer* m_timer;
QLineEdit* openFileNameLE;
QEventLoop q;
QEventLoop m_eventloop;
private slots:
void error(QString errorString,int errorNumber);
void info(QString infoString,int infoNumber);