Changeset 63 in flair-src for branches/mavlink

Timestamp:

Aug 23, 2016, 12:10:01 PM (8 years ago)

Author:

Thomas Fuhrmann

Message:

Save config on target and save all locally are now working

Location:

branches/mavlink/lib/FlairCore/src

Files:

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

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

@@ -59 +59 @@
 void ListWidget::RemoveItem(void) {
   if (selectedItemChanged) {
+    // Delete the the last item, the xml file will automatically be updated by the GUI
+    // TODO diff when the apply all xml file is received to avoid clear here
+    std::ostringstream item_prop;
+    item_prop << "item" << (items.size() - 1);
+    UnsetPersistentXmlProp(item_prop.str());
+    // Delete the item from the internal list and ask the GUI to delete it
     selectedItemChanged = false;
     items.erase(items.cbegin() + selectedItemRow);

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

@@ -62 +62 @@
   *
   * Remove the currently selected item.
+  * The item is not removed from the internal xml file,
+  * because the xml is override by the GUI.
   */
   void RemoveItem(void);

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

@@ -20 +20 @@
 
 using std::string;
+
+//remove, for tests
+#include <iostream>
 
 namespace flair {
@@ -221 +224 @@
 }
 
+template <> void Widget::SetPersistentXmlProp(std::string prop, std::string value) {
+  SetVolatileXmlProp(prop, value);
+  SetVolatileXmlProp(prop, value, pimpl_->file_node);
+}
+
+void Widget::UnsetPersistentXmlProp(std::string prop) {
+  xmlNodePtr Node = pimpl_->file_node;
+
+  for(xmlAttrPtr attr = Node->properties; NULL != attr; attr = attr->next)
+  {
+      std::cout << attr->name << std::endl;
+  }
+
+  int ret = xmlUnsetProp(pimpl_->file_node, (xmlChar *)prop.c_str());
+  std::cout << "UnsetPersistentXmlProp, item= " << prop << "result = " << ret << std::endl;
+
+  for(xmlAttrPtr attr = Node->properties; NULL != attr; attr = attr->next)
+  {
+      std::cout << attr->name << std::endl;
+  }
+}
+
 void Widget::SendXml(void) { pimpl_->SendXml(); }
 

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

@@ -143 +143 @@
   virtual void XmlEvent(void){};
 
+  /*!
+   * \brief Unset a persistent xml property
+   * 
+   * Unset an existent property, so it won't be saved.
+   *
+   * \param prop property to set
+   */
+  void UnsetPersistentXmlProp(std::string prop);
+
 private:
   class Widget_impl *pimpl_;