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

Timestamp:

07/29/16 15:02:35 (8 years ago)

Author:

Thomas Fuhrmann

Message:

Improve ListWidget + code cleanup + doxygen comments

File:

• branches/mavlink/lib/FlairCore/src/ListWidget.cpp (modified) (5 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;
   }
 }