Move airplane drawing into the base class.

- ground work for showing airplane on airport diagram

diff --git a/src/GUI/AirportDiagram.cxx b/src/GUI/AirportDiagram.cxx
index 449957dfd9879982c726429c42684f2c9346c219..2fd2ce7e950644d40c80874690ff8a42bce067f4 100644 (file)
--- a/src/GUI/AirportDiagram.cxx
+++ b/src/GUI/AirportDiagram.cxx
@@ -267,6 +267,10 @@ void AirportDiagram::paintContents(QPainter* p)
         p->setPen(pen);
         p->drawLine(pt, pt2);
     }
+
+
+  // aircraft pos and heading...
+ //   paintAirplaneIcon(painter, );
 }
 
 void AirportDiagram::drawILS(QPainter* painter, FGRunwayRef runway) const

diff --git a/src/GUI/BaseDiagram.cxx b/src/GUI/BaseDiagram.cxx
index bced50f42ceeda67d5fbe662a27eec17b49a0d9a..4c301a20ed86151d54d42e00faa8f1857e32568e 100644 (file)
--- a/src/GUI/BaseDiagram.cxx
+++ b/src/GUI/BaseDiagram.cxx
@@ -115,6 +115,21 @@ void BaseDiagram::paintEvent(QPaintEvent* pe)
     paintContents(&p);
 }
 
+void BaseDiagram::paintAirplaneIcon(QPainter* painter, const SGGeod& geod, int headingDeg)
+{
+    QPointF pos = project(geod);
+    QPixmap pix(":/airplane-icon");
+    pos = painter->transform().map(pos);
+    painter->resetTransform();
+    painter->translate(pos.x(), pos.y());
+    painter->rotate(headingDeg);
+
+    painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
+    QRect airplaneIconRect = pix.rect();
+    airplaneIconRect.moveCenter(QPoint(0,0));
+    painter->drawPixmap(airplaneIconRect, pix);
+}
+
 class MapFilter : public FGPositioned::TypeFilter
 {
 public:

diff --git a/src/GUI/BaseDiagram.hxx b/src/GUI/BaseDiagram.hxx
index 9c82d21abecf7dc50bfbcb73879249cb9e17352a..5bbd4bf83cce2f38c86e8bdcdf8dcd90d4830434 100644 (file)
--- a/src/GUI/BaseDiagram.hxx
+++ b/src/GUI/BaseDiagram.hxx
@@ -76,6 +76,8 @@ protected:
     static QPointF project(const SGGeod &geod, const SGGeod &center);
 
     static SGGeod unproject(const QPointF &xy, const SGGeod &center);
+
+    void paintAirplaneIcon(QPainter *painter, const SGGeod &geod, int headingDeg);
 private:
     void paintNavaids(QPainter *p);
 

diff --git a/src/GUI/NavaidDiagram.cxx b/src/GUI/NavaidDiagram.cxx
index 29857991e5cbd47b396d153574c8febe24b4887b..a621ebd05bf2b5049a5bbf92e74c76055084ff33 100644 (file)
--- a/src/GUI/NavaidDiagram.cxx
+++ b/src/GUI/NavaidDiagram.cxx
@@ -83,8 +83,7 @@ void NavaidDiagram::paintContents(QPainter *painter)
 {
     QPointF base = project(m_geod);
 
-    QPointF airplaneIconPos = base;
-
+    SGGeod aircraftPos = m_geod;
     if (m_offsetEnabled) {
         double d = m_offsetDistanceNm * SG_NM_TO_METER;
         SGGeod offsetGeod = SGGeodesy::direct(m_geod, m_offsetBearingDeg, d);
@@ -95,19 +94,10 @@ void NavaidDiagram::paintContents(QPainter *painter)
         painter->setPen(pen);
         painter->drawLine(base, offset);
 
-        airplaneIconPos = offset;
+        aircraftPos = offsetGeod;
     }
 
-    QPixmap pix(":/airplane-icon");
-    airplaneIconPos = painter->transform().map(airplaneIconPos);
-    painter->resetTransform();
-    painter->translate(airplaneIconPos.x(), airplaneIconPos.y());
-    painter->rotate(m_headingDeg);
-
-    painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
-    QRect airplaneIconRect = pix.rect();
-    airplaneIconRect.moveCenter(QPoint(0,0));
-    painter->drawPixmap(airplaneIconRect, pix);
+    paintAirplaneIcon(painter, aircraftPos, m_headingDeg);
 }
 
 void NavaidDiagram::doComputeBounds()