#3487 vtk9itk5wx3-macos

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eac5f282c504850feced026fb19d6eef03412ca..9177c10c91ce467604e7e0d4c44fda0fc0cca64a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,14 +147,11 @@ INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/gtk-2.0/include/)
 LINK_DIRECTORIES(/usr/lib/x86_64-linux-gnu/)
 #JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere
 
-
-
 ADD_SUBDIRECTORY(install)
 ADD_SUBDIRECTORY(lib)
 ADD_SUBDIRECTORY(bbtk)
 ADD_SUBDIRECTORY(appli)
 
-
 SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/data)
 FILE(GLOB CONFIGURE_DATA_FILES *.*)
 IF(WIN32)

diff --git a/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt b/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt
index ba4ce00b3882eb162cca189e269d71ba0e1a28cf..34db748b99cc00619bea69bc7a5e81869132bd41 100644 (file)
--- a/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt
+++ b/lib/GUI/Base/SurfaceRenderer/CMakeLists.txt
@@ -79,7 +79,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #    ${crea_LIBRARIES}
       ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
-  #    ${VTK_LIBRARIES}
+      ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}
   #    ${GDCM_LIBRARIES}
   #    ${BOOST_LIBRARIES}  
@@ -101,6 +101,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/creaMaracasVisu)
   SET(${LIBRARY_NAME}_INSTALL_FOLDER creaMaracasVisu)
   CREA_ADD_LIBRARY( ${LIBRARY_NAME} )
+  
   #SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES LINKER_LANGUAGE C)
 
   # and uncomment the 2 lines hereafter:

diff --git a/lib/GUI/Base/SurfaceRenderer/wxMaracasSurfaceRenderingManager.h b/lib/GUI/Base/SurfaceRenderer/wxMaracasSurfaceRenderingManager.h
index a5f3d6a48291c0d856e0341f4f04205eee661ec5..34f0b736d5b0aea176c05038befcaf3c7bdfe0b3 100644 (file)
--- a/lib/GUI/Base/SurfaceRenderer/wxMaracasSurfaceRenderingManager.h
+++ b/lib/GUI/Base/SurfaceRenderer/wxMaracasSurfaceRenderingManager.h
@@ -48,7 +48,9 @@
 
 #include <iostream>
 #include <vector>
-#include <vtkMatrix4x4.h>
+
+//EED 2022-07-21
+//#include <vtkMatrix4x4.h>
 
 #include "wxMaracasSurfaceRenderingManagerData.h"
 

diff --git a/lib/GUI/Base/VolumeRenderer/CMakeLists.txt b/lib/GUI/Base/VolumeRenderer/CMakeLists.txt
index e7ef3a6664805f20d965bd84d7fe672674953b7c..7e735a878f22b38063b4c40f5e5186d980710c8b 100644 (file)
--- a/lib/GUI/Base/VolumeRenderer/CMakeLists.txt
+++ b/lib/GUI/Base/VolumeRenderer/CMakeLists.txt
@@ -79,7 +79,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #    ${crea_LIBRARIES}
   #    ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
-  #    ${VTK_LIBRARIES}
+      ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}
   #    ${GDCM_LIBRARIES}
   #    ${BOOST_LIBRARIES}  

diff --git a/lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt b/lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt
index 3b92f7350009866a89d4e77ec89c2af39bbf2d5b..37f0219a15d1a27c6a805a1c30e717c45f0f1e74 100644 (file)
--- a/lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt
+++ b/lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt
@@ -80,7 +80,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #    ${crea_LIBRARIES}
       ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
-  #    ${VTK_LIBRARIES}
+      ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}
   #    ${GDCM_LIBRARIES}
   #    ${BOOST_LIBRARIES}  

diff --git a/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.h b/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.h
index e76e665f4df57b9ce3a90b6e8d3b085c3f75c819..e101c44a6af8fbdf2aa824c5e185d18d8e6f8124 100644 (file)
--- a/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.h
+++ b/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.h
@@ -48,7 +48,9 @@
 #include "wx/aui/aui.h"
 #include <iostream>
 #include "marTypes.h"
-#include "vtkProp3D.h"
+
+//EED 2022-07-21
+//#include "vtkProp3D.h"
 
 #include "wxMaracasSurfaceRenderingManager.h"
 #include "wxMaracasSurfaceRenderingPanel.h"

diff --git a/lib/GUI/Wx/VolumeRenderer/CMakeLists.txt b/lib/GUI/Wx/VolumeRenderer/CMakeLists.txt
index 81a6639c0f48fbfbba461ace8de0e81f7ae6427b..4f0350c6c598949610fd2b3b065458034127905e 100644 (file)
--- a/lib/GUI/Wx/VolumeRenderer/CMakeLists.txt
+++ b/lib/GUI/Wx/VolumeRenderer/CMakeLists.txt
@@ -79,7 +79,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #    ${crea_LIBRARIES}
       ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
-  #    ${VTK_LIBRARIES}
+      ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}
   #    ${GDCM_LIBRARIES}
   #    ${BOOST_LIBRARIES}  

diff --git a/lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt b/lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt
index 9866ea17098d481d9a663a7dfd2646275f5d3ab7..58e48f434d471c8c6cc0cf7e6acae5a578494680 100644 (file)
--- a/lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt
+++ b/lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt
@@ -64,6 +64,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 
   FILE(GLOB ${LIBRARY_NAME}_SOURCES *.cxx *.cpp *.cc )
 
+
   set(${LIBRARY_NAME}_SOURCES ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})
 
         #SET(qtproject_UIS
@@ -106,8 +107,8 @@ IF ( BUILD_${LIBRARY_NAME} )
   SET ( ${LIBRARY_NAME}_LINK_LIBRARIES
   #    ${crea_LIBRARIES}
       ${WXWIDGETS_LIBRARIES}
-  #    ${KWWidgets_LIBRARIES}
       ${VTK_LIBRARIES}
+  #    ${KWWidgets_LIBRARIES}
 ##EED-creaMaracasVisu-SHARED      creaMaracasVisu
       #${ITK_LIBRARIES}
   #    ${GDCM_LIBRARIES}
@@ -127,10 +128,23 @@ IF ( BUILD_${LIBRARY_NAME} )
   # if you need to create a static library
   # comment out the following line :
 
+
+#   ADD_LIBRARY(ups  wxMaracasSurfaceRenderingManagerData.cxx ) 
+# target_link_libraries( ups ${VTK_LIBRARIES} )
+# vtk_module_autoinit(
+#     TARGETS ups 
+#    MODULES ${VTK_LIBRARIES}
+#   )
+
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/creaMaracasVisu)
   SET(${LIBRARY_NAME}_INSTALL_FOLDER creaMaracasVisu)
-  CREA_ADD_LIBRARY( ${LIBRARY_NAME})
-SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES LINKER_LANGUAGE C)
+  CREA_ADD_LIBRARY( ${LIBRARY_NAME})  
+  SET_TARGET_PROPERTIES(${LIBRARY_NAME}  PROPERTIES LINKER_LANGUAGE C)
+ vtk_module_autoinit(
+     TARGETS ${LIBRARY_NAME} 
+    MODULES ${VTK_LIBRARIES}
+   )
+
 
   # and uncomment the 2 lines hereafter:
 

diff --git a/lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h b/lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h
index 249c000f4c6000c0075338b99cd2c12704ef9adc..341167a99497091491813f52487a4c2a2783807d 100644 (file)
--- a/lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h
+++ b/lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h
@@ -26,6 +26,7 @@
 #ifndef SURFACERENDERINGIMAGESTENCILEXPORT_H
 #define SURFACERENDERINGIMAGESTENCILEXPORT_H
 
+#include <vtkVersionMacros.h>
 #include "vtkObjectFactory.h"
 
 //EED 2017-01-01 Migration VTK7

diff --git a/lib/Kernel/VTKObjects/SurfaceRenderer/wxMaracasSurfaceRenderingManagerData.h b/lib/Kernel/VTKObjects/SurfaceRenderer/wxMaracasSurfaceRenderingManagerData.h
index 0026f6a0a1753104d54dea4e2179265c4088b344..72a6312fae512db0f3b2f820d6d80617cb0b3feb 100644 (file)
--- a/lib/Kernel/VTKObjects/SurfaceRenderer/wxMaracasSurfaceRenderingManagerData.h
+++ b/lib/Kernel/VTKObjects/SurfaceRenderer/wxMaracasSurfaceRenderingManagerData.h
@@ -26,7 +26,7 @@
 #ifndef WXMARACASSURFACERENDERINGMANAGERDATA_H_
 #define WXMARACASSURFACERENDERINGMANAGERDATA_H_
 
-#include "vtkProp3D.h"
+#include <vtkProp3D.h>
 #include "vtkRenderer.h"
 #include "vtkSTLReader.h"
 #include "vtkPolyDataMapper.h"

diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h
index bcf6ea25b89d1677a8da10bf8779e0cfb3525f02..c4a8c2b2d0d756f68433d78c51e319993c222700 100644 (file)
--- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h
+++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h
@@ -26,6 +26,8 @@
 #ifndef VolumeRendererManagerData_H_
 #define VolumeRendererManagerData_H_
 
+
+#include "vtkVersion.h"
 #include "vtkCommand.h"
 
 #if (VTK_MAJOR_VERSION <= 7) 

diff --git a/lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.h b/lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.h
index 18600cf6eabd7ce54bebaf7741efeff858c69ff5..e783cf06c2aba902e842f22505f4eaa4e90a7337 100644 (file)
--- a/lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.h
+++ b/lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.h
@@ -48,6 +48,7 @@
 #ifndef __vtkInteractorStyleCutter_h
 #define __vtkInteractorStyleCutter_h
 
+#include <vtkVersionMacros.h>
 #include <vtkInteractorStyle.h>
 
 class vtkPoints;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
index 349c1790fdf8de30f0fd14acb5b8daba50a7843b..bad68610aa810be829c0e39976308bb041acf16b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
@@ -30,6 +30,7 @@
 #include "marTypes.h"
 //------------------------------------------------------------------
 
+#include <vtkVersionMacros.h>
 #include "vtkInteractorStyleBaseView.h"
 
 //class vtkInteractorStyleBaseView;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h
index 21d8338973775204c94fae6f46791a107e7305ff..e7c264e076a8fb40949d3e22866fca43b96df6b3 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h
@@ -26,6 +26,7 @@
 #ifndef BOXSURFACEOBSERVER_H_
 #define BOXSURFACEOBSERVER_H_
 
+#include <vtkVersionMacros.h>
 #include "vtkPlanes.h"
 #include "vtkProp.h"
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx
index 9b34a13cc52904945809895d44f08cd23ad9a20a..db0d87830ab5a52afca47a06ed7835ac75ad16c2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx
@@ -25,6 +25,7 @@
 
 
 #include "figureCuttingCylinderModel.h"
+#include <math.h>
 
 figureCuttingCylinderModel::figureCuttingCylinderModel()
 {

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx
index fcca477e4a9fe5b868addd3cf0d7c445d7c1a621..4e47ce5f12b9a881101b8b5d7c3824b62b3c4e38 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx
@@ -24,6 +24,7 @@
 # ------------------------------------------------------------------------ */
 
 #include "figureCuttingSphereModel.h"
+#include <math.h>
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.h
index 8002f5f15cfb1c9a2ebb0f13bcb5c6c318d07e58..24a3e8eacdc726c1e1bd809a0d897eb4c67a391a 100755 (executable)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.h
@@ -37,6 +37,7 @@
 #include <iostream>
 #include <string>
 #include <cstdio>
+#include <vtkVersionMacros.h>
 #include <vtkImageData.h>
 #include <vtkMetaImageWriter.h>
 #include <vtkMetaImageReader.h>

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/vtkInteractorStyleCutter.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/vtkInteractorStyleCutter.h
index d66fffdee420503b457127fbc41ea968b0943319..386768af57fc34a72f486dc25de175b989c452ec 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/vtkInteractorStyleCutter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/vtkInteractorStyleCutter.h
@@ -48,6 +48,7 @@
 #ifndef __vtkInteractorStyleCutter_h
 #define __vtkInteractorStyleCutter_h
 
+#include <vtkVersionMacros.h>
 #include <vtkInteractorStyle.h>
 
 class vtkPoints;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
index 35efd9f6c39085c221bb136e58e0d6003940ec45..6b046cc172b06dfb3fba814b1c9fa5316555adda 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
@@ -26,6 +26,7 @@
 #ifndef _BASE_FILTER_MANUAL_PAINT_H_
 #define _BASE_FILTER_MANUAL_PAINT_H_
 
+#include <vtkVersionMacros.h>
 #include <vtkImageData.h>
 
 //#include "regionStructUR.h"

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
index c3ba219648c39cef58f1e74017e7de8897724d79..74ceddb1e6104259bcb9feea333650711c98fdf3 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
@@ -44,7 +44,8 @@
  // Includes
  //----------------------
  #include "HistogramWidget.h"
- #include "vtkImageData.h"     
+ #include <vtkVersionMacros.h>
+ #include "vtkImageData.h"
  //#include <vector>
  #include <vtkPiecewiseFunction.h>
  #include <vtkColorTransferFunction.h>

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h
index 0eb2cb343f23bb24a76c5e5f779acd1564b68eda..56759dc294cb47dccca0a90071d71238d7689f95 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h
@@ -45,6 +45,7 @@
 
 #include <wx/bmpcbox.h>
 #include <wx/checkbox.h>
+
 #include "vtkImageData.h"
 
 #define COLORSFUNCTIONFILENAME "colorsfunction.txt"

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
index 63b3cc9ed2a27dfb796d24b2c8a75c8e0166684a..1067a9ffb0d364802d3f5743083f7264f6f00215 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
@@ -72,7 +72,7 @@ pGraphicalFunction:: pGraphicalFunction(wxString name, int flags)
        offsetPixelX            = 0;
        offsetPixelY            = 0;
        xTraslation                     = 0;
-       mType                           = DEFAULT;
+       mType                           = DEFAULT_EED;
        
 }
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
index 227df55d84157c3888ed06e13d2e0c7d7fe64f1f..9ae7c022643cf523b4a7a5f42982d28d8fd54706 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
@@ -77,7 +77,7 @@
  Lets to the user to plot any number of the
  functions
 */
-#define DEFAULT 1
+#define DEFAULT_EED 1
 /*
  Dont let draw on the plotter, but lets to edit
  the functions that are editables in the plotter

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.h
index a57b4ddfcca5884f84e91702d41fdbff1fd831c7..bbb8b2872ce61cb4440f1cab89a4a76d67479c5c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.h
@@ -49,6 +49,7 @@
 // VTK
 //---------------------
 
+#include <vtkVersionMacros.h>
 #include "vtkImageData.h"
 #include "vtkMetaImageReader.h"
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h
index 37f8cde17c26cc5223262a826a6cebee59cb1d6b..1d16dee3ddf72896a68ec20d67f7303a3d4bb651 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h
@@ -55,6 +55,7 @@
 #ifndef __vtkClosePolyData_h
 #define __vtkClosePolyData_h
 
+#include <vtkVersionMacros.h>
 #include "vtkObjectFactory.h"
 
 //EED 2017-01-01 Migration VTK7

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx
index 3398325ba00bc385b0958886eb551361facd7c7e..69d9a75e91957e6065451d5380a578e3e7d3853c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx
@@ -23,6 +23,7 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <vtkVersionMacros.h>
 #include "vtkImageViewer2_XYZ.h"
 #include "vtkRenderer.h"
 #include "vtkImageActor.h"

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
index 3f43407ef8c38834e0c3412abf89eac72fa0135e..712cd0e293def352ad9907b1e08a8edc984776a4 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
@@ -26,6 +26,7 @@
 #ifndef wxMaracasMultipleVolumeRendererManagerData_H_
 #define wxMaracasMultipleVolumeRendererManagerData_H_
 
+#include <vtkVersionMacros.h>
 #include <vtkPlanes.h>
 #include <vtkVolumeProperty.h>
 #include <vtkVolume.h>

diff --git a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
index 9d376c0b00b0324fbff611012020a881e856459d..5cd89931f2666d11900eb77a0368e274086cc671 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
+++ b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
@@ -26,6 +26,7 @@
 
 #include "marDicomBase.h"
 
+#include <vtkVersionMacros.h>
 #include <vtkVolume16Reader.h> 
 #include <vtkExtractVOI.h>
 #include <vtkImageChangeInformation.h>

diff --git a/lib/maracasVisuLib/src/kernel/marDynData.h b/lib/maracasVisuLib/src/kernel/marDynData.h
index 293187bcda106baff5fb26d8ed02e126ff1cf582..98aabcd489ef30e1ed57dd8b46ec1e325172daca 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marDynData.h
+++ b/lib/maracasVisuLib/src/kernel/marDynData.h
@@ -47,6 +47,7 @@
 #include "volume.hxx"
 #include "marImageData.h"
 
+#include <vtkVersionMacros.h>
 #include <vtkImageData.h>
 
 class creaMaracasVisu_EXPORT marDynData : public marObject