From d9216d72fe9d5d241c91ce404087f8736696ec96 Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Sat, 14 Feb 2015 17:23:27 +0100
Subject: [PATCH] OP-1685 - Fixes for review comments

---
 .../src/plugins/config/configoutputwidget.cpp          | 10 ++++++++--
 .../src/plugins/config/configoutputwidget.h            |  2 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
index 03f4727f2..36cdcd951 100644
--- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
@@ -106,7 +106,7 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
     addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode5, 4, 0, true);
     addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode6, 5, 0, true);
 
-    systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
+    SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
     connect(systemAlarmsObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateWarnings(UAVObject *)));
 
     disconnect(this, SLOT(refreshWidgetsValues(UAVObject *)));
@@ -115,11 +115,13 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
     refreshWidgetsValues();
 
     updateEnableControls();
-    setWarning("PIppo");
 }
 
 ConfigOutputWidget::~ConfigOutputWidget()
 {
+    SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
+
+    disconnect(systemAlarmsObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateWarnings(UAVObject *)));
     // Do nothing
 }
 
@@ -150,6 +152,7 @@ void ConfigOutputWidget::sendAllChannelTests()
  */
 void ConfigOutputWidget::runChannelTests(bool state)
 {
+    SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
     SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData();
 
     if (state && systemAlarms.Alarm[SystemAlarms::ALARM_ACTUATOR] != SystemAlarms::ALARM_OK) {
@@ -443,6 +446,7 @@ void ConfigOutputWidget::stopTests()
 
 void ConfigOutputWidget::updateWarnings(UAVObject *)
 {
+    SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
     SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData();
 
     if (systemAlarms.Alarm[SystemAlarms::ALARM_SYSTEMCONFIGURATION] > SystemAlarms::ALARM_WARNING) {
@@ -457,6 +461,8 @@ void ConfigOutputWidget::updateWarnings(UAVObject *)
 
 void ConfigOutputWidget::setWarning(QString message)
 {
+    QPixmap warningPic;
+
     ui->gvWarning->scene()->clear();
     if (!message.isNull()) {
         warningPic.load(":/configgadget/images/error.svg");
diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.h b/ground/openpilotgcs/src/plugins/config/configoutputwidget.h
index c495bbd65..2478ca902 100644
--- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.h
@@ -57,7 +57,6 @@ private:
     Ui_OutputWidget *ui;
 
     QList<QSlider> sliders;
-    QPixmap warningPic;
     void updateChannelInSlider(QSlider *slider, QLabel *min, QLabel *max, QCheckBox *rev, int value);
 
     void assignOutputChannel(UAVDataObject *obj, QString &str);
@@ -72,7 +71,6 @@ private:
 
     UAVObject::Metadata accInitialData;
 
-    SystemAlarms *systemAlarmsObj;
 private slots:
     void updateWarnings(UAVObject *);
     void stopTests();