Changeset 88 in flair-src for trunk/tools/FlairGCS

Timestamp:

Sep 28, 2016, 11:45:41 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/tools/FlairGCS

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/Layout.cpp (modified) (2 diffs)
• src/ListWidget.cpp (added)
• src/ListWidget.h (added)

trunk/tools/FlairGCS/CMakeLists.txt

@@ -3 +3 @@
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
 
-SET(PROJECT_SOURCE_FILES
-        src/Manager.cpp
-        src/ConnectionLayout.cpp
-        src/main.cpp
-        src/UdtSocket.cpp
-        src/DataPlot1D.cpp
-        src/DataPlot2D.cpp
-        src/RangeFinderPlot.cpp
-        src/Picture.cpp
-        src/DataRemote.cpp
-        src/file_ui.cpp
-        src/FormLayout.cpp
-        src/Vector3DSpinBox.cpp
-        src/DoubleSpinBox.cpp
-        src/SpinBox.cpp
-        src/CheckBox.cpp
-        src/ComboBox.cpp
-        src/Tab.cpp
-        src/TabWidget.cpp
-        src/GroupBox.cpp
-        src/GridLayout.cpp
-        src/Layout.cpp
-        src/PushButton.cpp
-        src/TextEdit.cpp
-        src/Label.cpp
-        src/Map.cpp
-        src/mapwidget.cpp
-        src/Landmark.cpp
-        src/XmlWidget.cpp
-)
+execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                OUTPUT_VARIABLE GCC_VERSION)
+
+if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
+        if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
+                ADD_DEFINITIONS("-std=c++11")
+        else()
+                ADD_DEFINITIONS("-std=c++0x")
+        endif()
+else()
+        message(STATUS "GCC version < 4.3, c+11 is not supported!")
+endif()
+
+FILE(GLOB PROJECT_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
 SET(FILES_TO_MOC
@@ -51 +35 @@
         src/XmlWidget.h
         src/ConnectionLayout.h
+        src/ListWidget.h
 )
 

trunk/tools/FlairGCS/src/Layout.cpp

@@ -22 +22 @@
 #include <QGeoCoordinate>
 #include <QGridLayout>
+#include "ListWidget.h"
+#include <QStringList>
 
 Layout::Layout(QWidget *parent, XmlWidget *xml, QString name, QString type)
@@ -248 +250 @@
     widget = new Label(this, row, col, name);
   }
+  if (type == "ListWidget") {
+    // 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);
+  }
 
   if (widget != NULL) {