Launcher: Maintain aircraft selection better

[flightgear.git] / src / GUI / WaypointList.cxx

diff --git a/src/GUI/WaypointList.cxx b/src/GUI/WaypointList.cxx
index 68ba544bd978ad4a67e8f13f44a2f60f7317d919..5b010f0d2690a7e6a9b14fce8dc0df9149b6510a 100644 (file)
--- a/src/GUI/WaypointList.cxx
+++ b/src/GUI/WaypointList.cxx
@@ -270,7 +270,7 @@ void WaypointList::handleDrag(int x, int y)
     
     _dragSourceRow = rowForY(y - abox.min[1]);
     Waypt* wp = _model->waypointAt(_dragSourceRow);
-    if (!wp || wp->flag(WPT_GENERATED)) {
+    if (!wp || wp->flag(WPT_GENERATED) || (wp->type() == "discontinuity")) {
       return; // don't allow generated points to be dragged
     }
     
@@ -409,7 +409,7 @@ void WaypointList::drawRow(int dx, int dy, int rowIndex, int y,
   bool isSelected = (rowIndex == getSelected());
   bool isCurrent = (rowIndex == _model->currentWaypoint());
   bool isDragSource = (_dragging && (rowIndex == _dragSourceRow));
-  
+
   puBox bkgBox = abox;
   bkgBox.min[1] = abox.max[1] - y;
   bkgBox.max[1] = bkgBox.min[1] + rowHeightPx();
@@ -453,43 +453,69 @@ void WaypointList::drawRow(int dx, int dy, int rowIndex, int y,
   
   int x = xx;
   x += _arrowWidth + PUSTR_LGAP;
-  
-  // row textual data
+    drawRowText(x, yy, rowIndex, path);
 
-  char buffer[128];
-  int count = ::snprintf(buffer, 128, "%03d   %-5s", rowIndex, wp->ident().c_str());
- 
-  FGPositioned* src = wp->source(); 
-  if (src && !src->name().empty() && (src->name() != wp->ident())) { 
-    // append name if present, and different to id
-    ::snprintf(buffer + count, 128 - count, " (%s)", src->name().c_str());
+
+  if (isDragSource) {
+    puSetColor(col, 1.0, 0.5, 0.0, 0.5);
+    bkgBox.draw(dx, dy, PUSTYLE_PLAIN, &col, false, 0);
   }
+}
 
-  drawClippedString(legendFont, buffer, x, yy, 300);
-  x += 300 + PUSTR_LGAP;
-  
-  if (_showLatLon) {
-    // only show for non-dynamic waypoints
-    if (!wp->flag(WPT_DYNAMIC)) {
-      SGGeod p(wp->position());
-      char ns = (p.getLatitudeDeg() > 0.0) ? 'N' : 'S';
-      char ew = (p.getLongitudeDeg() > 0.0) ? 'E' : 'W';
-      
-      ::snprintf(buffer, 128 - count, "%4.2f%c %4.2f%c",
-        fabs(p.getLongitudeDeg()), ew, fabs(p.getLatitudeDeg()), ns);
+void WaypointList::drawRowText(int x, int baseline, int rowIndex, const RoutePath& path)
+{
+    flightgear::Waypt* wp(_model->waypointAt(rowIndex));
+    const bool isDiscontinuity = (wp->type() == "discontinuity");
+    const bool isVia = (wp->type() == "via");
+
+    char buffer[128];
+    int count;
+
+    if (isVia) {
+        // VIA has long ident but no name
+        count = ::snprintf(buffer, 128, "%03d   %s", rowIndex, wp->ident().c_str());
+        drawClippedString(legendFont, buffer, x, baseline, 300);
+        x += 300 + PUSTR_LGAP;
     } else {
-      buffer[0] = 0;
-    }
-  } else if (rowIndex > 0) {
-    double courseDeg = path.trackForIndex(rowIndex);
-    double distanceM = path.distanceForIndex(rowIndex);
-    ::snprintf(buffer, 128 - count, "%03.0f %5.1fnm",
-      courseDeg, distanceM * SG_METER_TO_NM);
-  }
+        count = ::snprintf(buffer, 128, "%03d   %-5s", rowIndex, wp->ident().c_str());
+
+        FGPositioned* src = wp->source();
+        if (src && !src->name().empty() && (src->name() != wp->ident())) {
+          // append name if present, and different to id
+          ::snprintf(buffer + count, 128 - count, " (%s)", src->name().c_str());
+        }
+
+        drawClippedString(legendFont, buffer, x, baseline, 300);
+        x += 300 + PUSTR_LGAP;
 
-  f->drawString(buffer, x, yy);
+        if (isDiscontinuity) {
+            return;
+        }
+
+        if (_showLatLon) {
+          // only show for non-dynamic waypoints
+          if (!wp->flag(WPT_DYNAMIC)) {
+            SGGeod p(wp->position());
+            char ns = (p.getLatitudeDeg() > 0.0) ? 'N' : 'S';
+            char ew = (p.getLongitudeDeg() > 0.0) ? 'E' : 'W';
+
+            ::snprintf(buffer, 128 - count, "%4.2f%c %4.2f%c",
+              fabs(p.getLongitudeDeg()), ew, fabs(p.getLatitudeDeg()), ns);
+          } else {
+            buffer[0] = 0;
+          }
+        } else if (rowIndex > 0) {
+          double courseDeg = path.trackForIndex(rowIndex);
+          double distanceM = path.distanceForIndex(rowIndex);
+          ::snprintf(buffer, 128 - count, "%03.0f %5.1fnm",
+            courseDeg, distanceM * SG_METER_TO_NM);
+        }
+    } // of is not a VIA waypoint
+
+    puFont* f = &legendFont;
+  f->drawString(buffer, x, baseline);
   x += 100 + PUSTR_LGAP;
-  
+
   if (wp->altitudeRestriction() != RESTRICT_NONE) {
     char aboveAtBelow = ' ';
     if (wp->altitudeRestriction() == RESTRICT_ABOVE) {
@@ -497,29 +523,24 @@ void WaypointList::drawRow(int dx, int dy, int rowIndex, int y,
     } else if (wp->altitudeRestriction() == RESTRICT_BELOW) {
       aboveAtBelow = 'B';
     }
-    
+
     int altHundredFt = (wp->altitudeFt() + 50) / 100; // round to nearest 100ft
     if (altHundredFt < 100) {
       count = ::snprintf(buffer, 128, "%d'%c", altHundredFt * 100, aboveAtBelow);
     } else { // display as a flight-level
       count = ::snprintf(buffer, 128, "FL%d%c", altHundredFt, aboveAtBelow);
     }
-    
-    f->drawString(buffer, x, yy);
+
+    f->drawString(buffer, x, baseline);
   } // of valid wp altitude
   x += 60 + PUSTR_LGAP;
-  
+
   if (wp->speedRestriction() == SPEED_RESTRICT_MACH) {
     count = ::snprintf(buffer, 126, "%03.2fM", wp->speedMach());
-    f->drawString(buffer, x, yy);
+    f->drawString(buffer, x, baseline);
   } else if (wp->speedRestriction() != RESTRICT_NONE) {
     count = ::snprintf(buffer, 126, "%dKts", (int) wp->speedKts());
-    f->drawString(buffer, x, yy);
-  }
-  
-  if (isDragSource) {
-    puSetColor(col, 1.0, 0.5, 0.0, 0.5);
-    bkgBox.draw(dx, dy, PUSTYLE_PLAIN, &col, false, 0);
+    f->drawString(buffer, x, baseline);
   }
 }