fly/flightgear
1
0
Fork 0
Code Activity

GUI support for VIA/Discontinuity

Browse source
This commit is contained in:
James Turner 2015-11-22 15:14:13 +00:00
parent caead66ba6
commit 846fd21698
2 changed files with 56 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
src/GUI/WaypointList.cxx
View file

@ -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,59 @@ 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);
} else {
buffer[0] = 0;
void WaypointList::drawRowText(int x, int baseline, int rowIndex, const RoutePath& path)
{
flightgear::Waypt* wp(_model->waypointAt(rowIndex));
bool isDiscontinuity = (wp->type() == "discontinuity");
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());
}
} 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);
}
f->drawString(buffer, x, yy);
drawClippedString(legendFont, buffer, x, baseline, 300);
x += 300 + PUSTR_LGAP;
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);
}
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 +513,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);
}
}

1
src/GUI/WaypointList.hxx
View file

@ -95,6 +95,7 @@ protected:
private:
void drawRow(int dx, int dy, int rowIndex, int yOrigin, const RoutePath& path);
void drawRowText(int x, int baseline, int rowIndex, const RoutePath &path);
void handleDrag(int x, int y);
void doDrop(int x, int y);