Changeset 53 in flair-src for branches/mavlink/lib

Timestamp:

Jul 27, 2016, 5:42:27 PM (8 years ago)

Author:

Thomas Fuhrmann

Message:

Default xml configuration is working with ListWidget

Location:

branches/mavlink/lib/FlairCore/src

Files:

• ListWidget.cpp (modified) (3 diffs)
• ListWidget.h (modified) (1 diff)
• Widget.cpp (modified) (2 diffs)

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

@@ -19 +19 @@
 #include "LayoutPosition.h"
 
+#include <sstream>
+#include <iostream>
+
 using std::string;
+using std::ostringstream;
 
 namespace flair {
@@ -26 +30 @@
 ListWidget::ListWidget(const LayoutPosition *position, string name)
     : Widget(position->getLayout(), name, string("ListWidget")) {
-  
+  size_t count = 0;
+  while (1) {
+    string item;
+    ostringstream item_prop;
+    item_prop << "item" << count;
+    if(GetPersistentXmlProp(item_prop.str(), item)) {
+      SetVolatileXmlProp(item_prop.str(), item);
+      items.push_back(item);
+    } else {
+      break;
+    }
+    count++;
+  }
   // value_changed = true;
   SetVolatileXmlProp("row", position->Row());
@@ -47 +63 @@
 
 void ListWidget::XmlEvent(void) {
+  std::cout << "FlairCore ListWidget XmlEvent" << std::endl;
   // GetMutex();
   // if (GetPersistentXmlProp("value", box_value))

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

@@ -68 +68 @@
   */
   void XmlEvent(void);
+
+  //store the items
+  std::vector<std::string> items;
 };
 

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

@@ -19 +19 @@
 #include "Widget_impl.h"
 
+//to delete, for test purpose
+#include <iostream>
+
 using std::string;
 
@@ -82 +85 @@
   if (GetPersistentXmlProp<double>(prop, tmp)) {
     value = tmp;
+    return true;
+  } else {
+    return false;
+  }
+}
+
+template <>
+bool Widget::GetPersistentXmlProp(std::string prop, std::string &value) {
+  xmlChar *result = NULL;
+  result = xmlGetProp(pimpl_->file_node, (xmlChar *)prop.c_str());
+  if (result != NULL) {
+    value = std::string((char*)result);
+    xmlFree(result);
     return true;
   } else {