Removing references to gdcm

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
index 40c79c10511d3dfdc07976ecd45be035590fea97..ea3827fd3906efccb708e28d3f013babf9aa568e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt
@@ -25,11 +25,6 @@ SET(MARACAS_TOOLS_SOURCES
     "tools/MaracasTools.cpp"
 )
 
-#-----------------------------------------------------------------------------
-# Project MaracasTools in workspace
-#-----------------------------------------------------------------------------
-##EED 6 aout 2007
-##ADD_LIBRARY(MaracasTools ${MARACAS_TOOLS_SOURCES})
 
 
 #-----------------------------------------------------------------------------
@@ -265,11 +260,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
 )
 
@@ -291,8 +282,6 @@ IF(WIN32)
   SET(MARACAS_WIN32APP_SRCS
     wxMaracasApp02.cxx
     wxMaracasApp02.h
-#    ../../kernel/marGdcmDicom.cpp
-#    ../../kernel/marGdcmDicom.h
     res/wxInterface.rc
   )
   set(CMAKE_MFC_FLAG 2)
@@ -302,7 +291,6 @@ IF(WIN32)
 
        MaracasAlgorithm    MaracasKernel    MaracasSnakeContour    MaracasInterface02WX
        vtkCommon  vtkFiltering  vtkGraphics  vtkIO  vtkImaging  vtkRendering vtkHybrid 
-#vtkPatented
        vtkWidgets vtkVolumeRendering
 
        ILPDInterface ILPDModel ILPDcontrolerInterface 
@@ -352,17 +340,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        )
@@ -376,7 +353,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        )
@@ -436,17 +412,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        )
@@ -459,9 +424,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        )
@@ -484,35 +448,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
@@ -520,7 +466,6 @@ ELSE(WIN32)
        ILPDModel 
        ${MYSQL_LIBRARIES}
        ${maracas_WXWIDGETS_LIBRARIES}
-#      ${GDCM_LIBRARIES}
  )
 
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasApp02.cxx b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasApp02.cxx
index 45047473d6df84afbb78b2ab201c891829211459..91ba1f1c8e09c791d85c401f509f474667568ba4 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasApp02.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasApp02.cxx
@@ -3,8 +3,8 @@
  Program:   wxMaracas
  Module:    $RCSfile: wxMaracasApp02.cxx,v $
  Language:  C++
- Date:      $Date: 2008/10/31 16:32:09 $
- Version:   $Revision: 1.1 $
+ Date:      $Date: 2008/11/21 17:24:42 $
+ Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -16,7 +16,7 @@
 =========================================================================*/
 
 /**
-* \mainpage wxMaracas version wxWindows + gdcm
+* \mainpage wxMaracas version wxWindows
 *
 * \section intro Introduction
 *