Changeset 64 in flair-src for branches/mavlink/tools

Timestamp:

08/23/16 13:55:03 (8 years ago)

Author:

Thomas Fuhrmann

Message:

Save config on target and save all locally are now working

Location:

branches/mavlink/tools/FlairGCS/src

Files:

• ListWidget.cpp (modified) (5 diffs)
• ListWidget.h (modified) (1 diff)

branches/mavlink/tools/FlairGCS/src/ListWidget.cpp

@@ -12 +12 @@
 #include <sstream>
 
-// #include <iostream>
+//to remove, for tests only
+#include <iostream>
 
 ListWidget::ListWidget(Layout *parent, int row, int col, QString name)
@@ -55 +56 @@
   if (dom.attribute("delete") != "") {
     int row_to_del = dom.attribute("delete").toInt();
+    RemoveItemFromXml(row_to_del);
     QListWidgetItem *item_to_del = listwidget->takeItem(row_to_del);
     if (item_to_del) {
@@ -88 +90 @@
 void ListWidget::Reset(void) {
   if (currentItemRow != -1) {
+    // TODO recharger l'élément supprimé si non appliqué ou recharger la variable
     listwidget->setCurrentRow(currentItemRow);
   }
@@ -94 +97 @@
 void ListWidget::LoadEvent(QDomElement dom) {
   //function not tested
-  // std::cout << "FlairGCS LoadEvent" << std::endl;
+  std::cout << "FlairGCS LoadEvent" << std::endl;
   if (listwidget->isEnabled() == true) {
-    // std::cout << "FlairGCS LoadEvent loading" << std::endl;
+    std::cout << "FlairGCS LoadEvent loading" << std::endl;
     listwidget->clear();
     QStringList items;
     int count = 0;
     while (dom.hasAttribute("item" + QString::number(count))) {
+      std::cout << "FlairGCS LoadEvent boucle" << std::endl;
       listwidget->addItem(dom.attribute("item" + QString::number(count)));
       count++;
@@ -117 +121 @@
 
 bool ListWidget::IsUptodate(void) { return isUpToDate; }
+
+void ListWidget::RemoveItemFromXml(int row_to_del) {
+  // Shift the elements in the XML file to have the one to delete at the end
+  std::ostringstream item_prop;
+  for (int count = row_to_del; count < listwidget->count() - 1; count++) {
+    item_prop << "item" << count;
+    SetAttribute(QString::fromStdString(item_prop.str()),
+                 listwidget->item(count + 1)->text());
+    // Clear the value of the stringstream
+    item_prop.str(std::string());  
+  }
+  // Delete the last element from the XML file
+  item_prop << "item" << (listwidget->count() - 1);
+  RemoveAttribute(QString::fromStdString(item_prop.str()));
+}

branches/mavlink/tools/FlairGCS/src/ListWidget.h

@@ -92 +92 @@
   void ui_to_xml(void);
   /**
+   * \brief      Removes the row_to_del element from the internal xml file.
+   * 
+   * As the order of the elements is important, all the elements after the one
+   * deleted are shifted to occupy the blank space.
+   *
+   * \param[in]  row_to_del  The row of the element to delete.
+   */
+  void RemoveItemFromXml(int row_to_del);
+  /**
    * Pointer to the managed QListWidget widget.
    */