Commit 84badf33 authored by dongfang's avatar dongfang

PFD crash on start bugfix and rename to .cc

parent e0d9b8fb
...@@ -568,7 +568,7 @@ SOURCES += src/main.cc \ ...@@ -568,7 +568,7 @@ SOURCES += src/main.cc \
src/ui/designer/QGCRadioChannelDisplay.cpp \ src/ui/designer/QGCRadioChannelDisplay.cpp \
src/ui/QGCTabbedInfoView.cpp \ src/ui/QGCTabbedInfoView.cpp \
src/ui/UASRawStatusView.cpp \ src/ui/UASRawStatusView.cpp \
src/ui/PrimaryFlightDisplay.cpp \ src/ui/PrimaryFlightDisplay.cc \
src/ui/uas/QGCMessageView.cc src/ui/uas/QGCMessageView.cc
# Enable Google Earth only on Mac OS and Windows with Visual Studio compiler # Enable Google Earth only on Mac OS and Windows with Visual Studio compiler
......
...@@ -63,6 +63,7 @@ signals: ...@@ -63,6 +63,7 @@ signals:
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
private: private:
/*
enum AltimeterMode { enum AltimeterMode {
PRIMARY_MAIN_GPS_SUB, // Show the primary alt. on tape and GPS as extra info 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 GPS_MAIN // Show GPS on tape and no extra info
...@@ -77,6 +78,7 @@ private: ...@@ -77,6 +78,7 @@ private:
PRIMARY_MAIN_GROUND_SUB,// Show primary speed (often airspeed) on tape and groundspeed as extra 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 GROUND_MAIN // Show groundspeed on tape and no extra info
}; };
*/
/* /*
* There are at least these differences between airplane and copter PDF view: * There are at least these differences between airplane and copter PDF view:
...@@ -115,9 +117,11 @@ private: ...@@ -115,9 +117,11 @@ private:
UASInterface* uas; ///< The uas currently monitored UASInterface* uas; ///< The uas currently monitored
/*
AltimeterMode altimeterMode; AltimeterMode altimeterMode;
AltimeterFrame altimeterFrame; AltimeterFrame altimeterFrame;
SpeedMode speedMode; SpeedMode speedMode;
*/
bool didReceivePrimaryAltitude; bool didReceivePrimaryAltitude;
bool didReceivePrimarySpeed; bool didReceivePrimarySpeed;
...@@ -144,9 +148,9 @@ private: ...@@ -144,9 +148,9 @@ private:
float navigationTargetBearing; float navigationTargetBearing;
Layout layout; // The display layout. 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 redColor;
QColor amberColor; QColor amberColor;
QColor greenColor; QColor greenColor;
...@@ -154,7 +158,7 @@ private: ...@@ -154,7 +158,7 @@ private:
qreal lineWidth; qreal lineWidth;
qreal fineLineWidth; qreal fineLineWidth;
qreal smallTestSize; qreal smallTextSize;
qreal mediumTextSize; qreal mediumTextSize;
qreal largeTextSize; qreal largeTextSize;
...@@ -170,13 +174,7 @@ private: ...@@ -170,13 +174,7 @@ private:
static const int tickValues[]; static const int tickValues[];
static const QString compassWindNames[]; static const QString compassWindNames[];
static const int updateInterval = 40; static const int updateInterval = 40;
signals:
public slots:
}; };
#endif // PRIMARYFLIGHTDISPLAY_H #endif // PRIMARYFLIGHTDISPLAY_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment