From b49e1e9d392fe98a72b0231b0a0fa7e440288904 Mon Sep 17 00:00:00 2001
From: tecnosapiens <jfroblesc@gmail.com>
Date: Fri, 10 Dec 2010 10:32:42 -0600
Subject: [PATCH] ready to merge new brach architecture

---
 src/ui/SlugsDataSensorView.cc | 14 ++++++++++++++
 src/ui/SlugsDataSensorView.h  | 34 +++++++++++++++++++++-------------
 src/ui/SlugsDataSensorView.ui | 18 +++++++++---------
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/ui/SlugsDataSensorView.cc b/src/ui/SlugsDataSensorView.cc
index 749f2bd19..f25a9acd7 100644
--- a/src/ui/SlugsDataSensorView.cc
+++ b/src/ui/SlugsDataSensorView.cc
@@ -53,6 +53,7 @@ void SlugsDataSensorView::addUAS(UASInterface* uas)
     connect(slugsMav, SIGNAL(slugsPWM(int,const mavlink_pwm_commands_t&)),this,SLOT(slugsPWMChanged(int,const mavlink_pwm_commands_t&)));
     connect(slugsMav, SIGNAL(slugsFilteredData(int,const mavlink_filtered_data_t&)),this,SLOT(slugsFilteredDataChanged(int,const mavlink_filtered_data_t&)));
     connect(slugsMav, SIGNAL(slugsGPSDateTime(int,const mavlink_gps_date_time_t&)),this,SLOT(slugsGPSDateTimeChanged(int,const mavlink_gps_date_time_t&)));
+    //connect(slugsMav,SIGNAL(slugsAirData(int,mavlink_air_data_t&)),this,SLOT())
 
     #endif // MAVLINK_ENABLED_SLUGS
         // Set this UAS as active if it is the first one
@@ -148,6 +149,7 @@ void SlugsDataSensorView::slugsSensorBiasChanged(int systemId,
 
 }
 
+
 void SlugsDataSensorView::slugsDiagnosticMessageChanged(int systemId,
                                                         const mavlink_diagnostic_t& diagnostic){
     Q_UNUSED(systemId);
@@ -240,6 +242,18 @@ void SlugsDataSensorView::slugsGPSDateTimeChanged(int systemId,
   ui->m_GpsSat->setText(QString::number(gpsDateTime.visSat));
 }
 
+/**
+     * @brief Updates the air data widget - 171
+*/
+void SlugsDataSensorView::slugsAirDataChanged(int systemId, const mavlink_air_data_t &airData)
+{
+     Q_UNUSED(systemId);
+
+     //ToDo add widget to view value
+
+
+}
+
 
 
 #endif // MAVLINK_ENABLED_SLUGS
diff --git a/src/ui/SlugsDataSensorView.h b/src/ui/SlugsDataSensorView.h
index ed0b9f07c..07bccc8e2 100644
--- a/src/ui/SlugsDataSensorView.h
+++ b/src/ui/SlugsDataSensorView.h
@@ -114,52 +114,60 @@ public slots:
                                     double lon,
                                     double alt,
                                     quint64 time);
+
+
+    /**
+         * @brief Updates the CPU load widget - 170
+    */
+    void slugsCpuLoadChanged(int systemId,
+                             const mavlink_cpu_load_t& cpuLoad);
+
     /**
-         * @brief Updates the sensor bias widget
+         * @brief Updates the air data widget - 171
+    */
+    void slugsAirDataChanged(int systemId,
+                             const mavlink_air_data_t& airData);
+
+    /**
+         * @brief Updates the sensor bias widget - 172
     */
     void slugsSensorBiasChanged(int systemId,
                                 const mavlink_sensor_bias_t& sensorBias);
 
     /**
-         * @brief Updates the diagnostic widget
+         * @brief Updates the diagnostic widget - 173
     */
     void slugsDiagnosticMessageChanged(int systemId,
                                        const mavlink_diagnostic_t& diagnostic);
 
-    /**
-         * @brief Updates the CPU load widget
-    */
-    void slugsCpuLoadChanged(int systemId,
-                             const mavlink_cpu_load_t& cpuLoad);
-
 
     /**
-         * @brief Updates the Navigation widget
+         * @brief Updates the Navigation widget - 176
     */
     void slugsNavegationChanged(int systemId,
                                 const mavlink_slugs_navigation_t& slugsNavigation);
 
     /**
-         * @brief Updates the Data Log widget
+         * @brief Updates the Data Log widget - 177
     */
    void  slugsDataLogChanged(int systemId,
                              const mavlink_data_log_t& dataLog);
 
    /**
-        * @brief Updates the PWM Commands widget
+        * @brief Updates the PWM Commands widget - 175
    */
    void slugsPWMChanged(int systemId,
                         const mavlink_pwm_commands_t& pwmCommands);
 
    /**
-        * @brief Updates the filtered sensor measurements widget
+        * @brief Updates the filtered sensor measurements widget - 178
    */
    void slugsFilteredDataChanged(int systemId,
                                  const mavlink_filtered_data_t& filteredData);
 
 
    /**
-        * @brief Updates the gps Date Time widget
+        * @brief Updates the gps Date Time widget - 179
    */
     void slugsGPSDateTimeChanged(int systemId,
                                  const mavlink_gps_date_time_t& gpsDateTime);
diff --git a/src/ui/SlugsDataSensorView.ui b/src/ui/SlugsDataSensorView.ui
index 4a6e2de6b..51459013e 100644
--- a/src/ui/SlugsDataSensorView.ui
+++ b/src/ui/SlugsDataSensorView.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>399</width>
-    <height>667</height>
+    <height>604</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -24,18 +24,18 @@
   </property>
   <property name="maximumSize">
    <size>
-    <width>16777215</width>
-    <height>16777215</height>
+    <width>399</width>
+    <height>604</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_17">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_23">
+   <item row="0" column="0">
     <widget class="QTabWidget" name="SlugsSensorView_tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -989,7 +989,7 @@
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>20</width>
-                  <height>13</height>
+                  <height>5</height>
                  </size>
                 </property>
                </spacer>
@@ -1791,8 +1791,8 @@
       <attribute name="title">
        <string>Tab 2</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_11">
-       <item>
+      <layout class="QGridLayout" name="gridLayout_22">
+       <item row="0" column="0">
         <layout class="QVBoxLayout" name="verticalLayout_8">
          <item>
           <widget class="QGroupBox" name="gpsData_groupBox">
-- 
2.22.0