2188 creaImageIO Feature New Normal ImagesChooserDialog Box return DICOM tags maps

diff --git a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
index 9c074739974905f80c56bc69b31866d7d930d969..e24073865f121bf5539f7d2265f750cf81348c06 100644 (file)
--- a/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
+++ b/bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
@@ -45,13 +45,33 @@
     INPUTS/OUTPUTS DECLARATION -->
 
   <input name="Title" type="std::string" description="Title of the dialog"/>
+
+
+
   <typedef>
     <PRE>
-      typedef std::vector<vtkImageData*> OutputImagesType;</PRE>
+      typedef std::vector<std::string> VectorStringType;</PRE>
   </typedef>
+  <input name="DicomTags" type="VectorStringType" description="Dicom Tags"/>
 
+  <typedef>
+    <PRE>
+      typedef std::vector<vtkImageData*> OutputImagesType;</PRE>
+  </typedef>
   <output name="Out" type="vtkImageData*" description="The selected image"/>
   <output name="OutImages" type="OutputImagesType" description="Vector of selected images"/>
+
+  <typedef>
+    <PRE>
+      typedef std::map<std::string, std::string> MapInfoDicom;</PRE>
+  </typedef>
+
+  <typedef>
+    <PRE>
+      typedef std::vector< MapInfoDicom > VectorMapInfoDicom;</PRE>
+  </typedef>
+
+  <output name="DicomInfo" type="VectorMapInfoDicom" description="Map of Dicom tags"/>
   
   <!--========================================================================
     PROCESS section -->
@@ -60,12 +80,12 @@
     <PRE>
         creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); 
                dlg.ShowModal(); 
+                bbSetOutputDicomInfo( dlg.getDicomInfoImagesSelected() );
                if (dlg.getImagesSelected().size()!=0){ 
                  if(dlg.getImagesSelected().size() ==1)
                  {
                        bbSetOutputOut( dlg.getImagesSelected()[0] );  
                  } else {
-printf("EED  creaImageIOWxSimpleDlg 1 \n");
                          // FCY: it will be a big problem if we have several kind of data in the same folder.
                          // creation of a huge vtkImageData!!!!
                          vtkImageData* first = dlg.getImagesSelected()[0];
@@ -101,11 +121,9 @@ printf("EED  creaImageIOWxSimpleDlg 1 \n");
                                // differents formats char , short, etc...
                                // differents components 1..3  ex. jpg ->RGB 3
                                imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
-printf("EED  creaImageIOWxSimpleDlg 2 \n");
                                int slice,sizeImageVector=dlg.getImagesSelected().size();
                                for (slice=0 ; slice<sizeImageVector ; slice++)
                                {
-printf("EED  creaImageIOWxSimpleDlg 3 slice %d     sizeImageVector %d\n",slice,sizeImageVector);
                                        vtkImageData *img = dlg.getImagesSelected()[slice];
                                        memcpy(out->GetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize);
                                //img->Delete();
@@ -124,7 +142,6 @@ printf("EED  creaImageIOWxSimpleDlg 3 slice %d     sizeImageVector %d\n",slice,s
 //                     //      (*it)->Delete();
 //                     //  }
 
-printf("EED  creaImageIOWxSimpleDlg 4 \n");
                                bbSetOutputOut(out);
                        } else {
                         bbSetOutputOut(first);

diff --git a/src/creaImageIOVtkImageReader.cpp b/src/creaImageIOVtkImageReader.cpp
index 60ef13a8bfa0e087e95669378881d07a1309df4a..6cb4defb1656b9109d86d7e1bee3b0617e6ce7f4 100644 (file)
--- a/src/creaImageIOVtkImageReader.cpp
+++ b/src/creaImageIOVtkImageReader.cpp
@@ -43,7 +43,7 @@ namespace creaImageIO{
   {
          
        //EED 21 mars 2012  FLIP probleme  ..PLOP..
-       mReader->FileLowerLeftOn();
+       mReader->FileLowerLeftOff();
          
     if (name.size() == 0) 
       {
@@ -98,13 +98,56 @@ namespace creaImageIO{
     vtkImageData* im = 0;
     try
       {
-       
-       mReader->SetFileName(filename.c_str());
+       printf("EED VtkImageReader::ReadImage  Name:%s\n", GetName().c_str() );
+       mReader->SetFileName( filename.c_str() );
        mReader->Update();
        im = vtkImageData::New();
-        mReader->FileLowerLeftOff();
+
        im->ShallowCopy(mReader->GetOutput());
-printf("EED VtkImageReader::ReadImage GetFileLowerLeft %d\n" , mReader->GetFileLowerLeft() );
+
+
+printf("EED ......\n"); 
+printf("EED ......\n");
+printf("EED VtkImageReader::ReadImage line 108   Missing FlipImage for JPEG, PNG, etc\n");
+printf("EED ......\n"); 
+printf("EED ......\n"); 
+/*
+        im=FlipImageY(im);          
+
+       if ( (GetName()=="JPEG") || (GetName()=="PNG") )
+       {
+
+               im->Update();
+               int inputdims[3];
+               im->GetDimensions (inputdims);
+
+                int nbScalComp = im->GetNumberOfScalarComponents();
+               int scalarSize  = im->GetScalarSize();
+               int lineSize    = inputdims[0]*scalarSize*nbScalComp;      
+               int planeSize   = inputdims[1]*lineSize;
+                int volumeSize  = inputdims[2]*planeSize;
+               char *pixelsIn  = (char *)im->GetScalarPointer();
+               char *pixelsOut = (char *)mImageOut->GetScalarPointer();
+       
+               char *lineIn;
+               char *lineOut;
+               char *debPlanIn;
+               char *debPlanOut;
+               int i,j,k;
+
+               for(k=0; k<inputdims[2]; k++)  // iterate  planes
+                       {  
+                               debPlanIn       = pixelsIn+k*planeSize;
+                               debPlanOut      = pixelsOut+k*planeSize;
+                               for(j=0; j<inputdims[1]; j++)  // iterates  rows
+                               { 
+                                       lineIn = debPlanIn+j*lineSize;
+                                       lineOut = debPlanOut+(inputdims[1]-1-j)*lineSize;
+                                       memcpy(lineOut,  lineIn, lineSize);
+                               }       // for j
+                       } // for k
+       } // FLIP : JPEG PNG
+*/
       }
     catch (...)
       {

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index db55ad1ca0208959a417f679459d7800ce83cf3f..6a6621eea98acaefeff1f8e0838fa7e37f726ae9 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -143,27 +143,39 @@ namespace creaImageIO
                 dlg.ShowModal();
                 if (dlg.GetReturnCode() == wxID_OK)
             {
-                       std::vector<creaImageIO::OutStrGimmick> out;
-                       std::vector<std::string> attr;
                                dlg.stopReading();
-                               dlg.getSelected(out, attr,true,"");
+
+                               std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+                               std::vector<std::string>                attrDicomTags;
+
+                                  attrDicomTags.push_back("D0028_0010");
+                                  attrDicomTags.push_back("D0008_0023");
+                                  attrDicomTags.push_back("D0008_1070");
+                                  attrDicomTags.push_back("D0019_100e");
+
+                               dlg.getSelected(outStrGimmick, attrDicomTags,true,"");
+
                        m_results.clear();
-                       int size=(int)out.size();
+                       int size=(int)outStrGimmick.size();
                        int ii;
-                       if(!bInfo)
-                       {
+//                     if(!bInfo)
+//                     {
                                for (ii=0;ii<size;ii++)
                                {
-                                       m_results.push_back(out[ii].img);
+                                       m_results.push_back(outStrGimmick[ii].img);
+                                       printf("EED WxSimpleDlg::OnReadGimmick D0028_0010 %s\n", outStrGimmick[ii].infos.find("D0028_0010")->second.c_str() );
+                                       printf("EED WxSimpleDlg::OnReadGimmick D0008_0023 %s\n", outStrGimmick[ii].infos.find("D0008_0023")->second.c_str() );
+                                       printf("EED WxSimpleDlg::OnReadGimmick D0008_1070 %s\n", outStrGimmick[ii].infos.find("D0008_1070")->second.c_str() );
+                                       printf("EED WxSimpleDlg::OnReadGimmick D0019_100e %s\n", outStrGimmick[ii].infos.find("D0019_100e")->second.c_str() );
+                                       m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
                                }
-                       }
-                       else
-                       {
-                               for (ii=0;ii<size;ii++)
-                               {
-                                       m_resultsInfo.push_back(out[ii]);
-                               }
-                       }
+//                     } else {
+//                             for (ii=0;ii<size;ii++)
+//                             {
+//                                     m_resultsInfo.push_back(outStrGimmick[ii]);
+//                             }
+//                     }
+
                        dlg.OnExit();
                 }
                 SetReturnCode( dlg.GetReturnCode() );
@@ -183,6 +195,11 @@ namespace creaImageIO
                  return m_results;
          }
 
+       std::vector< std::map<std::string, std::string> >  WxSimpleDlg::getDicomInfoImagesSelected()
+       {
+               return m_resultsDicomAtr;
+       }
+
          
 }
 

diff --git a/src/creaImageIOWxSimpleDlg.h b/src/creaImageIOWxSimpleDlg.h
index 7fd3335ffe1893fa33038c475592f890ad20b1a3..87412589e3b22225343dc2ae04e11436c652d7e7 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.h
+++ b/src/creaImageIOWxSimpleDlg.h
@@ -58,9 +58,11 @@ namespace creaImageIO
 
                   /// return a vtkImageData vector of selected images, if available
                   std::vector<vtkImageData*> getImagesSelected();
-               
                   wxString getInfoImage();
 
+                  std::vector< std::map<std::string,std::string> >  getDicomInfoImagesSelected();
+
+
                   void setInfo(bool i_val){bInfo = i_val;}
                   
                   // OutStrGimmick:
@@ -69,19 +71,19 @@ namespace creaImageIO
                   std::vector<creaImageIO::OutStrGimmick> getMapInfos(){return m_resultsInfo;}
 
        private:
-               bool                                    bInfo;
-               std::string                             namedescp; 
-               std::string                             namedb;
-               wxString                                infoimage;
+               bool                                                    bInfo;
+               std::string                                             namedescp; 
+               std::string                                             namedb;
+               wxString                                                infoimage;
 
                /// interface to read data
-               SimpleView                              m_view;
+               SimpleView                                              m_view;
 
                /// vtkImageData vector
-               std::vector<vtkImageData*>              m_results;
+               std::vector<vtkImageData*>                              m_results;
+               std::vector< std::map<std::string,std::string> >        m_resultsDicomAtr;
 
                std::vector<creaImageIO::OutStrGimmick> m_resultsInfo;
                
-
        };
 }