Enforce a minimum pixel width for runway clicking

- ensures runways can be clicked when zoomed out.

diff --git a/src/GUI/AirportDiagram.cxx b/src/GUI/AirportDiagram.cxx
index 2d016b927e1438e9ec9f0ab1115dec21ac81ddd9..f5eaf7a073a8fbdec6154dd1c1a469eb1d3db984 100644 (file)
--- a/src/GUI/AirportDiagram.cxx
+++ b/src/GUI/AirportDiagram.cxx
@@ -80,6 +80,12 @@ static double distanceToLineSegment(const QVector2D& p, const QVector2D& a,
     return 0.0;
 }
 
+static double unitLengthAfterMapping(const QTransform& t)
+{
+    const QPointF tVec = t.map(QPointF(1.0, 0.0)) - t.map(QPointF(0.0, 0.0));
+    return QVector2D(tVec).length();
+}
+
 AirportDiagram::AirportDiagram(QWidget* pr) :
     BaseDiagram(pr),
     m_approachDistanceNm(-1.0),
@@ -335,6 +341,22 @@ void AirportDiagram::paintContents(QPainter* p)
         p->setTransform(t);
         paintAirplaneIcon(p, aircraftPos, headingDeg);
     }
+
+ #if 0
+    p->resetTransform();
+    QPen testPen(Qt::cyan);
+    testPen.setWidth(1);
+    testPen.setCosmetic(true);
+    p->setPen(testPen);
+    p->setBrush(Qt::NoBrush);
+
+    double minWidth = 8.0 * unitLengthAfterMapping(t.inverted());
+
+    Q_FOREACH(const RunwayData& r, m_runways) {
+        QPainterPath pp = pathForRunway(r, t, minWidth);
+        p->drawPath(pp);
+    } // of runways iteration
+#endif
 }
 
 void AirportDiagram::drawHelipads(QPainter* painter)
@@ -457,8 +479,10 @@ void AirportDiagram::mouseReleaseEvent(QMouseEvent* me)
     }
 
     QTransform t(transform());
+    double minWidth = 8.0 * unitLengthAfterMapping(t.inverted());
+
     Q_FOREACH(const RunwayData& r, m_runways) {
-        QPainterPath pp = pathForRunway(r, t);
+        QPainterPath pp = pathForRunway(r, t, minWidth);
         if (pp.contains(me->pos())) {
             // check which end was clicked
             QPointF p1(t.map(r.p1)), p2(t.map(r.p2));
@@ -491,10 +515,12 @@ void AirportDiagram::mouseReleaseEvent(QMouseEvent* me)
     }
 }
 
-QPainterPath AirportDiagram::pathForRunway(const RunwayData& r, const QTransform& t) const
+QPainterPath AirportDiagram::pathForRunway(const RunwayData& r, const QTransform& t,
+                                           const double minWidth) const
 {
     QPainterPath pp;
-    double halfWidth = r.widthM * 0.5;
+    double width = qMax(static_cast<double>(r.widthM), minWidth);
+    double halfWidth = width * 0.5;
     QVector2D v = QVector2D(r.p2 - r.p1);
     v.normalize();
     QVector2D halfVec = QVector2D(v.y(), -v.x()) * halfWidth;

diff --git a/src/GUI/AirportDiagram.hxx b/src/GUI/AirportDiagram.hxx
index 101da6258d7858e97a4fe841a65fbd12add9d9e5..43ffd7c4f17a7184a1688affbf51dd7e12695846 100644 (file)
--- a/src/GUI/AirportDiagram.hxx
+++ b/src/GUI/AirportDiagram.hxx
@@ -99,7 +99,7 @@ private:
 
     void drawHelipads(QPainter *painter);
 
-    QPainterPath pathForRunway(const RunwayData &r, const QTransform &t) const;
+    QPainterPath pathForRunway(const RunwayData &r, const QTransform &t, const double minWidth) const;
     QPainterPath pathForHelipad(const HelipadData &h, const QTransform &t) const;
     QPainterPath pathForParking(const ParkingData &p, const QTransform &t) const;