]> Creatis software - creaMaracasVisu.git/commitdiff
#3487 vtk9itk5wx3-macos
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Fri, 22 Jul 2022 13:31:05 +0000 (15:31 +0200)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Fri, 22 Jul 2022 13:31:05 +0000 (15:31 +0200)
29 files changed:
CMakeLists.txt
lib/GUI/Base/SurfaceRenderer/CMakeLists.txt
lib/GUI/Base/SurfaceRenderer/wxMaracasSurfaceRenderingManager.h
lib/GUI/Base/VolumeRenderer/CMakeLists.txt
lib/GUI/Wx/SurfaceRenderer/CMakeLists.txt
lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.h
lib/GUI/Wx/VolumeRenderer/CMakeLists.txt
lib/Kernel/VTKObjects/SurfaceRenderer/CMakeLists.txt
lib/Kernel/VTKObjects/SurfaceRenderer/surfacerenderingimagestencilexport.h
lib/Kernel/VTKObjects/SurfaceRenderer/wxMaracasSurfaceRenderingManagerData.h
lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h
lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/include/vtkInteractorStyleCutter.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
lib/maracasVisuLib/src/kernel/marDicomBase.cpp
lib/maracasVisuLib/src/kernel/marDynData.h

index 6eac5f2..9177c10 100644 (file)
@@ -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)
index ba4ce00..34db748 100644 (file)
@@ -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:
index a5f3d6a..34f0b73 100644 (file)
@@ -48,7 +48,9 @@
 
 #include <iostream>
 #include <vector>
-#include <vtkMatrix4x4.h>
+
+//EED 2022-07-21
+//#include <vtkMatrix4x4.h>
 
 #include "wxMaracasSurfaceRenderingManagerData.h"
 
index e7ef3a6..7e735a8 100644 (file)
@@ -79,7 +79,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #    ${crea_LIBRARIES}
   #    ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
-  #    ${VTK_LIBRARIES}
+      ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}
   #    ${GDCM_LIBRARIES}
   #    ${BOOST_LIBRARIES}  
index 3b92f73..37f0219 100644 (file)
@@ -80,7 +80,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #    ${crea_LIBRARIES}
       ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
-  #    ${VTK_LIBRARIES}
+      ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}
   #    ${GDCM_LIBRARIES}
   #    ${BOOST_LIBRARIES}  
index e76e665..e101c44 100644 (file)
@@ -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"
index 81a6639..4f0350c 100644 (file)
@@ -79,7 +79,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #    ${crea_LIBRARIES}
       ${WXWIDGETS_LIBRARIES}
   #    ${KWWidgets_LIBRARIES}
-  #    ${VTK_LIBRARIES}
+      ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}
   #    ${GDCM_LIBRARIES}
   #    ${BOOST_LIBRARIES}  
index 9866ea1..58e48f4 100644 (file)
@@ -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:
 
index 249c000..341167a 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef SURFACERENDERINGIMAGESTENCILEXPORT_H
 #define SURFACERENDERINGIMAGESTENCILEXPORT_H
 
+#include <vtkVersionMacros.h>
 #include "vtkObjectFactory.h"
 
 //EED 2017-01-01 Migration VTK7
index 0026f6a..72a6312 100644 (file)
@@ -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"
index bcf6ea2..c4a8c2b 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef VolumeRendererManagerData_H_
 #define VolumeRendererManagerData_H_
 
+
+#include "vtkVersion.h"
 #include "vtkCommand.h"
 
 #if (VTK_MAJOR_VERSION <= 7) 
index 18600cf..e783cf0 100644 (file)
@@ -48,6 +48,7 @@
 #ifndef __vtkInteractorStyleCutter_h
 #define __vtkInteractorStyleCutter_h
 
+#include <vtkVersionMacros.h>
 #include <vtkInteractorStyle.h>
 
 class vtkPoints;
index 349c179..bad6861 100644 (file)
@@ -30,6 +30,7 @@
 #include "marTypes.h"
 //------------------------------------------------------------------
 
+#include <vtkVersionMacros.h>
 #include "vtkInteractorStyleBaseView.h"
 
 //class vtkInteractorStyleBaseView;
index 21d8338..e7c264e 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef BOXSURFACEOBSERVER_H_
 #define BOXSURFACEOBSERVER_H_
 
+#include <vtkVersionMacros.h>
 #include "vtkPlanes.h"
 #include "vtkProp.h"
 
index fcca477..4e47ce5 100644 (file)
@@ -24,6 +24,7 @@
 # ------------------------------------------------------------------------ */
 
 #include "figureCuttingSphereModel.h"
+#include <math.h>
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
index 8002f5f..24a3e8e 100755 (executable)
@@ -37,6 +37,7 @@
 #include <iostream>
 #include <string>
 #include <cstdio>
+#include <vtkVersionMacros.h>
 #include <vtkImageData.h>
 #include <vtkMetaImageWriter.h>
 #include <vtkMetaImageReader.h>
index c3ba219..74ceddb 100644 (file)
@@ -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>
index 63b3cc9..1067a9f 100644 (file)
@@ -72,7 +72,7 @@ pGraphicalFunction:: pGraphicalFunction(wxString name, int flags)
        offsetPixelX            = 0;
        offsetPixelY            = 0;
        xTraslation                     = 0;
-       mType                           = DEFAULT;
+       mType                           = DEFAULT_EED;
        
 }
 
index 227df55..9ae7c02 100644 (file)
@@ -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
index 37f8cde..1d16dee 100644 (file)
@@ -55,6 +55,7 @@
 #ifndef __vtkClosePolyData_h
 #define __vtkClosePolyData_h
 
+#include <vtkVersionMacros.h>
 #include "vtkObjectFactory.h"
 
 //EED 2017-01-01 Migration VTK7
index 3398325..69d9a75 100644 (file)
@@ -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"
index 3f43407..712cd0e 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef wxMaracasMultipleVolumeRendererManagerData_H_
 #define wxMaracasMultipleVolumeRendererManagerData_H_
 
+#include <vtkVersionMacros.h>
 #include <vtkPlanes.h>
 #include <vtkVolumeProperty.h>
 #include <vtkVolume.h>
index 9d376c0..5cd8993 100644 (file)
@@ -26,6 +26,7 @@
 
 #include "marDicomBase.h"
 
+#include <vtkVersionMacros.h>
 #include <vtkVolume16Reader.h> 
 #include <vtkExtractVOI.h>
 #include <vtkImageChangeInformation.h>
index 293187b..98aabcd 100644 (file)
@@ -47,6 +47,7 @@
 #include "volume.hxx"
 #include "marImageData.h"
 
+#include <vtkVersionMacros.h>
 #include <vtkImageData.h>
 
 class creaMaracasVisu_EXPORT marDynData : public marObject