From 11d5d0b6d18c4343884698fa47dd52027a57ab2f Mon Sep 17 00:00:00 2001
From: Peter Gunnarsson <peter@pyne.se>
Date: Fri, 5 Aug 2011 12:22:08 +0200
Subject: [PATCH 1/2] Fix for OP-455

---
 .../openpilotgcs/src/plugins/logging/loggingplugin.cpp   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp b/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
index d5e85ccae..6333c4e98 100644
--- a/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
@@ -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;
 }
 

From 12ba6addb02ef0bee2457b0f9370525c524accbb Mon Sep 17 00:00:00 2001
From: Peter Gunnarsson <peter@pyne.se>
Date: Fri, 5 Aug 2011 15:33:45 +0200
Subject: [PATCH 2/2] Fix for OP-549 reversed dials by Dmitry Zaitsev

---
 .../src/plugins/dial/dialgadgetwidget.cpp      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp
index a3bdebe42..ba6f35f19 100644
--- a/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp
@@ -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();