COMP: Wrap the charts and transfer function work between CTK_USE_CHARTS to

support older VTK versions.

Libs/Visualization/VTK/Widgets/CMakeLists.txt

@@ -25,8 +25,6 @@ SET(KIT_SRCS
   ctkVTKAbstractMatrixWidget.cpp
   ctkVTKAbstractMatrixWidget.h
   ctkVTKAbstractMatrixWidget_p.h
-  ctkVTKChartView.cpp
-  ctkVTKChartView.h
   ctkVTKMatrixWidget.cpp
   ctkVTKMatrixWidget.h
   ctkVTKRenderView.cpp
@@ -34,10 +32,6 @@ SET(KIT_SRCS
   ctkVTKRenderView_p.h
   ctkVTKScalarBarWidget.cpp
   ctkVTKScalarBarWidget.h
-  ctkVTKScalarsToColorsView.cpp
-  ctkVTKScalarsToColorsView.h
-  ctkVTKScalarsToColorsWidget.cpp
-  ctkVTKScalarsToColorsWidget.h
   ctkVTKSliceView.cpp
   ctkVTKSliceView.h
   ctkVTKSliceView_p.h
@@ -48,13 +42,10 @@ SET(KIT_SRCS
 # Headers that should run through moc
 SET(KIT_MOC_SRCS
   ctkVTKAbstractMatrixWidget_p.h
-  ctkVTKChartView.h
   ctkVTKMatrixWidget.h
   ctkVTKRenderView.h
   ctkVTKRenderView_p.h
   ctkVTKScalarBarWidget.h
-  ctkVTKScalarsToColorsView.h
-  ctkVTKScalarsToColorsWidget.h
   ctkVTKSliceView.h
   ctkVTKSliceView_p.h
   ctkVTKTextPropertyWidget.h
@@ -63,7 +54,6 @@ SET(KIT_MOC_SRCS
 # UI files
 SET(KIT_UI_FORMS
   Resources/UI/ctkVTKScalarBarWidget.ui
-  Resources/UI/ctkVTKScalarsToColorsWidget.ui
   Resources/UI/ctkVTKTextPropertyWidget.ui
 )
 
@@ -75,9 +65,35 @@ SET(KIT_resources
 # Set VTK_LIBRARIES variable
 SET(VTK_LIBRARIES
   QVTK
-  vtkCharts
   )
 
+IF(VTK_VERSION VERSION_GREATER 5.7)
+  SET(CTK_USE_CHARTS 1)
+ENDIF(VTK_VERSION VERSION_GREATER 5.7)
+
+IF (${CTK_USE_CHARTS})
+  SET(KIT_SRCS
+      ctkVTKChartView.cpp
+      ctkVTKChartView.h
+      ctkVTKScalarsToColorsView.cpp
+      ctkVTKScalarsToColorsView.h
+      ctkVTKScalarsToColorsWidget.cpp
+      ctkVTKScalarsToColorsWidget.h
+      ${KIT_SRCS})
+  SET(KIT_MOC_SRCS 
+      ctkVTKChartView.h
+      ctkVTKScalarsToColorsView.h
+      ctkVTKScalarsToColorsWidget.h
+      ${KIT_MOC_SRCS})
+  SET(KIT_UI_FORMS
+      Resources/UI/ctkVTKScalarsToColorsWidget.ui 
+      ${KIT_UI_FORMS})
+  SET(VTK_LIBRARIES
+      vtkCharts
+      ${VTK_LIBRARIES})
+  ADD_DEFINITIONS(-DCTK_USE_CHARTS)
+ENDIF(${CTK_USE_CHARTS})
+
 # Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)

Libs/Visualization/VTK/Widgets/Plugins/CMakeLists.txt

@@ -17,8 +17,6 @@ SET(PLUGIN_SRCS
   ctkVTKRenderViewPlugin.h
   ctkVTKScalarBarWidgetPlugin.cpp
   ctkVTKScalarBarWidgetPlugin.h
-  ctkVTKScalarsToColorsViewPlugin.cpp
-  ctkVTKScalarsToColorsViewPlugin.h
   ctkVTKSliceViewPlugin.cpp
   ctkVTKSliceViewPlugin.h
   ctkVTKTextPropertyWidgetPlugin.cpp
@@ -31,10 +29,19 @@ SET(PLUGIN_MOC_SRCS
 
   ctkVTKRenderViewPlugin.h
   ctkVTKScalarBarWidgetPlugin.h
-  ctkVTKScalarsToColorsViewPlugin.h
   ctkVTKSliceViewPlugin.h
   ctkVTKTextPropertyWidgetPlugin.h
   )
+  
+IF(CTK_USE_CHARTS)
+  SET(PLUGIN_SRCS
+      ctkVTKScalarsToColorsViewPlugin.cpp
+      ctkVTKScalarsToColorsViewPlugin.h
+      ${PLUGIN_SRCS})
+  SET(PLUGIN_MOC_SRCS
+      ctkVTKScalarsToColorsViewPlugin.h
+      ${PLUGIN_MOC_SRCS})
+ENDIF(CTK_USE_CHARTS)
 
 # Resources
 SET(PLUGIN_resources

Libs/Visualization/VTK/Widgets/Plugins/ctkVTKWidgetsPlugins.h

@@ -28,7 +28,9 @@
 #include "CTKVisualizationVTKWidgetsPluginsExport.h"
 #include "ctkVTKRenderViewPlugin.h"
 #include "ctkVTKScalarBarWidgetPlugin.h"
+#ifdef CTK_USE_CHARTS
 #include "ctkVTKScalarsToColorsViewPlugin.h"
+#endif
 #include "ctkVTKSliceViewPlugin.h"
 #include "ctkVTKTextPropertyWidgetPlugin.h"
 
@@ -46,7 +48,9 @@ public:
     QList<QDesignerCustomWidgetInterface *> plugins;
     plugins << new ctkVTKRenderViewPlugin;
     plugins << new ctkVTKScalarBarWidgetPlugin;
+#ifdef CTK_USE_CHARTS
     plugins << new ctkVTKScalarsToColorsViewPlugin;
+#endif
     plugins << new ctkVTKSliceViewPlugin;
     plugins << new ctkVTKTextPropertyWidgetPlugin;
     return plugins;

Libs/Visualization/VTK/Widgets/Testing/Cpp/CMakeLists.txt

@@ -10,14 +10,19 @@ SET(TEST_SOURCES
   ctkTransferFunctionViewTest3.cpp
   ctkTransferFunctionViewTest4.cpp
   ctkTransferFunctionViewTest5.cpp
-  ctkVTKChartViewTest1.cpp
-  ctkVTKScalarsToColorsViewTest1.cpp
-  ctkVTKScalarsToColorsViewTest2.cpp
-  ctkVTKScalarsToColorsViewTest3.cpp
-  ctkVTKScalarsToColorsViewTest4.cpp
-  ctkVTKScalarsToColorsWidgetTest1.cpp
   )
 
+IF(CTK_USE_CHARTS)
+  SET(TEST_SOURCES
+      ctkVTKChartViewTest1.cpp
+      ctkVTKScalarsToColorsViewTest1.cpp
+      ctkVTKScalarsToColorsViewTest2.cpp
+      ctkVTKScalarsToColorsViewTest3.cpp
+      ctkVTKScalarsToColorsViewTest4.cpp
+      ctkVTKScalarsToColorsWidgetTest1.cpp
+      ${TEST_SOURCES})
+ENDIF(CTK_USE_CHARTS)
+
 #
 # Tests expecting CTKData to be set
 #
@@ -39,7 +44,7 @@ REMOVE (TestsToRun ${KIT}CppTests.cpp)
 SET(LIBRARY_NAME ${PROJECT_NAME})
 
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
+TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} vtkCharts ${CTK_BASE_LIBRARIES})
 
 SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 
@@ -58,12 +63,14 @@ SIMPLE_TEST( ctkTransferFunctionViewTest2 )
 SIMPLE_TEST( ctkTransferFunctionViewTest3 )
 SIMPLE_TEST( ctkTransferFunctionViewTest4 )
 SIMPLE_TEST( ctkTransferFunctionViewTest5 )
-SIMPLE_TEST( ctkVTKChartViewTest1 )
-SIMPLE_TEST( ctkVTKScalarsToColorsViewTest1 )
-SIMPLE_TEST( ctkVTKScalarsToColorsViewTest2 )
-SIMPLE_TEST( ctkVTKScalarsToColorsViewTest3 )
-SIMPLE_TEST( ctkVTKScalarsToColorsViewTest4 )
-SIMPLE_TEST( ctkVTKScalarsToColorsWidgetTest1 )
+IF (CTK_USE_CHARTS)
+  SIMPLE_TEST( ctkVTKChartViewTest1 )
+  SIMPLE_TEST( ctkVTKScalarsToColorsViewTest1 )
+  SIMPLE_TEST( ctkVTKScalarsToColorsViewTest2 )
+  SIMPLE_TEST( ctkVTKScalarsToColorsViewTest3 )
+  SIMPLE_TEST( ctkVTKScalarsToColorsViewTest4 )
+  SIMPLE_TEST( ctkVTKScalarsToColorsWidgetTest1 )
+ENDIF(CTK_USE_CHARTS)
 
 #
 # Add Tests expecting CTKData to be set