From 06e56165c518bbdef1ac21063aa7b80a27d236f1 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Tue, 30 Oct 2012 13:48:02 +0000 Subject: [PATCH 1/3] GCS-PathPlanner Fixes loading path from file. --- .../openpilotgcs/src/plugins/opmap/flightdatamodel.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/opmap/flightdatamodel.cpp b/ground/openpilotgcs/src/plugins/opmap/flightdatamodel.cpp index 5a7b3d1ce..4ca229866 100644 --- a/ground/openpilotgcs/src/plugins/opmap/flightdatamodel.cpp +++ b/ground/openpilotgcs/src/plugins/opmap/flightdatamodel.cpp @@ -565,11 +565,14 @@ void flightDataModel::readFromFile(QString fileName) //TODO warning message removeRows(0,rowCount()); QFile file(fileName); + file.open(QIODevice::ReadOnly); QDomDocument doc("PathPlan"); - if (!doc.setContent(file.readAll())) { + QByteArray array=file.readAll(); + QString error; + if (!doc.setContent(array,&error)) { QMessageBox msgBox; msgBox.setText(tr("File Parsing Failed.")); - msgBox.setInformativeText(tr("This file is not a correct XML file")); + msgBox.setInformativeText(QString(tr("This file is not a correct XML file:%0")).arg(error)); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.exec(); return; @@ -616,7 +619,7 @@ void flightDataModel::readFromFile(QString fileName) else if(field.attribute("name")=="altitude") data->altitude=field.attribute("value").toDouble(); else if(field.attribute("name")=="velocity") - data->velocity=field.attribute("value").toDouble(); + data->velocity=field.attribute("value").toFloat(); else if(field.attribute("name")=="mode") data->mode=field.attribute("value").toInt(); else if(field.attribute("name")=="mode_param0") From a01930b12f1dde8a2abaa71c9ea355714889a39d Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Tue, 30 Oct 2012 15:13:52 +0000 Subject: [PATCH 2/3] GCS-PathPlanner Fixes UAVO to DataModel convertion. --- ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp b/ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp index d11ee753b..192f5b932 100644 --- a/ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp +++ b/ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp @@ -143,7 +143,8 @@ void modelUavoProxy::objectsToModel() myModel->setData(index,wpfields.Velocity); distance=sqrt(wpfields.Position[Waypoint::POSITION_NORTH]*wpfields.Position[Waypoint::POSITION_NORTH]+ wpfields.Position[Waypoint::POSITION_EAST]*wpfields.Position[Waypoint::POSITION_EAST]); - bearing=acos(wpfields.Position[Waypoint::POSITION_NORTH]/wpfields.Position[Waypoint::POSITION_EAST])*180/M_PI; + bearing=atan2(wpfields.Position[Waypoint::POSITION_EAST],wpfields.Position[Waypoint::POSITION_NORTH])*180/M_PI; + if(bearing!=bearing) bearing=0; index=myModel->index(x,flightDataModel::DISRELATIVE); From 949b17baae74cd5c3045077ec912d657cbeb149f Mon Sep 17 00:00:00 2001 From: Sambas Date: Wed, 31 Oct 2012 21:15:39 +0200 Subject: [PATCH 3/3] this made GCS tx rate go over 3000 --- shared/uavobjectdefinition/groundtruth.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/uavobjectdefinition/groundtruth.xml b/shared/uavobjectdefinition/groundtruth.xml index 975436f84..7a2f1a102 100644 --- a/shared/uavobjectdefinition/groundtruth.xml +++ b/shared/uavobjectdefinition/groundtruth.xml @@ -11,7 +11,7 @@ - +