Changeset 54 in flair-src for branches/mavlink

Timestamp:

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

Author:

Thomas Fuhrmann

Message:

Default xml configuration is working with ListWidget

Location:

branches/mavlink/tools/FlairGCS/src

Files:

• Layout.cpp (modified) (2 diffs)
• ListWidget.cpp (modified) (4 diffs)
• ListWidget.h (modified) (2 diffs)

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

@@ -23 +23 @@
 #include <QGridLayout>
 #include "ListWidget.h"
+#include <QStringList>
 
 Layout::Layout(QWidget *parent, XmlWidget *xml, QString name, QString type)
@@ -250 +251 @@
   }
   if (type == "ListWidget") {
-    widget = new ListWidget(this, row, col, name);
+    // Parse the item list    
+    QStringList items;
+    int count = 0;
+    while (dom.hasAttribute("item" + QString::number(count))) {
+      QString item = dom.attribute("item" + QString::number(count));
+      items.append(item);
+      count++;
+    }
+    widget = new ListWidget(this, row, col, name, items);
   }
 

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

@@ -14 +14 @@
     : FormLayout(parent, row, col, name, "ListWidget") {
   listwidget = new QListWidget();
-  // listwidget->setCurrentIndex(value);
-
-  // combobox_value = value;
-
-  // object_layout->addRow(name, listwidget);
   object_layout->addRow(new QLabel(name));
   object_layout->addRow(listwidget);
+  // to avoid duplicates when adding items 
+  SetIsExpandable(true);
+}
 
-  // connect(listwidget, SIGNAL(currentIndexChanged(int)), this,
-  //         SLOT(valuechanged(int)));
-
-  // SetValue(QString::number(combobox_value));
-
-  // pour ne pas faire de doublons qd on ajoute des items
-  SetIsExpandable(true);
+ListWidget::ListWidget(Layout *parent, int row, int col, QString name, QStringList& items)
+    : ListWidget(parent, row, col, name) {
+  if (!items.isEmpty()) {
+    listwidget->addItems(items);
+  }
 }
 
@@ -41 +37 @@
     QListWidgetItem* current_item = listwidget->currentItem();
     listwidget->removeItemWidget(current_item);
-    if (current_item) { delete current_item; }
+    if (current_item) {
+      delete current_item; 
+    }
   }
 }
@@ -48 +46 @@
   // ui_to_var();
   // ui_to_xml();
+  std::cout << "SetUptodate" << std::endl;
   visible_widget->setPalette(black_pal);
 }
@@ -62 +61 @@
 
 void ListWidget::LoadEvent(QDomElement dom) {
-  if (listwidget->isEnabled() == true) {
+  std::cout << "In LoadEvent" << std::endl;
+  // Parse the item list    
+  QStringList items;
+  int count = 0;
+  while (dom.hasAttribute("item" + QString::number(count))) {
+    QString item = dom.attribute("item" + QString::number(count));
+    std::cout << "Item" << count << " : " << item.toStdString() << std::endl;
+    items.append(item);
+    count++;
+  }
+
+  listwidget->addItems(items);
+
+  // if (listwidget->isEnabled() == true) {
     // listwidget->setCurrentIndex((dom.attribute("value")).toInt());
-  }
+  // }
 }
 

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

@@ -10 +10 @@
 class QListWidget;
 class Layout;
+class QStringList;
 
 class ListWidget : public FormLayout {
@@ -16 +17 @@
 public:
   ListWidget(Layout *parent, int row, int col, QString name);
+  ListWidget(Layout *parent, int row, int col, QString name, QStringList& items);
   ~ListWidget();