rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge branch 'revo-next' into corvuscorax/airspeed_fixes

Browse Source
This commit is contained in:
Corvus Corax 2012-11-01 07:29:14 +01:00
commit e8c209145e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ void modelUavoProxy::modelToObjects()
index=myModel->index(x,flightDataModel::ALTITUDERELATIVE); index=myModel->index(x,flightDataModel::ALTITUDERELATIVE);
altitude=myModel->data(index).toFloat(); altitude=myModel->data(index).toFloat();
index=myModel->index(x,flightDataModel::VELOCITY); index=myModel->index(x,flightDataModel::VELOCITY);
waypoint.Velocity[0]=myModel->data(index).toFloat(); waypoint.Velocity=myModel->data(index).toFloat();
waypoint.Position[Waypoint::POSITION_NORTH]=distance*cos(bearing/180*M_PI); waypoint.Position[Waypoint::POSITION_NORTH]=distance*cos(bearing/180*M_PI);
waypoint.Position[Waypoint::POSITION_EAST]=distance*sin(bearing/180*M_PI); waypoint.Position[Waypoint::POSITION_EAST]=distance*sin(bearing/180*M_PI);

6
ground/openpilotgcs/src/plugins/opmap/opmap.pro
View File

@ -18,8 +18,11 @@ HEADERS += opmapplugin.h \
opmap_edit_waypoint_dialog.h \ opmap_edit_waypoint_dialog.h \
opmap_zoom_slider_widget.h \ opmap_zoom_slider_widget.h \
opmap_statusbar_widget.h \ opmap_statusbar_widget.h \
flightdatamodel.h \
modelmapproxy.h \ modelmapproxy.h \
widgetdelegates.h \ widgetdelegates.h \
pathplanner.h \
modeluavoproxy.h \
homeeditor.h homeeditor.h
SOURCES += opmapplugin.cpp \ SOURCES += opmapplugin.cpp \
@ -31,8 +34,11 @@ SOURCES += opmapplugin.cpp \
opmap_edit_waypoint_dialog.cpp \ opmap_edit_waypoint_dialog.cpp \
opmap_zoom_slider_widget.cpp \ opmap_zoom_slider_widget.cpp \
opmap_statusbar_widget.cpp \ opmap_statusbar_widget.cpp \
flightdatamodel.cpp \
modelmapproxy.cpp \ modelmapproxy.cpp \
widgetdelegates.cpp \ widgetdelegates.cpp \
pathplanner.cpp \
modeluavoproxy.cpp \
homeeditor.cpp homeeditor.cpp
OTHER_FILES += OPMapGadget.pluginspec OTHER_FILES += OPMapGadget.pluginspec