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})
#-----------------------------------------------------------------------------
# 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
wxMaracasHelpDialog.h
wxMaracasQuantification.cxx
wxMaracasQuantification.h
+ wxMaracasSurfaceRendering.cxx
+ wxMaracasSurfaceRendering.h
+ wxMaracasRendererView.cxx
+ wxMaracasRendererView.h
+
+
+
widgets/wxVTKRenderWindowInteractor.cxx
widgets/wxVTKRenderWindowInteractor.h
widgets/wxVTKRenderWindowInteractorEditContour.cxx
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
-
)
MaracasAlgorithm
MaracasKernel
MaracasSnakeContour
-##EED 6 aout 2007
-## MaracasTools
- #${LIBIDO_LIBRARIES}
${GLIB_LIBRARIES}
- ${GDCM_LIBRARIES}
vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid
)
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---
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