rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

GCS/OPMap-make the waypoint numbers start with 1.

Browse Source 
This is only visual, internal implementation is still zero based
This commit is contained in:
PT_Dreamer 2012-07-06 21:57:43 +01:00
parent 96fb46b38d
commit 71a35b2dd8
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
View File

@ -322,7 +322,7 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
int oldnumber=number;
number=value;
RefreshToolTip();
numberI->setText(QString::number(number));
numberI->setText(QString::number(numberAdjusted()));
numberIBG->setRect(numberI->boundingRect().adjusted(-2,0,1,0));
this->update();
emit WPNumberChanged(oldnumber,value,this);
@ -363,7 +363,7 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
numberI->setPen(QPen(Qt::blue));
numberI->setPos(0,-13-picture.height());
numberIBG->setPos(0,-13-picture.height());
numberI->setText(QString::number(number));
numberI->setText(QString::number(numberAdjusted()));
numberIBG->setRect(numberI->boundingRect().adjusted(-2,0,1,0));
}
else if (!value && numberI)
@ -458,7 +458,7 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint):reached(fals
QString relativeCoord_str = " Distance:" + QString::number(relativeCoord.distance) + " Bearing:" + QString::number(relativeCoord.bearing*180/M_PI);
QString relativeAltitude_str=QString::number(relativeCoord.altitudeRelative);
if(Number()!=-1)
setToolTip(QString("WayPoint Number:%1\nDescription:%2\nCoordinate:%4\nFrom Home:%5\nRelative altitude:%6\nAltitude:%7\nType:%8\n%9").arg(QString::number(Number())).arg(description).arg(coord_str).arg(relativeCoord_str).arg(relativeAltitude_str).arg(QString::number(altitude)).arg(type_str).arg(myCustomString));
setToolTip(QString("WayPoint Number:%1\nDescription:%2\nCoordinate:%4\nFrom Home:%5\nRelative altitude:%6\nAltitude:%7\nType:%8\n%9").arg(QString::number(numberAdjusted())).arg(description).arg(coord_str).arg(relativeCoord_str).arg(relativeAltitude_str).arg(QString::number(altitude)).arg(type_str).arg(myCustomString));
else
setToolTip(QString("Magic WayPoint\nCoordinate:%1\nFrom Home:%2\nAltitude:%3\nType:%4\n%5").arg(coord_str).arg(relativeCoord_str).arg(QString::number(altitude)).arg(type_str).arg(myCustomString));
}

1
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
View File

@ -109,6 +109,7 @@ public:
*
*/
int Number(){return number;}
int numberAdjusted(){return number+1;}
/**
* @brief Sets WayPoint number
*

2
ground/openpilotgcs/src/plugins/opmap/flightdatamodel.cpp
View File

@ -250,7 +250,7 @@ QVariant flightDataModel::headerData(int section, Qt::Orientation orientation, i
{
if(orientation==Qt::Vertical)
{
return QString::number(section);
return QString::number(section+1);
}
else if (orientation == Qt::Horizontal) {
switch (section)

2
ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp
View File

@ -79,7 +79,7 @@ opmap_edit_waypoint_dialog::opmap_edit_waypoint_dialog(QWidget *parent,QAbstract
}
void opmap_edit_waypoint_dialog::currentIndexChanged(int index)
{
ui->lbNumber->setText(QString::number(index));
ui->lbNumber->setText(QString::number(index+1));
QModelIndex idx=mapper->model()->index(index,0);
if(index==itemSelection->currentIndex().row())
return;

2
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -636,7 +636,7 @@ void OPMapGadgetWidget::updateMousePos()
QString s = QString::number(m_mouse_lat_lon.Lat(), 'f', 7) + " " + QString::number(m_mouse_lat_lon.Lng(), 'f', 7);
if (wp)
{
s += " wp[" + QString::number(wp->Number()) + "]";
s += " wp[" + QString::number(wp->numberAdjusted()) + "]";
double dist = distance(home_lat_lon, wp->Coord());
double bear = bearing(home_lat_lon, wp->Coord());