Changeset 81 in flair-src for branches/mavlink/tools/Controller/Mavlink/src/GuiInterface.cpp

Timestamp:

09/21/16 15:07:48 (8 years ago)

Author:

Thomas Fuhrmann

Message:

Add lat, lon and alt fields + adapt processing of MissionSend

File:

• branches/mavlink/tools/Controller/Mavlink/src/GuiInterface.cpp (modified) (2 diffs)

branches/mavlink/tools/Controller/Mavlink/src/GuiInterface.cpp

@@ -74 +74 @@
   // comboCmd->AddItem("RETURN");
   // comboCmd->AddItem("JUMP");
-  param1Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param1",
-                                -90, 90, 0.5, 1, 3);
-  param2Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param2",
-                                -90, 90, 0.5, 1, 3);
-  param3Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param3",
-                                -90, 90, 0.5, 1, 3);
+  param1Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param1", -90, 90, 0.5, 1, 0);
+  latitudeField = new DoubleSpinBox(addCmdGroupBox->LastRowLastCol(), "Longitude", -90, 90, 0.5, 1, 1.5);
+  param2Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param2", -90, 90, 0.5, 1, 0);
+  longitudeField = new DoubleSpinBox(addCmdGroupBox->LastRowLastCol(), "Latitude", -90, 90, 0.5, 1, -1.5);
+  param3Field = new DoubleSpinBox(addCmdGroupBox->NewRow(), "Param3", -90, 90, 0.5, 1, 0);
+  altitudeField = new DoubleSpinBox(addCmdGroupBox->LastRowLastCol(), "Altitude", -90, 90, 0.5, 1, 2);
   btnAddMissionCmd = new PushButton(addCmdGroupBox->NewRow(), "Add mission cmd");
   btnDelMissionCmd = new PushButton(addCmdGroupBox->LastRowLastCol(), "Del mission cmd");
@@ -145 +145 @@
   stringStream.precision(1);
   stringStream << fixed;
-  stringStream << commandsAvailable[comboCmd->CurrentIndex()] << "|" << param1Field->Value() << "|" << param2Field->Value() << "|" << param3Field->Value();
+  stringStream << commandsAvailable[comboCmd->CurrentIndex()] << "|" << param1Field->Value() << "|" << param2Field->Value() \
+               << "|" << param3Field->Value() << "|" << latitudeField->Value() << "|" << longitudeField->Value() << "|" << altitudeField->Value();
   return stringStream.str();
 }