Merge pull request #301 from dongfang/master

Bugfix (missing updates): PrimaryFlightDisplay now connecting to UASCreated and UASDeleted signals.

qgroundcontrol.pro

@@ -571,7 +571,7 @@ SOURCES += src/main.cc \
     src/ui/designer/QGCRadioChannelDisplay.cpp \
     src/ui/QGCTabbedInfoView.cpp \
     src/ui/UASRawStatusView.cpp \
-    src/ui/PrimaryFlightDisplay.cpp \
+    src/ui/PrimaryFlightDisplay.cc \
     src/ui/uas/QGCMessageView.cc \
     src/ui/JoystickButton.cc \
     src/ui/JoystickAxis.cc

src/ui/PrimaryFlightDisplay.h

@@ -26,7 +26,9 @@ public slots:
     void updateNavigationControllerErrors(UASInterface* uas, double altitudeError, double speedError, double xtrackError);
 
     /** @brief Set the currently monitored UAS */
-    virtual void setActiveUAS(UASInterface* uas);
+    void addUAS(UASInterface* uas);
+    //void forgetUAS(UASInterface* uas);
+    void setActiveUAS(UASInterface* uas);
 
 protected:
     enum Layout {
@@ -63,6 +65,7 @@ signals:
     void visibilityChanged(bool visible);
 
 private:
+    /*
     enum AltimeterMode {
         PRIMARY_MAIN_GPS_SUB,   // Show the primary alt. on tape and GPS as extra info
         GPS_MAIN                // Show GPS on tape and no extra info
@@ -77,6 +80,7 @@ private:
         PRIMARY_MAIN_GROUND_SUB,// Show primary speed (often airspeed) on tape and groundspeed as extra
         GROUND_MAIN             // Show groundspeed on tape and no extra info
     };
+    */
 
     /*
      * There are at least these differences between airplane and copter PDF view:
@@ -115,9 +119,11 @@ private:
 
     UASInterface* uas;          ///< The uas currently monitored
 
+    /*
     AltimeterMode altimeterMode;
     AltimeterFrame altimeterFrame;
     SpeedMode speedMode;
+    */
 
     bool didReceivePrimaryAltitude;
     bool didReceivePrimarySpeed;
@@ -144,9 +150,9 @@ private:
     float navigationTargetBearing;
 
     Layout layout;      // The display layout.
-    Style style;        // The AI style (tapes translusent or opague)
-
+    Style style;        // The AI style (tapes translucent or opague)
 
+    // TODO: Use stylesheet colors?
     QColor redColor;
     QColor amberColor;
     QColor greenColor;
@@ -154,7 +160,7 @@ private:
     qreal lineWidth;
     qreal fineLineWidth;
 
-    qreal smallTestSize;
+    qreal smallTextSize;
     qreal mediumTextSize;
     qreal largeTextSize;
 
@@ -170,13 +176,7 @@ private:
     static const int tickValues[];
     static const QString compassWindNames[];
 
-    static const int updateInterval = 40;
-
-
-signals:
-    
-public slots:
-    
+    static const int updateInterval = 40;   
 };
 
 #endif // PRIMARYFLIGHTDISPLAY_H