change src2 to src and creaImageIO2 to creaImageIO to clarify future developments.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32fc752bd1a4e7bc5a19d9f1ee2f40a06d76583a..be8cfd4ef0b12db4a1baa879a882a5e1106ae55f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,11 @@ SET(USE_WXWIDGETS ON)
 
 OPTION(USE_GDCM ON)
 OPTION(USE_GDCM2 OFF)
-
+ MESSAGE(STATUS "GDCM LIB ....= ${GDCM_LIBRARIES}")
+IF(USE_GDCM2)
+       OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
+       #TO DO TEST IF GDCM_USE_SYSTEM_OPENSSL is valid
+ENDIF(USE_GDCM2)
 CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -55,23 +59,14 @@ ENDIF(WIN32)
 
 
 
-OPTION(BUILD_V2 "Build Version 2 ?" ON) 
 
-IF (BUILD_V2)
-  SET(LIBNAME creaImageIO2)
-  INCLUDE_DIRECTORIES(
-    ${PROJECT_BINARY_DIR}
-    ${PROJECT_SOURCE_DIR}/src2
-    )
-  SUBDIRS(src2)
-ELSE (BUILD_V2)
-  SET(LIBNAME creaImageIO)
-  INCLUDE_DIRECTORIES(
+SET(LIBNAME creaImageIO)
+       INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src
     )
-  SUBDIRS(src)
-ENDIF (BUILD_V2)
+SUBDIRS(src)
+
 
 OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
 

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index 79f376bc6976506af77202fe6221a7b74ef461c6..eed9be73730097a3f30fda8193c1eca7fe3bdbc1 100644 (file)
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -1,11 +1,12 @@
-IF (BUILD_V2)
+
   SUBDIRS(gimmick)
   SUBDIRS(wxGimmick)
   SUBDIRS(TestWxGimmickReaderDialog)
   SUBDIRS(TestGimmickReaderDialog)
-ELSE (BUILD_V2)
-  SUBDIRS(TestWxGimmickDialog)
-ENDIF (BUILD_V2)
+  SUBDIRS(TestWxGimmickReaderDialogJava)
+#LSE (BUILD_V2)
+ # SUBDIRS(TestWxGimmickDialog)
+#ENDIF (BUILD_V2)
 
 
 

diff --git a/appli/TestGimmickReaderDialog/CMakeLists.txt b/appli/TestGimmickReaderDialog/CMakeLists.txt
index b52ed4048603bbe45c0195562f2792d5045ae2c3..92753f03d2b73b6dd2193849ffce231eda1e194c 100644 (file)
--- a/appli/TestGimmickReaderDialog/CMakeLists.txt
+++ b/appli/TestGimmickReaderDialog/CMakeLists.txt
@@ -6,6 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(TestGimmickReaderDialog main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES( TestGimmickReaderDialog creaImageIO2  )
+TARGET_LINK_LIBRARIES( TestGimmickReaderDialog creaImageIO  )
 
 INSTALL_TARGETS(/bin/ TestGimmickReaderDialog )

diff --git a/appli/TestWxGimmickDialog/CMakeLists.txt b/appli/TestWxGimmickDialog/CMakeLists.txt
index 927da7c1b09f9f1425f20b8fdf3c50e375f7fa0f..e53974101961f4f62dabc828ded70335c28b16c1 100644 (file)
--- a/appli/TestWxGimmickDialog/CMakeLists.txt
+++ b/appli/TestWxGimmickDialog/CMakeLists.txt
@@ -6,6 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(TestWxGimmickDialog MACOSX_BUNDLE  main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES(         TestWxGimmickDialog creaImageIO2  )
+TARGET_LINK_LIBRARIES(         TestWxGimmickDialog creaImageIO  )
 
 INSTALL_TARGETS(/bin/ TestWxGimmickDialog )

diff --git a/appli/TestWxGimmickReaderDialog/CMakeLists.txt b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
index 21ecb93b38304ccd877288b9953bccb595ea3fd1..b24e87fb29ba39fc43521f1148945333da6d1e4f 100644 (file)
--- a/appli/TestWxGimmickReaderDialog/CMakeLists.txt
+++ b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
@@ -6,6 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(TestWxGimmickReaderDialog MACOSX_BUNDLE main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES(         TestWxGimmickReaderDialog creaImageIO2  )
+TARGET_LINK_LIBRARIES(         TestWxGimmickReaderDialog creaImageIO  )
 
 INSTALL_TARGETS(/bin/ TestWxGimmickReaderDialog )

diff --git a/appli/TestWxGimmickReaderDialog/main.cxx b/appli/TestWxGimmickReaderDialog/main.cxx
index 811f6a3b74dfd22a6b52d7e7c26b8bea1bd840bc..bcd74d8ac3ec89cd459dda58f7188146351ec211 100644 (file)
--- a/appli/TestWxGimmickReaderDialog/main.cxx
+++ b/appli/TestWxGimmickReaderDialog/main.cxx
@@ -1,9 +1,23 @@
 #include <creaImageIOSystem.h>
 #include <creaWx.h>
 #include <creaImageIOWxGimmickReaderDialog.h>
-
+#include "vtkMetaImageWriter.h"
+#include "vtkMetaImageReader.h"
 #include <creaVtkBasicSlicer.h>
 
+
+//
+//#pragma comment(lib, "creaImageIO.lib")
+//#pragma comment(lib, "DelayImp.lib")
+//
+//
+//// Tell the linker that my DLL should be delay loaded
+////#pragma comment(linker, "/DelayLoad:creaImageIO.Dll")
+//\ f
+//// Tell the linker that I want to be able to unload my DLL
+//#pragma comment(linker, "/Delay:unload")
+//
+
 class myApp : public wxApp
 {
 public:
@@ -47,7 +61,11 @@ bool myApp::OnInit( )
                    min_dim,
                    max_dim,
                    output_dim,
-                   threads);
+       
+                                  threads);
+  /* clock_t endwait;
+               endwait = clock () +  CLOCKS_PER_SEC ;
+               while (clock() < endwait ) {}*/
    w.ShowModal();
 
    if (w.GetReturnCode() == wxID_OK)
@@ -66,7 +84,32 @@ bool myApp::OnInit( )
 
        //Puts images
        std::vector<vtkImageData*> images;
-       w.GetSelectedImages(images,output_dim);
+          w.GetSelectedImages(images,3);
+
+// images[1]->UpdateInformation();
+       /*   vtkMetaImageReader *r= vtkMetaImageReader::New();
+                  r->SetFileName("c:\\toto.mhd");
+          double zz[3];
+                images[0]->GetSpacing(zz);
+
+          vtkMetaImageWriter* ww = vtkMetaImageWriter::New(); 
+                ww->SetFileName("c:\\toto2.mhd"); 
+                ww->SetInput(images[0]);
+                ww->GetInput()->ShallowCopy(images[0]);
+                ww->UpdateInformation();
+                ww->GetInput()->GetSpacing(zz);
+                
+
+//>GetImageDataInput(0)->GetSpacing(zz);
+        images[0]->Delete();
+       
+    ww->Write(); 
+   ww->Delete();
+*/
+
+
+
+       //w.GetSelectedImages(images,output_dim);
        std::cout<<images.size()<<std::endl;
 
        crea::VtkBasicSlicer(images.front());
@@ -76,6 +119,7 @@ bool myApp::OnInit( )
      }
    else if (w.GetReturnCode() == wxID_CANCEL)
      {
+               
        w.OnExit();
        std::cout << "$$$$ main : user clicked 'CANCEL' $$$$"<<std::endl;
      }
@@ -86,6 +130,7 @@ bool myApp::OnInit( )
                  <<std::endl;    
      }
 
+
    //   std::cout << "$$$$ main : deleting dialog"<<std::endl;
    //   delete w;
    std::cout << "$$$$$$$$$$$$$$$$$$$$ main ended "<<std::endl;

diff --git a/appli/gimmick/CMakeLists.txt b/appli/gimmick/CMakeLists.txt
index 14878961182666e1f4ee7cd1997a8a6e817b7ac4..d9da9d83b93c54e497a99545b4c21743e3bb13e9 100644 (file)
--- a/appli/gimmick/CMakeLists.txt
+++ b/appli/gimmick/CMakeLists.txt
@@ -8,6 +8,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(gimmick ${SOURCES})
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES(         gimmick creaImageIO2  )
+TARGET_LINK_LIBRARIES(         gimmick creaImageIO  )
 
 INSTALL_TARGETS(/bin/ gimmick )

diff --git a/appli/wxGimmick/CMakeLists.txt b/appli/wxGimmick/CMakeLists.txt
index 417e6d2bbc913de25abc13393ccc892200024da2..1c86f48715f56060c1d2d38d1fd6510d35195ef0 100644 (file)
--- a/appli/wxGimmick/CMakeLists.txt
+++ b/appli/wxGimmick/CMakeLists.txt
@@ -6,6 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(${NAME} MACOSX_BUNDLE main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES(         ${NAME} creaImageIO2  )
+TARGET_LINK_LIBRARIES(         ${NAME} creaImageIO  )
 
 INSTALL_TARGETS(/bin/ ${NAME} )

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 0bf9bd4b0def44798ddfc9da5902db8e6aa0c363..a4a9418b1596d1daad3f6ed487fc8cb531874716 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -57,7 +57,7 @@ ENDIF(BUILD_STANDALONE_INSTALLER)
 # Aditional INSTALL for CPACK mecanism.
 IF (WIN32)
   INSTALL( FILES ${PROJECT_BINARY_DIR}/RelWithDebInfo/sqlite3.dll DESTINATION bin ) 
-  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.h DESTINATION include/creaImageIO2 ) 
+  INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.h DESTINATION include/creaImageIO ) 
 ENDIF (WIN32)
 
 
@@ -68,7 +68,7 @@ IF (WIN32)
 ELSE (WIN32)
   SET(INSTALL_DATA_DIR "share/gimmick/")
 ENDIF (WIN32)
-INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.dscp DESTINATION ${INSTALL_DATA_DIR} )
+INSTALL( FILES ${PROJECT_SOURCE_DIR}/src/data/localdatabase_Descriptor.dscp DESTINATION ${INSTALL_DATA_DIR} )
  
 
 

diff --git a/src/AdditionalUsecreaImageIO2.cmake.in b/src/AdditionalUsecreaImageIO.cmake.in
similarity index 100%
rename from src/AdditionalUsecreaImageIO2.cmake.in
rename to src/AdditionalUsecreaImageIO.cmake.in

diff --git a/src/AdditionalcreaImageIO2Config.cmake.in b/src/AdditionalcreaImageIOConfig.cmake.in
similarity index 100%
rename from src/AdditionalcreaImageIO2Config.cmake.in
rename to src/AdditionalcreaImageIOConfig.cmake.in

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b68fae5efeed9ed320e2432be423ad723630950f..8e2191899241dfe10da6fdeb579872edcc511a00 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(LIBRARY_NAME creaImageIO2)
+SET(LIBRARY_NAME creaImageIO)
 
 
 FILE(GLOB SOURCES_CREAIMAGEIO  
@@ -46,7 +46,8 @@ ENDIF(USE_GDCM)
          
 IF(USE_GDCM2)
  FILE(GLOB SOURCES_CREAIMAGEIO_IMG_DICOM_READER
-               creaImageIODicomImageReader2.cpp)
+               creaImageIODicomImageReader2.cpp
+               creaImageIODicomScanner.cpp)
 ENDIF(USE_GDCM2)
 
  # Image Readers
@@ -171,7 +172,7 @@ INSTALL(
 #    ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
 #    )
 SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
-    src2
+    src
     win32
 )
 
@@ -197,17 +198,17 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
   
   SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE TRUE)
 SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE 
-  ${PROJECT_SOURCE_DIR}/src2/Additional${LIBRARY_NAME}Config.cmake.in)
+  ${PROJECT_SOURCE_DIR}/src/Additional${LIBRARY_NAME}Config.cmake.in)
 SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE 
-  ${PROJECT_SOURCE_DIR}/src2/AdditionalUse${LIBRARY_NAME}.cmake.in)
+  ${PROJECT_SOURCE_DIR}/src/AdditionalUse${LIBRARY_NAME}.cmake.in)
 
   # Invoke the advanced macro
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 IF (WIN32)
-       SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
+       SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
        SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/Shared/gimmick)
 ELSE (WIN32)
-       SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
+       SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src/data)
        SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
 ENDIF (WIN32)
 CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
@@ -223,6 +224,6 @@ ENDIF(BUILD_DOXYGEN_DOC)
 
 INCLUDE_DIRECTORIES(
 #  ${PROJECT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}/src2
-#  ${PROJECT_SOURCE_DIR}/src2/CppSQLite3
+  ${PROJECT_SOURCE_DIR}/src
+#  ${PROJECT_SOURCE_DIR}/src/CppSQLite3
   )

diff --git a/src/creaImageIOWxGimmickReaderDialog.cpp b/src/creaImageIOWxGimmickReaderDialog.cpp
index e2362d9afa7350f82eeb871972531a14b0a62360..4823d40bf665627e8743053dd0dc17850e6ef0c6 100644 (file)
--- a/src/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src/creaImageIOWxGimmickReaderDialog.cpp
@@ -90,13 +90,9 @@ namespace creaImageIO
       {
                mGimmick->Finalize();
       }
-   deleteMessage();
+
   }
 
-void           WxGimmickReaderDialog::deleteMessage()
-       {
-               deleteGimmickDebugMessage();
-       };
   ///Callback method on a selection
   void WxGimmickReaderDialog::OnValid(bool t)
   {

diff --git a/src/doxygen/Architecture.htm b/src/doxygen/Architecture.htm
index 3d1fd077d303c8c47e6f0dfa56210b2ed30dc4ea..57cc83aaf386ee914e1e7bcc729f2ef3512954b0 100644 (file)
--- a/src/doxygen/Architecture.htm
+++ b/src/doxygen/Architecture.htm
@@ -26,7 +26,7 @@
        </li>
        <li>09/02/09 : <span class="anchor" id="line-12"></span>
        <ul>
-               <li>new sources in src2 : create a lib called creaImageIO2
+               <li>new sources in src : create a lib called creaImageIO
                <span class="anchor" id="line-13"></span></li>
                <li>command line app : appli/gimmick <span class="anchor" id="line-14">
                </span></li>

diff --git a/src/doxygen/CMakeLists.txt b/src/doxygen/CMakeLists.txt
index 0e1db6d87603b5b7032fe2a07ab5c576bafb3ac4..fed773222c35a1eb51967dbffc15796f235e0726 100644 (file)
--- a/src/doxygen/CMakeLists.txt
+++ b/src/doxygen/CMakeLists.txt
@@ -104,7 +104,7 @@ CONFIGURE_FILE(
 
 SET(INPUT 
   ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
-  ${PROJECT_SOURCE_DIR}/src2
+  ${PROJECT_SOURCE_DIR}/src
   ${PROJECT_SOURCE_DIR}/appli/gimmick
   ${PROJECT_SOURCE_DIR}/appli/wxGimmick
   ${PROJECT_SOURCE_DIR}/appli/TestWxGimmickReaderDialog