From: guigues <guigues>
Date: Wed, 1 Apr 2009 12:52:34 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~124
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c6c81af149bb0f0bd9f4c14cb2e276d7eb046b7d;p=creaImageIO.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a97a2e..dc4a57d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,12 +39,14 @@ ENDIF(WIN32)
 OPTION(BUILD_V2 "Build Version 2 ?" OFF) 
 
 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(
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src
diff --git a/appli/wxGimmick/main.cxx b/appli/wxGimmick/main.cxx
index 91dfa1f..2e9533a 100644
--- a/appli/wxGimmick/main.cxx
+++ b/appli/wxGimmick/main.cxx
@@ -22,8 +22,8 @@ bool myApp::OnInit( )
    wxInitAllImageHandlers();
 
    
-   creaImageIO::SetGimmickMessageLevel(9);
-   creaImageIO::SetGimmickDebugMessageLevel(9);
+   creaImageIO::SetGimmickMessageLevel(5);
+   creaImageIO::SetGimmickDebugMessageLevel(5);
    
 
    int threads = 1;
diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index 48abc9d..f0c11ce 100644
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -69,13 +69,14 @@ SET(${BBTK_PACKAGE_NAME}_COMPILE_ALL_CXX ON)
 #===========================================================================
 # THE xml SOURCES OF THE PACKAGE
 # EITHER UNCOMMENT NEXT LINE TO bbfy ALL .xml OF THE src DIRECTORY :
-SET(${BBTK_PACKAGE_NAME}_COMPILE_ALL_XML ON)
+#SET(${BBTK_PACKAGE_NAME}_COMPILE_ALL_XML ON)
 # ... OR LIST THE FILES TO COMPILE MANUALLY :
-#SET(${BBTK_PACKAGE_NAME}_XML_SOURCES
+SET(${BBTK_PACKAGE_NAME}_XML_SOURCES
 # LIST HERE THE FILES TO bbfy TO BUILD THE LIB
 # E.G. TO bbfy "toto.xml" ADD "toto" (NO EXTENSION)
 # THE PATH MUST BE RELATIVE TO THE src FOLDER
-#    )
+${CMAKE_CURRENT_BINARY_DIR}/src/bbcreaImageIOGimmick.xml 
+    )
 #===========================================================================
 
 #===========================================================================
@@ -117,7 +118,7 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
 SET(${BBTK_PACKAGE_NAME}_LIBS 
   # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST
   # EXCEPT : the same libs than for INCLUDE_DIRS 
-  creaImageIO
+  ${LIBNAME}
   )
 #===========================================================================
 
diff --git a/bbtk/src/CMakeLists.txt b/bbtk/src/CMakeLists.txt
index e2d2a11..68b9e50 100644
--- a/bbtk/src/CMakeLists.txt
+++ b/bbtk/src/CMakeLists.txt
@@ -1,3 +1,16 @@
+
+IF (BUILD_V2)
+  CONFIGURE_FILE(bbcreaImageIOGimmick.xml_v2 
+    ${CMAKE_CURRENT_BINARY_DIR}/bbcreaImageIOGimmick.xml 
+    COPYONLY)
+ELSE (BUILD_V2)
+  CONFIGURE_FILE(bbcreaImageIOGimmick.xml_v1
+    ${CMAKE_CURRENT_BINARY_DIR}/bbcreaImageIOGimmick.xml 
+    COPYONLY)
+ENDIF (BUILD_V2)
+
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
+  
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
diff --git a/bbtk/src/bbcreaImageIOGimmick.xml b/bbtk/src/bbcreaImageIOGimmick.xml_v1
similarity index 69%
rename from bbtk/src/bbcreaImageIOGimmick.xml
rename to bbtk/src/bbcreaImageIOGimmick.xml_v1
index f404357..7d8f883 100644
--- a/bbtk/src/bbcreaImageIOGimmick.xml
+++ b/bbtk/src/bbcreaImageIOGimmick.xml_v1
@@ -17,7 +17,13 @@
 
   <input name="Title" type="std::string" description="Title of the dialog"/>
   <input name="ImageDimension" type="int" description="The maximal dimensionality of the image to be selected, e.g. 2 for a 2D image, 3 for a 3D image,..."/>
- <output name="Out", type="vtkImageData*" description="The selected image"/>
+  <input name="Output" type="int" description="What to output ? 0(default)=image and filenames/1=only filenames"/>
+  <typedef><PRE>typedef std::vector<std::string> OutputFilesType;</PRE></typedef>
+  <typedef><PRE>typedef std::vector<vtkImageData*> OutputImagesType;</PRE></typedef>
+
+ <output name="Out" type="vtkImageData*" description="The first selected image"/>
+ <output name="Out2" type="OutputImagesType" description="The selected images"/>
+ <output name="Files" type="OutputFilesType" description="The selected files"/>
  
  <!--========================================================================
     PROCESS section -->
@@ -36,9 +42,16 @@
    
    if (w.GetReturnCode() == wxID_OK)
      {
-       std::vector<vtkImageData*> images;
-       w.GetSelectedImages(images);
-       bbSetOutputOut(images[0]);
+     if (bbGetInputOutput()==0) 
+         {
+           std::vector<vtkImageData*> images;
+           w.GetSelectedImages(images);
+           bbSetOutputOut(images[0]);
+           bbSetOutputOut2(images);
+         }
+       std::vector<std::string> files;
+       w.GetSelectedFiles(files);
+       bbSetOutputFiles(files);
      }
    else if (w.GetReturnCode() == wxID_CANCEL)
      {
@@ -56,27 +69,24 @@
   <constructor><PRE> 
     bbSetInputImageDimension(3);
     bbSetInputTitle("Select image(s)");
+    bbSetInputOutput(0);
     bbSetOutputOut(0);
   </PRE>
   </constructor>
 
 
-  <!-- THE COPY-CONSTRUCTION METHOD BODY :
-    Here does nothing 
-    But this is where you should allocate the output pointers if any
-    and copy the pointed values (to avoid bug caused by multiple references) -->
+  <!-- THE COPY-CONSTRUCTION METHOD BODY : -->
   <copyconstructor>
   <PRE>
     bbSetOutputOut(0);
   </PRE>
   </copyconstructor>
 
-  <!-- THE DESTRUCTION METHOD BODY :
-    Here does nothing 
-    but this is where you should desallocate the output pointers if any -->
+  <!-- THE DESTRUCTION METHOD BODY  -->
   <destructor>
   <PRE>
-    if (bbGetOutputOut()!=0) bbGetOutputOut()->Delete();
+    std::vector<vtkImageData*>::iterator i;
+    for (i=bbGetOutputOut2().begin();i!=bbGetOutputOut2().end();++i) (*i)->Delete();
   </PRE>
   </destructor>
 
diff --git a/bbtk/src/bbcreaImageIOGimmick.xml_v2 b/bbtk/src/bbcreaImageIOGimmick.xml_v2
new file mode 100644
index 0000000..4628f10
--- /dev/null
+++ b/bbtk/src/bbcreaImageIOGimmick.xml_v2
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--==========================================================================
+   STARTS THE DESCRIPTION OF THE BLACK BOX -->
+<blackbox name="Gimmick">
+ <!--========================================================================
+    THE BOX DOCUMENTATION -->
+  <author>laurent.guigues@creatis.insa-lyon.fr</author>
+  <description>Gimmick! (Gimme my medical images quick!) is a medical image reader widget. It handles DICOM,jpg,tif,png,bmp and mhd. Images read are stored in sqlite3 databases and thus retrieved very quick next time. Screenshot : <img src=Gimmick1.jpg></img>"</description>
+  <category>image;reader;dicom</category>
+
+<!--========================================================================
+    #include directives to be put in the .h generated
+    There must be one tag per file to include -->
+<include>creaImageIOWxGimmickReaderDialog.h</include>
+ <!--========================================================================
+    INPUTS/OUTPUTS DECLARATION -->
+
+  <input name="Title" type="std::string" description="Title of the dialog"/>
+  <input name="ImageMinDimension" type="int" description="The minimal dimensionality of the image to be selected, e.g. 2 for a 2D image, 3 for a 3D image,..."/>
+  <input name="ImageMaxDimension" type="int" description="The maximal dimensionality of the image to be selected, e.g. 2 for a 2D image, 3 for a 3D image,..."/>
+  <input name="ImageOutputDimension" type="int" description="The dimensionality of the output image, e.g. 2 for a 2D image, 3 for a 3D image,..."/>
+  <input name="Output" type="int" description="What to output ? 0(default)=image and filenames/1=only filenames"/>
+  <typedef><PRE>typedef std::vector<std::string> OutputFilesType;</PRE></typedef>
+  <typedef><PRE>typedef std::vector<vtkImageData*> OutputImagesType;</PRE></typedef>
+
+ <output name="Out" type="vtkImageData*" description="The first selected image"/>
+ <output name="Out2" type="OutputImagesType" description="The selected images"/>
+ <output name="Files" type="OutputFilesType" description="The selected files"/>
+ 
+ <!--========================================================================
+    PROCESS section -->
+
+  <process><PRE>
+   int threads = 1;
+
+   creaImageIO::WxGimmickReaderDialog w(0,
+                                  -1,
+                                  crea::std2wx(bbGetInputTitle()),
+                                  wxDefaultPosition,
+                                  wxSize(1200,800),
+                                  bbGetInputImageMinDimension(),
+                                  bbGetInputImageMaxDimension(),
+                                  bbGetInputImageOutputDimension(),
+                                  threads);
+   w.ShowModal();
+   
+   if (w.GetReturnCode() == wxID_OK)
+     {
+       if (bbGetInputOutput()==0) 
+         {
+           std::vector<vtkImageData*> images;
+           w.GetSelectedImages(images,bbGetInputImageOutputDimension());
+           bbSetOutputOut(images[0]);
+           bbSetOutputOut2(images);
+         }
+       std::vector<std::string> files;
+       w.GetSelectedFiles(files);
+       bbSetOutputFiles(files);
+     }
+   else if (w.GetReturnCode() == wxID_CANCEL)
+     {
+//    if (bbGetOutputOut()!=0) 
+//     { 
+ //       bbGetOutputOut()->Delete();    
+//          bbSetOutputOut(0);
+// }
+     }
+  </PRE></process>
+
+ <!--======================================================================
+   CONSTRUCTORS / DESTRUCTORS (OPTIONAL) -->
+
+  <constructor><PRE> 
+    bbSetInputImageMinDimension(2);
+    bbSetInputImageMaxDimension(3);
+    bbSetInputImageOutputDimension(3);
+    bbSetInputTitle("Select image(s)");
+    bbGetInputOutput(0);
+    bbSetOutputOut(0);
+  </PRE>
+  </constructor>
+
+
+  <!-- THE COPY-CONSTRUCTION METHOD BODY : -->
+  <copyconstructor>
+  <PRE>
+    bbSetOutputOut(0);
+  </PRE>
+  </copyconstructor>
+
+  <!-- THE DESTRUCTION METHOD BODY : -->
+  <destructor>
+  <PRE>
+    std::vector<vtkImageData*>::iterator i;
+    for (i=bbGetOutputOut2().begin();i!=bbGetOutputOut2().end();++i) (*i)->Delete();
+  </PRE>
+  </destructor>
+
+
+
+</blackbox>
+
diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index 8ec273f..85bbb4b 100644
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -43,7 +43,7 @@ namespace creaImageIO
     : //mDoNotSignal(false),
       mReader(0),
       mTotalMem(0),
-      mTotalMemMax(100000)
+      mTotalMemMax(1500000)
   {
     //    std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
     //	      << " #threads= " << number_of_threads <<" )"<<std::endl;