Changeset 59 in flair-src for branches/mavlink/lib/FlairCore/src

Timestamp:

Jul 29, 2016, 3:02:35 PM (8 years ago)

Author:

Thomas Fuhrmann

Message:

Improve ListWidget + code cleanup + doxygen comments

Location:

branches/mavlink/lib/FlairCore/src

Files:

• ListWidget.cpp (modified) (5 diffs)
• ListWidget.h (modified) (2 diffs)
• Widget.cpp (modified) (2 diffs)

branches/mavlink/lib/FlairCore/src/ListWidget.cpp

@@ -20 +20 @@
 
 #include <sstream>
-#include <iostream>
 
 using std::string;
-using std::ostringstream;
 
 namespace flair {
@@ -29 +27 @@
 
 ListWidget::ListWidget(const LayoutPosition *position, string name)
-    : Widget(position->getLayout(), name, string("ListWidget")) {
-  
-  selected_item_row = -1;
-  selected_item_changed = false;
-
+    : Widget(position->getLayout(), name, string("ListWidget")),
+    selectedItemRow(-1), selectedItemChanged(false) {
+  // load the items in the xml file and send them to the ground station
   size_t count = 0;
   while (1) {
     string item;
-    ostringstream item_prop;
+    std::ostringstream item_prop;
     item_prop << "item" << count;
-    if(GetPersistentXmlProp(item_prop.str(), item)) {
+    if (GetPersistentXmlProp(item_prop.str(), item)) {
       SetVolatileXmlProp(item_prop.str(), item);
       items.push_back(item);
@@ -47 +43 @@
     count++;
   }
-
   SetVolatileXmlProp("row", position->Row());
   SetVolatileXmlProp("col", position->Col());
@@ -63 +58 @@
 
 void ListWidget::RemoveItem(void) {
-  if (selected_item_changed) {
-    selected_item_changed = false;
-    SetVolatileXmlProp("delete", selected_item_row);
+  if (selectedItemChanged) {
+    selectedItemChanged = false;
+    items.erase(items.cbegin() + selectedItemRow);
+    SetVolatileXmlProp("delete", selectedItemRow);
     SendXml();
   }
@@ -71 +67 @@
 
 void ListWidget::XmlEvent(void) {
-  if (GetPersistentXmlProp("value", selected_item_row)) {
-    selected_item_changed = true;
+  if (GetPersistentXmlProp("value", selectedItemRow)) {
+    selectedItemChanged = true;
   }
 }

branches/mavlink/lib/FlairCore/src/ListWidget.h

@@ -22 +22 @@
 
 /*! \class ListWidget
-*
-* \brief Class displaying a QListWidget on the ground station
-*
-*/
+ *
+ * \brief Class displaying a QListWidget on the ground station
+ *  
+ *  The internal list (called items) contains the same elements
+ *  as the list of the QListWidget on the ground station.
+ *  To do that, each action done on the ground station has to
+ *  applied thanks to a click on the "apply" button.
+ *
+ */
 class ListWidget : public Widget {
 public:
@@ -69 +74 @@
   void XmlEvent(void);
 
-  //store the items
+  /**
+   * List of items displayed in the ground station.
+   */
   std::vector<std::string> items;
-  //selected item row, starting from 0
-  uint16_t selected_item_row;
-  bool selected_item_changed;
+  /**
+   * Row of the item currently selected in the list.
+   */
+  uint16_t selectedItemRow;
+  /**
+   * Flag to know if the selected item has changed.
+   */
+  bool selectedItemChanged;
 };
 

branches/mavlink/lib/FlairCore/src/Widget.cpp

@@ -19 +19 @@
 #include "Widget_impl.h"
 
-//to delete, for test purpose
-#include <iostream>
-
 using std::string;
 
@@ -96 +93 @@
   result = xmlGetProp(pimpl_->file_node, (xmlChar *)prop.c_str());
   if (result != NULL) {
-    value = std::string((char*)result);
+    value = std::string((char *)result);
     xmlFree(result);
     return true;