From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Tue, 1 Jun 2010 11:59:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~19
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaImageIO.git;a=commitdiff_plain;h=0966c8da167c8a1546eb203da926e3b446398b68

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

diff --git a/bbtk/src/bbImagesChooserDialogBox.xml b/bbtk/src/bbImagesChooserDialogBox.xml
new file mode 100644
index 0000000..5f2d1dc
--- /dev/null
+++ b/bbtk/src/bbImagesChooserDialogBox.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--==========================================================================
+   STARTS THE DESCRIPTION OF THE BLACK BOX -->
+<blackbox name="ImagesChooserDialogBox">
+  <!--========================================================================
+    THE BOX DOCUMENTATION -->
+  <author>cervenansky.frederic@creatis.insa-lyon.fr</author>
+  <description>
+    ImagesChooserDialogBox is a simple application to select file(s) or directory or data from Gimmick database and display them. It handles DICOM, jpg, tif, png, bmp and mhd."
+  </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>creaImageIOWxSimpleDlg.h</include>
+  <!--========================================================================
+    INPUTS/OUTPUTS DECLARATION -->
+
+  <input name="Title" type="std::string" description="Title of the dialog"/>
+  <typedef>
+    <PRE>
+      typedef std::vector<vtkImageData*> OutputImagesType;</PRE>
+  </typedef>
+
+  <output name="Out" type="OutputImagesType" description="The selected images"/>
+  
+  <!--========================================================================
+    PROCESS section -->
+
+  <process>
+    <PRE>
+      creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()));
+      dlg.ShowModal();
+      if (bbGetInputOutput()==0)
+      {
+         bbSetOutputOut( x.getImagesSelected());
+      }
+
+    </PRE>
+  </process>
+
+  <!--======================================================================
+   CONSTRUCTORS / DESTRUCTORS (OPTIONAL) -->
+
+  <constructor>
+    <PRE>
+      bbSetInputImageDimension(3);
+      bbSetInputTitle("Select image(s)");
+      bbSetInputOutput(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/bbtk/src/bbcreaImageIOGimmick.xml_v2 b/bbtk/src/bbcreaImageIOGimmick.xml
similarity index 100%
rename from bbtk/src/bbcreaImageIOGimmick.xml_v2
rename to bbtk/src/bbcreaImageIOGimmick.xml
diff --git a/bbtk/src/bbcreaImageIOGimmick.xml_v1 b/bbtk/src/bbcreaImageIOGimmick.xml_v1
deleted file mode 100644
index 7d8f883..0000000
--- a/bbtk/src/bbcreaImageIOGimmick.xml_v1
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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>creaImageIOWxGimmickDialog.h</include>
- <!--========================================================================
-    INPUTS/OUTPUTS DECLARATION -->
-
-  <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,..."/>
-  <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::WxGimmickDialog w(0,
-                                  -1,
-                                  crea::std2wx(bbGetInputTitle()),
-                                  wxDefaultPosition,
-                                  wxSize(1200,800),
-                                  bbGetInputImageDimension(),
-                                  threads);
-   w.ShowModal();
-   
-   if (w.GetReturnCode() == wxID_OK)
-     {
-     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)
-     {
-//    if (bbGetOutputOut()!=0) 
-//     { 
- //       bbGetOutputOut()->Delete();    
-//          bbSetOutputOut(0);
-// }
-     }
-  </PRE></process>
-
- <!--======================================================================
-   CONSTRUCTORS / DESTRUCTORS (OPTIONAL) -->
-
-  <constructor><PRE> 
-    bbSetInputImageDimension(3);
-    bbSetInputTitle("Select image(s)");
-    bbSetInputOutput(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/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
new file mode 100644
index 0000000..5f2d1dc
--- /dev/null
+++ b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--==========================================================================
+   STARTS THE DESCRIPTION OF THE BLACK BOX -->
+<blackbox name="ImagesChooserDialogBox">
+  <!--========================================================================
+    THE BOX DOCUMENTATION -->
+  <author>cervenansky.frederic@creatis.insa-lyon.fr</author>
+  <description>
+    ImagesChooserDialogBox is a simple application to select file(s) or directory or data from Gimmick database and display them. It handles DICOM, jpg, tif, png, bmp and mhd."
+  </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>creaImageIOWxSimpleDlg.h</include>
+  <!--========================================================================
+    INPUTS/OUTPUTS DECLARATION -->
+
+  <input name="Title" type="std::string" description="Title of the dialog"/>
+  <typedef>
+    <PRE>
+      typedef std::vector<vtkImageData*> OutputImagesType;</PRE>
+  </typedef>
+
+  <output name="Out" type="OutputImagesType" description="The selected images"/>
+  
+  <!--========================================================================
+    PROCESS section -->
+
+  <process>
+    <PRE>
+      creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()));
+      dlg.ShowModal();
+      if (bbGetInputOutput()==0)
+      {
+         bbSetOutputOut( x.getImagesSelected());
+      }
+
+    </PRE>
+  </process>
+
+  <!--======================================================================
+   CONSTRUCTORS / DESTRUCTORS (OPTIONAL) -->
+
+  <constructor>
+    <PRE>
+      bbSetInputImageDimension(3);
+      bbSetInputTitle("Select image(s)");
+      bbSetInputOutput(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>
+