+# ---------------------------------------------------------------------
+#
+# 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
INCLUDE_DIRECTORIES(
"C:/Creatis/MaracasTools/OSGi/src"
"C:/Creatis/MaracasTools/Include"
-"/home/jpr/Creatis/Maracas/src/interface/wxWindows"
)
#-----------------------------------------------------------------------------
"tools/MaracasTools.cpp"
)
-#-----------------------------------------------------------------------------
-# Project MaracasTools in workspace
-#-----------------------------------------------------------------------------
-##EED 6 aout 2007
-##ADD_LIBRARY(MaracasTools ${MARACAS_TOOLS_SOURCES})
#-----------------------------------------------------------------------------
wxMaracasHelpDialog.h
wxMaracasQuantification.cxx
wxMaracasQuantification.h
+ wxMaracasSurfaceRendering.cxx
+ wxMaracasSurfaceRendering.h
+ wxMaracasRendererView.cxx
+ wxMaracasRendererView.h
+
+
+
widgets/wxVTKRenderWindowInteractor.cxx
widgets/wxVTKRenderWindowInteractor.h
widgets/wxVTKRenderWindowInteractorEditContour.cxx
MaracasAlgorithm
MaracasKernel
MaracasSnakeContour
-##EED 6 aout 2007
-## MaracasTools
- #${LIBIDO_LIBRARIES}
${GLIB_LIBRARIES}
-# ${GDCM_LIBRARIES}
vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid
)
SET(MARACAS_WIN32APP_SRCS
wxMaracasApp02.cxx
wxMaracasApp02.h
-# ../../kernel/marGdcmDicom.cpp
-# ../../kernel/marGdcmDicom.h
res/wxInterface.rc
)
set(CMAKE_MFC_FLAG 2)
MaracasAlgorithm MaracasKernel MaracasSnakeContour MaracasInterface02WX
vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid
-#vtkPatented
vtkWidgets vtkVolumeRendering
ILPDInterface ILPDModel ILPDcontrolerInterface
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 )
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 )
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 )
-##----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 )
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 )
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 )
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 )
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
ILPDModel
${MYSQL_LIBRARIES}
${maracas_WXWIDGETS_LIBRARIES}
-# ${GDCM_LIBRARIES}
)
ENDIF(WIN32)
-SUBDIRS(widgets)
+ADD_SUBDIRECTORY(widgets)
+
+
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / blobdiff