Merge branch 'feature-18' into develop

CMakeLists.txt

@@ -33,6 +33,10 @@ set(CAMITK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 include(camitk/packaging/CamiTKOpenSourcePackaging)
 camitk_opensource_packaging()
 
+# Nico : test C++11
+# Maybev not the best place to put it
+# set(CMAKE_CXX_FLAGS "-std=c++11")
+
 # Specific to SDK: first compile the SDK (it looks like a CEP but is sooooo special...)
 add_subdirectory(sdk)
 

modeling/components/mmlcomponent/MMLMonitorDisplays/Tabular.cpp

@@ -32,7 +32,7 @@
 #include <monitoringgui/MonitoringGuiManager.h>
 #include <monitoringgui/MonitoringDialog.h>
 
-#include <QheaderView>
+#include <QHeaderView>
 #include <QApplication>
 
 bool tabularRegistered=MMLMonitorDisplayFactory::getInstance()->registerClass<Tabular>("Tabular");

sdk/cmake/modules/CamiTKConfig.cmake.in

@@ -164,29 +164,22 @@ if(MSVC)
             debug qtpropertybrowser${CAMITK_DEBUG_POSTFIX}.lib optimized qtpropertybrowser
     )
 else()
-        # Name of the core library to link against
-        set(CAMITK_CORE_LIBRARIES ${CAMITK_CORE_LIB_NAME})
+      # Name of the core library to link against
+      set(CAMITK_CORE_LIBRARIES ${CAMITK_CORE_LIB_NAME})
+
+
 
 #     if(CMAKE_GENERATOR MATCHES "MinGW Makefiles") # Win32 running with MinGW
         # list of all core dependencies    
         set(CAMITK_LIBRARIES
-            vtkCommon
-            vtkFiltering
-            vtkGenericFiltering
-            vtkGraphics
-            vtkHybrid
-            vtkImaging
-            vtkIO
-            vtkRendering
-            vtkVolumeRendering
-            vtkftgl
-            vtkWidgets
-            vtkCharts
+            ${VTK_LIBRARIES}
             # QVTK
             qtpropertybrowser
         )
 endif()
 
+# message( WARNING "Nico VTK_LIBRARIES=${VTK_LIBRARIES}")
+
 mark_as_advanced (CAMITK_CORE_LIB CAMITK_LINK_DIRECTORIES CAMITK_INCLUDE_DIRECTORIES CAMITK_LIBRARIES)
 
 # additional unix system resources

sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake

@@ -215,7 +215,7 @@ macro(camitk_extension)
                 set(CAMITK_ITK_VERSION ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR})
                 message(STATUS "${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}: Found ITK version ${ITK_VERSION}")
                 
-                if ((${ITK_VERSION} VERSION_GREATER "4.8") AND (${ITK_VERSION} VERSION_LESS "5")) # ITK 4.9 on Windows, maybe a lesser version for Linux.
+                if ((${ITK_VERSION} VERSION_GREATER "4") AND (${ITK_VERSION} VERSION_LESS "5")) # ITK 4.9 on Windows, maybe a lesser version for Linux.
                     if(MSVC)
                         set(ITK_DIR ${ITK_DIR}/../..)
                         # Construct list of ITK libraries for linking
@@ -226,15 +226,22 @@ macro(camitk_extension)
                             endif()
                             set(CAMITK_ITK_LIBRARIES ${CAMITK_ITK_LIBRARIES} debug ${ITK_DIR}/${ITK_LIBRARY}-${CAMITK_ITK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${ITK_DIR}/${ITK_LIBRARY}-${CAMITK_ITK_VERSION}.lib)
                         endforeach()
-                    elseif(LINUX)
-                        message(WARNING "CamiTKExtension.cmake: ITK LIBRARY NOT SET FOR LINUX")
+                    elseif(UNIX)
+                        set(CAMITK_ITK_LIBRARIES ${ITK_LIBRARIES})
+#                        message(WARNING "Nico : ITK_LIBRARIES = ${ITK_LIBRARIES}")
                     elseif(APPLE)
                         message(WARNING "CamiTKExtension.cmake: ITK LIBRARY NOT SET FOR APPLE")
                     endif()
+                else()
+                    message(FATAL_ERROR "Wrong version of ITK : ${ITK_VERSION}. Required is at least 4.x to 4.9")
                 endif()
+            else()
+                message(FATAL_ERROR "ITK not found but required for ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}")
             endif()
         endif()
 
+
+
                 # # Now select the ITK libraries according to the ITK version found.
                 # # ITK 3.x.x (mostly 3.20.1)
                 # if ((${ITK_VERSION} VERSION_GREATER "3") AND (${ITK_VERSION} VERSION_LESS "4"))

sdk/components/stl/StlExtension.h

@@ -43,7 +43,7 @@ class StlExtension : public camitk::ComponentExtension {
 
 public:
     /// Constructor
-    StlExtension() : ComponentExtension() {};
+    StlExtension() : ComponentExtension() {}
 
     /// Method returning the component extension name
     virtual QString getName() const;
@@ -69,7 +69,7 @@ public:
 
 protected:
     /// Destructor
-    virtual ~StlExtension() {};
+    virtual ~StlExtension() {}
 
 };
 

sdk/libraries/core/component/Component.h

@@ -947,7 +947,7 @@ inline InterfaceFrame * Component::getFrame() {
 
 // -------------------- getPixmap ------------------
 inline QPixmap Component::getIcon() {
-    return NULL;
+    return QPixmap(0, 0); // this is a NULL QPixmap in the Qt sense. QPixmap::isNull will then return true;
 }
 
 // -------------------- inItalic --------------------

sdk/libraries/core/component/InterfaceNode.h

@@ -58,7 +58,7 @@ namespace camitk {
 class InterfaceNode {
 public:
     /// empty virtual destructor, to avoid memory leak
-    virtual ~InterfaceNode() {};
+    virtual ~InterfaceNode() {}
 
     /// get the name to be displayed
     virtual QString getName() const = 0;

sdk/libraries/core/component/mesh/MeshComponent.h

@@ -96,7 +96,7 @@ public:
     vtkIdType getPickedCellId();
 
     /// update property: no specific properties to manage, this is needed to avoid console warnings.
-    void updateProperty ( QString , QVariant ) {};
+    void updateProperty ( QString , QVariant ) {}
 
     /// there is more than one property widgets (to view as tabs in the property explorer)
     virtual unsigned int getNumberOfPropertyWidget();