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

Timestamp:

04/11/16 12:30:54 (8 years ago)

Author:

Sanahuja Guillaume

Message:

passage lib qwtdataview

Location:

trunk/tools/FlairGCS

Files:

• CMakeLists.txt (modified) (5 diffs)
• src/DataPlot1D.h (modified) (1 diff)
• src/Scope.cpp (deleted)
• src/Scope.h (deleted)
• src/ScopeFixedStep.cpp (deleted)
• src/ScopeFixedStep.h (deleted)
• src/ScopeVariableStep.cpp (deleted)
• src/ScopeVariableStep.h (deleted)
• src/Scrollbar.cpp (deleted)
• src/Scrollbar.h (deleted)

trunk/tools/FlairGCS/CMakeLists.txt

@@ -8 +8 @@
         src/main.cpp
         src/UdtSocket.cpp
-        src/Scope.cpp
-        src/ScopeFixedStep.cpp
-        src/ScopeVariableStep.cpp
         src/DataPlot1D.cpp
         src/DataPlot2D.cpp
@@ -16 +13 @@
         src/Picture.cpp
         src/DataRemote.cpp
-        src/Scrollbar.cpp
         src/file_ui.cpp
         src/FormLayout.cpp
@@ -41 +37 @@
         src/UdtSocket.h
         src/RangeFinderPlot.h
-        src/Scope.h
         src/DataPlot2D.h
         src/Picture.h
-        src/Scrollbar.h
         src/Manager.h
         src/file_ui.h
@@ -80 +74 @@
         ${CMAKE_SYSROOT}/usr/include/udt
         ${CMAKE_SYSROOT}/usr/include/qwt
+        ${CMAKE_SYSROOT}/usr/include/QwtDataViewer
         ${CMAKE_SYSROOT}/usr/include/qt4/QtMobility
         ${CMAKE_SYSROOT}/usr/include/qt4/QtLocation
@@ -89 +84 @@
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${PROJECT_SOURCE_FILES} ${MOC_SOURCES} ${RCC_SOURCES})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${QT_LIBRARIES} qwt udt QtLocation FileLib z)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${QT_LIBRARIES} qwt QwtDataViewer udt QtLocation FileLib z)
 
 INSTALL(

trunk/tools/FlairGCS/src/DataPlot1D.h

@@ -6 +6 @@
 #define DATAPLOT1D_H_INCLUDED
 
-#include "ScopeFixedStep.h"
+#include <ScopeFixedStep.h>
 #include "DataRemote.h"