X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FCMakeLists.txt;h=23449a77213fb9e47189a527576fc322a68bcd2e;hb=449536b536a44335dc3b5a7604e34484eb046e62;hp=75381cbef49c9adf17e2577aa6a320ac97fbe0f1;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt index 75381cb..23449a7 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt +++ b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt @@ -1,3 +1,28 @@ +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + # This directory should only be build if wxWindows and VTK can be found @@ -7,7 +32,6 @@ INCLUDE_DIRECTORIES( "C:/Creatis/MaracasTools/OSGi/src" "C:/Creatis/MaracasTools/Include" -"/home/jpr/Creatis/Maracas/src/interface/wxWindows" ) #----------------------------------------------------------------------------- @@ -25,31 +49,12 @@ SET(MARACAS_TOOLS_SOURCES "tools/MaracasTools.cpp" ) -#----------------------------------------------------------------------------- -# Project MaracasTools in workspace -#----------------------------------------------------------------------------- -##EED 6 aout 2007 -##ADD_LIBRARY(MaracasTools ${MARACAS_TOOLS_SOURCES}) #----------------------------------------------------------------------------- # Required libraries (dll o so) #----------------------------------------------------------------------------- -##EED 6 aout 2007 -##TARGET_LINK_LIBRARIES(MaracasTools OSGi ${maracas_WXWIDGETS_LIBRARIES} ) - - - -#SUBDIRS(ILPD) - - -#GSLobj need GSL -#INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR}) - -#kernel need gdcm -#INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIR}) - #TODO for a nice VC++ we need to add header file... SET(MARACAS_LIB_SRCS @@ -73,6 +78,13 @@ SET(MARACAS_LIB_SRCS wxMaracasHelpDialog.h wxMaracasQuantification.cxx wxMaracasQuantification.h + wxMaracasSurfaceRendering.cxx + wxMaracasSurfaceRendering.h + wxMaracasRendererView.cxx + wxMaracasRendererView.h + + + widgets/wxVTKRenderWindowInteractor.cxx widgets/wxVTKRenderWindowInteractor.h widgets/wxVTKRenderWindowInteractorEditContour.cxx @@ -269,60 +281,6 @@ SET(MARACAS_LIB_SRCS_02 wxMaracas_ManualContour_Panel.cxx wxMaracas_ManualContour_Panel.h -##### Contour Edition - JS - Juan Sebastian - #Contour/ContourPropagation.cxx - #Contour/ContourPropagation.h - #Contour/ExtractControlPoints2D.cxx - #Contour/ExtractControlPoints2D.h - #Contour/ContoursIntersection.cxx - #Contour/ContoursIntersection.h - #Contour/vectorFunctions.cxx - #Contour/vectorFunctions.h - #Contour/Propagation.cxx - #Contour/Propagation.h - -#####pPlotter classes - Monica/Silvia - #1widgets/pPlotter/HistogramDialog.cxx - #1widgets/pPlotter/HistogramDialog.h - #1widgets/pPlotter/HistogramWidget.cxx - #1widgets/pPlotter/HistogramWidget.h - #1widgets/pPlotter/pHistogram.cxx - #1widgets/pPlotter/pHistogram.h - #1widgets/pPlotter/mBarRange.cxx - #1widgets/pPlotter/mBarRange.h - #1widgets/pPlotter/pLogicalFunction.cxx - #1widgets/pPlotter/pLogicalFunction.h - #1widgets/pPlotter/pGraphicalFunction.h - #1widgets/pPlotter/pGraphicalFunction.cxx - #1widgets/pPlotter/pFunctionPoint.cxx - #1widgets/pPlotter/pFunctionPoint.h - #1widgets/pPlotter/pPlotterWindow.cxx - #1widgets/pPlotter/pPlotterWindow.h - #1widgets/pPlotter/pPlotterLayer.cxx - #1widgets/pPlotter/pPlotterLayer.h - #1widgets/pPlotter/pPlotterScaleX.h - #1widgets/pPlotter/pPlotterScaleX.cxx - #1widgets/pPlotter/pPlotterScaleY.h - #1widgets/pPlotter/pPlotterScaleY.cxx - #1widgets/pPlotter/pColorBar.h - #1widgets/pPlotter/pColorBar.cxx - #1widgets/pPlotter/pFigure.h - #1widgets/pPlotter/pFigure.cxx - #1widgets/pPlotter/pColorPoint.h - #1widgets/pPlotter/pColorPoint.cxx - #1widgets/pPlotter/pPlotter.h - #1widgets/pPlotter/pPlotter.cxx - #1widgets/pPlotter/mathplot.cxx - #1widgets/pPlotter/mathplot.h - #1widgets/pPlotter/MaximumsDialog.cxx - #1widgets/pPlotter/MaximumsDialog.h -# widgets/pPlotter/DegradeRectangle.cxx -# widgets/pPlotter/DegradeRectangle.h - #1widgets/pPlotter/LogicalColorBar.cxx - #1widgets/pPlotter/LogicalColorBar.h - #1widgets/pPlotter/Histogram.cxx - #1widgets/pPlotter/Histogram.h - ) @@ -333,11 +291,7 @@ TARGET_LINK_LIBRARIES(MaracasInterface02WX MaracasAlgorithm MaracasKernel MaracasSnakeContour -##EED 6 aout 2007 -## MaracasTools - #${LIBIDO_LIBRARIES} ${GLIB_LIBRARIES} - ${GDCM_LIBRARIES} vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid ) @@ -348,71 +302,35 @@ SET(MARACAS_WIN32LIB_SRCS StdAfx.cpp wxMaracasApp.cxx wxMaracasApp.h - ../../kernel/marSimpleDicom.cpp - ../../kernel/marSimpleDicom.h +# ../../kernel/marSimpleDicom.cpp +# ../../kernel/marSimpleDicom.h res/wxInterface.rc ) -#ADD_LIBRARY(MaracasWin32Lib SHARED ${MARACAS_WIN32LIB_SRCS} ) -#TARGET_LINK_LIBRARIES(MaracasWin32Lib -# MaracasAlgorithm -# MaracasKernel -# MaracasSnakeContour -# MaracasInterfaceWX -# ${WXWIDGETS_LIBRARIES} -# vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid vtkPatented -#) - - IF(WIN32) SET(MARACAS_WIN32APP_SRCS wxMaracasApp02.cxx wxMaracasApp02.h - ../../kernel/marGdcmDicom.cpp - ../../kernel/marGdcmDicom.h res/wxInterface.rc ) set(CMAKE_MFC_FLAG 2) ADD_EXECUTABLE(maracas WIN32 ${MARACAS_WIN32APP_SRCS} ) TARGET_LINK_LIBRARIES(maracas -# debug msvcrtd -# debug msvcprtd -# optimized msvcrt -# optimized msvcprt + MaracasAlgorithm MaracasKernel MaracasSnakeContour MaracasInterface02WX vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid -#vtkPatented vtkWidgets vtkVolumeRendering ILPDInterface ILPDModel ILPDcontrolerInterface ${MYSQL_LIBRARIES} ${maracas_WXWIDGETS_LIBRARIES} - ${GDCM_LIBRARIES} + #${GDCM_LIBRARIES} ) -### -# SET(WIDO_WIN32APP_SRCS -# wxWidoApp.cxx -# wxWidoApp.h -# ) -# ADD_EXECUTABLE(wido_wx_test WIN32 ${WIDO_WIN32APP_SRCS} ) -# TARGET_LINK_LIBRARIES(wido_wx_test -# MaracasInterface02WX -# vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid vtkPatented -# ${WXWIDGETS_LIBRARIES} -# debug msvcrtd -# debug msvcprtd -# optimized msvcrt -# optimized msvcprt -# ) -# -## - - IF(MYSQL_PATH) ##----Copy Debug cofiguration and DLLs--- @@ -442,7 +360,9 @@ IF(WIN32) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_qa_vc_custom.dll COPYONLY ) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_richtext_vc_custom.dll COPYONLY ) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_xrc_vc_custom.dll COPYONLY ) - CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll COPYONLY ) + CONFIGURE_FILE( +${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll +${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll COPYONLY ) ELSE ( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll ) MESSAGE (FATAL_ERROR, " wxWidgets dlls not found (Debug copy dlls)") ENDIF( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll ) @@ -453,17 +373,6 @@ IF(WIN32) MESSAGE (FATAL_ERROR, " libmysqld.dll not found (Debug copy dlls)") ENDIF( EXISTS ${MYSQL_PATH}/Embedded/DLL/debug/libmysqld.dll ) - - IF ( EXISTS ${GDCM_DIR}/../../bin/vtkgdcm.dll ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcmopenjpeg.dll ${LIBRARY_OUTPUT_PATH}/debug/gdcmopenjpeg.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/vtkgdcm.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkgdcm.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcmjpeg16.dll ${LIBRARY_OUTPUT_PATH}/debug/gdcmjpeg16.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcmjpeg12.dll ${LIBRARY_OUTPUT_PATH}/debug/gdcmjpeg12.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcmjpeg8.dll ${LIBRARY_OUTPUT_PATH}/debug/gdcmjpeg8.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcm.dll ${LIBRARY_OUTPUT_PATH}/debug/gdcm.dll COPYONLY ) - ELSE ( EXISTS ${GDCM_DIR}/../../bin/vtkgdcm.dll ) - MESSAGE (FATAL_ERROR, " gdcm dlls not found (Debug copy dlls) )") - ENDIF( EXISTS ${GDCM_DIR}/../../bin/vtkgdcm.dll ) IF ( EXISTS ${VTK_DIR}/../../bin/vtkCommon.dll ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkCommon.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkCommon.dll COPYONLY ) @@ -477,7 +386,6 @@ IF(WIN32) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkImaging.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkImaging.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkIO.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkIO.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkjpeg.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkjpeg.dll COPYONLY ) -# CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkPatented.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkPatented.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkWidgets.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkWidgets.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkVolumeRendering.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkVolumeRendering.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkexoIIc.dll ${LIBRARY_OUTPUT_PATH}/debug/vtkexoIIc.dll COPYONLY ) @@ -498,7 +406,7 @@ IF(WIN32) -##----Copy Release cofiguration and DLLs--- +##----Copy Release configuration and DLLs--- FILE(MAKE_DIRECTORY ${LIBRARY_OUTPUT_PATH}/Release ) FILE(MAKE_DIRECTORY ${LIBRARY_OUTPUT_PATH}/Release/MySql/data ) @@ -525,7 +433,7 @@ IF(WIN32) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_richtext_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/release/wxmsw28_richtext_vc_custom.dll COPYONLY ) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_qa_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/release/wxmsw28_qa_vc_custom.dll COPYONLY ) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_xrc_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/release/wxmsw28_xrc_vc_custom.dll COPYONLY ) - CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll COPYONLY ) + CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll COPYONLY ) ELSE ( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_net_vc_custom.dll ) MESSAGE (FATAL_ERROR, " wxWidgets dlls not found (Release copy dlls)") ENDIF( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_net_vc_custom.dll ) @@ -537,17 +445,6 @@ IF(WIN32) MESSAGE (FATAL_ERROR, " libmysqld.dll not found (Release copy dlls)") ENDIF( EXISTS ${MYSQL_PATH}/Embedded/DLL/release/libmysqld.dll ) - IF ( EXISTS ${GDCM_DIR}/../../bin/vtkgdcm.dll ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcmopenjpeg.dll ${LIBRARY_OUTPUT_PATH}/release/gdcmopenjpeg.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/vtkgdcm.dll ${LIBRARY_OUTPUT_PATH}/release/vtkgdcm.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcmjpeg16.dll ${LIBRARY_OUTPUT_PATH}/release/gdcmjpeg16.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcmjpeg12.dll ${LIBRARY_OUTPUT_PATH}/release/gdcmjpeg12.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcmjpeg8.dll ${LIBRARY_OUTPUT_PATH}/release/gdcmjpeg8.dll COPYONLY ) - CONFIGURE_FILE( ${GDCM_DIR}/../../bin/gdcm.dll ${LIBRARY_OUTPUT_PATH}/release/gdcm.dll COPYONLY ) - ELSE ( EXISTS ${GDCM_DIR}/../../bin/vtkgdcm.dll ) - MESSAGE (FATAL_ERROR, " gdcm dlls not found (Release copy dlls)") - ENDIF( EXISTS ${GDCM_DIR}/../../bin/vtkgdcm.dll ) - IF ( EXISTS ${VTK_DIR}/../../bin/vtkCommon.dll ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkCommon.dll ${LIBRARY_OUTPUT_PATH}/release/vtkCommon.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkDICOMParser.dll ${LIBRARY_OUTPUT_PATH}/release/vtkDICOMParser.dll COPYONLY ) @@ -560,9 +457,8 @@ IF(WIN32) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkImaging.dll ${LIBRARY_OUTPUT_PATH}/release/vtkImaging.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkIO.dll ${LIBRARY_OUTPUT_PATH}/release/vtkIO.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkjpeg.dll ${LIBRARY_OUTPUT_PATH}/release/vtkjpeg.dll COPYONLY ) -# CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkPatented.dll ${LIBRARY_OUTPUT_PATH}/release/vtkPatented.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkWidgets.dll ${LIBRARY_OUTPUT_PATH}/release/vtkWidgets.dll COPYONLY ) - CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkVolumeRendering.dll ${LIBRARY_OUTPUT_PATH}/release/vtkVolumeRendering.dll COPYONLY ) + CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkVolumeRendering.dll ${LIBRARY_OUTPUT_PATH}/release/vtkVolumeRendering.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkexoIIc.dll ${LIBRARY_OUTPUT_PATH}/release/vtkexoIIc.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkNetCDF.dll ${LIBRARY_OUTPUT_PATH}/release/vtkNetCDF.dll COPYONLY ) CONFIGURE_FILE( ${VTK_DIR}/../../bin/vtkpng.dll ${LIBRARY_OUTPUT_PATH}/release/vtkpng.dll COPYONLY ) @@ -585,35 +481,17 @@ ENDIF(MYSQL_PATH) ELSE(WIN32) - -# ADD_EXECUTABLE(maracas wxMaracasApp.cxx ) -# TARGET_LINK_LIBRARIES(maracas -# ${WXWIDGETS_LIBRARIES} -# MaracasInterfaceWX -# #${GDCM_LIBRARIES} -# ) - - - SET(MARACAS_LINUXAPP_SRCS wxMaracasApp02.cxx wxMaracasApp02.h - ../../kernel/marGdcmDicom.cpp - ../../kernel/marGdcmDicom.h -# res/wxInterface.rc ) -# set(CMAKE_MFC_FLAG 2) + ADD_EXECUTABLE(maracas ${MARACAS_LINUXAPP_SRCS} ) TARGET_LINK_LIBRARIES(maracas -# debug msvcrtd -# debug msvcprtd -# optimized msvcrt -# optimized msvcprt MaracasAlgorithm MaracasKernel MaracasSnakeContour MaracasInterface02WX vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid -#vtkPatented vtkWidgets vtkVolumeRendering ILPDcontrolerInterface @@ -621,11 +499,12 @@ ELSE(WIN32) ILPDModel ${MYSQL_LIBRARIES} ${maracas_WXWIDGETS_LIBRARIES} - ${GDCM_LIBRARIES} ) ENDIF(WIN32) -SUBDIRS(widgets) +ADD_SUBDIRECTORY(widgets) + +