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

Merge remote branches 'origin/PeterG/OP-455_win7_log_file_dialog' and 'origin/PeterG/OP-549_GCS_reversed_dials' into next

Browse Source
This commit is contained in:
Oleg Semyonov 2011-08-06 21:56:16 +03:00
commit d30c939c46
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp
View File

@ -478,13 +478,13 @@ void DialGadgetWidget::setDialFont(QString fontProps)
// this enables smooth rotation in rotateNeedles below
void DialGadgetWidget::setNeedle1(double value) {
if (rotateN1) {
needle1Target = 360*(value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
needle1Target = 360*(value*n1Factor)/(n1MaxValue-n1MinValue);
}
if (horizN1) {
needle1Target = (value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
needle1Target = (value*n1Factor)/(n1MaxValue-n1MinValue);
}
if (vertN1) {
needle1Target = (value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
needle1Target = (value*n1Factor)/(n1MaxValue-n1MinValue);
}
if (!dialTimer.isActive())
dialTimer.start();
@ -497,13 +497,13 @@ void DialGadgetWidget::setNeedle1(double value) {
void DialGadgetWidget::setNeedle2(double value) {
if (rotateN2) {
needle2Target = 360*(value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
needle2Target = 360*(value*n2Factor)/(n2MaxValue-n2MinValue);
}
if (horizN2) {
needle2Target = (value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
needle2Target = (value*n2Factor)/(n2MaxValue-n2MinValue);
}
if (vertN2) {
needle2Target = (value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
needle2Target = (value*n2Factor)/(n2MaxValue-n2MinValue);
}
if (!dialTimer.isActive())
dialTimer.start();
@ -517,13 +517,13 @@ void DialGadgetWidget::setNeedle2(double value) {
void DialGadgetWidget::setNeedle3(double value) {
if (rotateN3) {
needle3Target = 360*(value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
needle3Target = 360*(value*n3Factor)/(n3MaxValue-n3MinValue);
}
if (horizN3) {
needle3Target = (value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
needle3Target = (value*n3Factor)/(n3MaxValue-n3MinValue);
}
if (vertN3) {
needle3Target = (value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
needle3Target = (value*n3Factor)/(n3MaxValue-n3MinValue);
}
if (!dialTimer.isActive())
dialTimer.start();

9
ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
View File

@ -76,11 +76,10 @@ QIODevice* LoggingConnection::openDevice(const QString &deviceName)
if (logFile.isOpen()){
logFile.close();
}
QFileDialog * fd = new QFileDialog();
fd->setAcceptMode(QFileDialog::AcceptOpen);
fd->setNameFilter("OpenPilot Log (*.opl)");
connect(fd, SIGNAL(fileSelected(QString)), this, SLOT(startReplay(QString)));
fd->exec();
QString fileName = QFileDialog::getOpenFileName(NULL, tr("Open file"), QString(""), tr("OpenPilot Log (*.opl)"));
if (!fileName.isNull()) {
startReplay(fileName);
}
return &logFile;
}