From: Eduardo DAVILA Date: Fri, 22 Jul 2022 13:31:05 +0000 (+0200) Subject: #3487 vtk9itk5wx3-macos X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=25c086b45835b67f87cbd2b6bce3a412ca2da23b;p=creaMaracasVisu.git #3487 vtk9itk5wx3-macos --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6eac5f2..9177c10 100644 --- 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 ba4ce00..34db748 100644 --- 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 a5f3d6a..34f0b73 100644 --- a/lib/GUI/Base/SurfaceRenderer/wxMaracasSurfaceRenderingManager.h +++ b/lib/GUI/Base/SurfaceRenderer/wxMaracasSurfaceRenderingManager.h @@ -48,7 +48,9 @@ #include #include -#include + +//EED 2022-07-21 +//#include #include "wxMaracasSurfaceRenderingManagerData.h" diff --git a/lib/GUI/Base/VolumeRenderer/CMakeLists.txt b/lib/GUI/Base/VolumeRenderer/CMakeLists.txt index e7ef3a6..7e735a8 100644 --- 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 3b92f73..37f0219 100644 --- 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 e76e665..e101c44 100644 --- a/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.h +++ b/lib/GUI/Wx/SurfaceRenderer/wxMaracasSurfaceRendering.h @@ -48,7 +48,9 @@ #include "wx/aui/aui.h" #include #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 81a6639..4f0350c 100644 --- 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 9866ea1..58e48f4 100644 --- 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 249c000..341167a 100644 --- 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 #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 0026f6a..72a6312 100644 --- 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 #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 bcf6ea2..c4a8c2b 100644 --- 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 18600cf..e783cf0 100644 --- 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 #include class vtkPoints; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h index 349c179..bad6861 100644 --- 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 #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 21d8338..e7c264e 100644 --- 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 #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 9b34a13..db0d878 100644 --- 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 figureCuttingCylinderModel::figureCuttingCylinderModel() { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx index fcca477..4e47ce5 100644 --- 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 //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.h index 8002f5f..24a3e8e 100755 --- 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 #include #include +#include #include #include #include diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/vtkInteractorStyleCutter.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/vtkInteractorStyleCutter.h index d66fffd..386768a 100644 --- 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 #include 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 35efd9f..6b046cc 100644 --- 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 #include //#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 c3ba219..74ceddb 100644 --- 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 + #include "vtkImageData.h" //#include #include #include diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h index 0eb2cb3..56759dc 100644 --- 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 #include + #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 63b3cc9..1067a9f 100644 --- 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 227df55..9ae7c02 100644 --- 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 a57b4dd..bbb8b28 100644 --- 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 #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 37f8cde..1d16dee 100644 --- 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 #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 3398325..69d9a75 100644 --- 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 #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 3f43407..712cd0e 100644 --- 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 #include #include #include diff --git a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp index 9d376c0..5cd8993 100644 --- a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp +++ b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp @@ -26,6 +26,7 @@ #include "marDicomBase.h" +#include #include #include #include diff --git a/lib/maracasVisuLib/src/kernel/marDynData.h b/lib/maracasVisuLib/src/kernel/marDynData.h index 293187b..98aabcd 100644 --- 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 #include class creaMaracasVisu_EXPORT marDynData : public marObject