Commit 45c48fa0 authored by dongfang's avatar dongfang

merge

parent d25d3be9
This diff is collapsed.
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
//#define PANELS_TEXT_SIZE 0.030 //#define PANELS_TEXT_SIZE 0.030
//#define COMPASS_SCALE_TEXT_SIZE 0.16 //#define COMPASS_SCALE_TEXT_SIZE 0.16
#define SMALL_TEXT_SIZE 0.028f #define SMALL_TEXT_SIZE 0.03f
#define MEDIUM_TEXT_SIZE (SMALL_TEXT_SIZE*1.2f) #define MEDIUM_TEXT_SIZE (SMALL_TEXT_SIZE*1.2f)
#define LARGE_TEXT_SIZE (MEDIUM_TEXT_SIZE*1.2f) #define LARGE_TEXT_SIZE (MEDIUM_TEXT_SIZE*1.2f)
...@@ -152,6 +152,8 @@ private: ...@@ -152,6 +152,8 @@ private:
void drawRollScale(QPainter& painter, QRectF area, bool drawTicks, bool drawNumbers); void drawRollScale(QPainter& painter, QRectF area, bool drawTicks, bool drawNumbers);
void drawAIAttitudeScales(QPainter& painter, QRectF area); void drawAIAttitudeScales(QPainter& painter, QRectF area);
void drawAICompassDisk(QPainter& painter, QRectF area); void drawAICompassDisk(QPainter& painter, QRectF area);
void drawSeparateCompassDisk(QPainter& painter, QRectF area);
void drawAltimeter(QPainter& painter, QRectF area, float altitude, float maxAltitude, float vv); void drawAltimeter(QPainter& painter, QRectF area, float altitude, float maxAltitude, float vv);
void fillInstrumentBackground(QPainter& painter, QRectF edge); void fillInstrumentBackground(QPainter& painter, QRectF edge);
......
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