Correction du CmakeList pour les packcage sous win32

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 7f1e829516dc2766e6c7ba6c3f7ddf1f3894566e..52f9f4890c90c37f37f1202961d55790ba6a5cf6 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -12,7 +12,6 @@
 #http://www.cmake.org/Wiki/CMake:CPackConfiguration
 #http://www.cmake.org/Wiki/CMake:Install_Commands
 
-
 INCLUDE(InstallRequiredSystemLibraries)
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "creaImageIO - CREATIS-LRMN")
@@ -38,7 +37,8 @@ SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
 #ELSE (BUILD_BBTK_PACKAGE_creaImageIO)
 
-  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\Dicom Layer-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ # SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
   IF(WIN32)
     SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaImageIO)
   ENDIF(WIN32)
@@ -81,10 +81,6 @@ ENDIF (WIN32)
 IF (BUILD_STANDALONE_INSTALLER)
 
   IF(WIN32)
-
-    INSTALL (FILES ${EXECUTABLE_OUTPUT_PATH}relwithdebinfo/vv.exe DESTINATION bin)
-    INSTALL (FILES ${QT_PLUGINS_DIR}/../bin/QtCore4.dll DESTINATION bin)
-    INSTALL (FILES ${QT_PLUGINS_DIR}/../bin/QtGui4.dll DESTINATION bin)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkCommon.dll DESTINATION bin)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtksys.dll DESTINATION bin)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkRendering.dll DESTINATION bin)
@@ -93,9 +89,9 @@ IF (BUILD_STANDALONE_INSTALLER)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkFiltering.dll DESTINATION bin)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkGenericFiltering.dll DESTINATION bin)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkIO.dll DESTINATION bin)
-    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/verdict.dll DESTINATION bin)
-    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/QVTK.dll DESTINATION bin)
-    INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/QVTKWidgetPlugin.dll DESTINATION bin)
+    #INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/verdict.dll DESTINATION bin)
+    #INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/QVTK.dll DESTINATION bin)
+    #INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/QVTKWidgetPlugin.dll DESTINATION bin)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkDICOMParser.dll DESTINATION bin)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkexoIIc.dll DESTINATION bin)
     INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkexpat.dll DESTINATION bin)
@@ -115,49 +111,40 @@ IF (BUILD_STANDALONE_INSTALLER)
   INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkWidgets.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/relwithdebinfo/vtkzlib.dll DESTINATION bin)
 
-
-
-
-
-
-  STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
-  INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll                             DESTINATION bin/ )
-  INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll                             DESTINATION bin/ )
-
-  IF(USE_VTK)
-    SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
-
-    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
-    FOREACH( iLST  ${LST_FILE_VTKDLL} )
-       INSTALL( 
-         FILES ${iLST}
-         DESTINATION bin/
-       )
-    ENDFOREACH(iLST)
-  ENDIF(USE_VTK)
+  #STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
+  INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/msvcp71d.dll                           DESTINATION bin/ )
+  INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//msvcr71d.dll                                  DESTINATION bin/ )
+  INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo//crea.dll                              DESTINATION bin/ )
+
+  #IF(USE_VTK)
+   # SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
+#    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
+ #   FOREACH( iLST  ${LST_FILE_VTKDLL} )
+  #     INSTALL( 
+   #      FILES ${iLST}
+    #     DESTINATION bin/
+     #  )
+    #ENDFOREACH(iLST)
+  #ENDIF(USE_VTK)
     
-  IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll      DESTINATION bin/ )
-  ENDIF(USE_ITK)
 
   IF(USE_WXWIDGETS)
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll                          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll                      DESTINATION bin/ )
+   # INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll                      DESTINATION bin/ )
+    INSTALL(   FILES   ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_xrc_vc_custom.dll                         DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_richtext_vc_custom.dll      DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_qa_vc_custom.dll                            DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_media_vc_custom.dll                 DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_html_vc_custom.dll                  DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_gl_vc_custom.dll                            DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_core_vc_custom.dll                  DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_aui_vc_custom.dll                           DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxmsw28d_adv_vc_custom.dll                           DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxbase28d_xml_vc_custom.dll                  DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxbase28d_vc_custom.dll                              DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxbase28d_odbc_vc_custom.dll                 DESTINATION bin/ )
+    INSTALL(   FILES ${PROJECT_BINARY_DIR}/relwithdebinfo/wxbase28d_net_vc_custom.dll                          DESTINATION bin/ )
   ENDIF(USE_WXWIDGETS)
 
-ELSE(WIN32)
-  
 ENDIF(WIN32)
 
 ENDIF (BUILD_STANDALONE_INSTALLER)

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 49c72ef98bd8d61bcc1c0be867ab7dade7677570..65669c8b1176faf5e1ad89c80d6b2de767e1f2fd 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -4,9 +4,7 @@
 #include <wx/splitter.h>
 #include <wx/gdicmn.h>
 #include <boost/date_time/gregorian/gregorian.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/date_time/local_time_adjustor.hpp>
-#include <boost/date_time/c_local_time_adjustor.hpp>
+
 
 
 
@@ -480,12 +478,12 @@ namespace creaImageIO
                                for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
                                {
                                        std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
-                                       if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isDateEntry())
+                                       if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isDateEntry()) // Date
                                        {
                                                boost::gregorian::date d1(boost::gregorian::from_undelimited_string(val));
                                                val = to_iso_extended_string(d1);
                                        }
-                                       else if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isTimeEntry())
+                                       else if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isTimeEntry()) // Time
                                        {
                                                if (val != "" || val != " ")
                                                        val = val.substr(0,2) + " : " + val.substr(2,2) + " : " + val.substr(4,2);