X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=ca984309b7eaf5d5e5cb27d8f3110c929317dd28;hb=e7ba14e2a36189a6ba6d8490c2b4edf3be86f894;hp=afe11168d2d7b915a1d0375df93983512a83a75b;hpb=a1c63fa4c0c98ac09cacfd5258e2b873ee15fb83;p=creaImageIO.git diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp index afe1116..ca98430 100644 --- a/src/creaImageIOWxSimpleDlg.cpp +++ b/src/creaImageIOWxSimpleDlg.cpp @@ -1,8 +1,32 @@ +/* +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Santé) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ +*/ + #include "creaImageIOWxSimpleDlg.h" -#include "creaImageIOWxGimmickReaderDialog.h" -//#include -//#include -//#include + namespace creaImageIO { @@ -10,10 +34,10 @@ namespace creaImageIO ///Ctor WxSimpleDlg::WxSimpleDlg(wxWindow *parent, - wxString i_title, - const std::string i_namedescp , - const std::string i_namedb) - : wxDialog(parent, -1,_T("DISPLAY IMAGES"), wxDefaultPosition, wxSize(230,150)) + wxString i_title, + const std::string i_namedescp , + const std::string i_namedb) + : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(230,150)) { namedescp = i_namedescp; namedb = i_namedb; @@ -23,11 +47,11 @@ namespace creaImageIO this->SetTitle(i_title); } // Button to select file(s) - wxButton *fileBut = new wxButton(this, -1,_T("Select a single file to display"), wxPoint(10,7) ); + wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,7) ); Connect( fileBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadFile ); // Button to select directory - wxButton *directoryBut = new wxButton(this, -1,_T("Select a directory to display"), wxPoint(10,40) ); + wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,40) ); Connect( directoryBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadDirectory ); // button to select creaImageIO @@ -35,7 +59,7 @@ namespace creaImageIO Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); /// \TODO Button to select Bruker directory - + bInfo = false; Layout(); } @@ -54,16 +78,15 @@ namespace creaImageIO fileDlg->GetPaths(wxArray); if(wxArray.size() >0) { - /* typedef itk::Image< float, 4 > ImageType; - ReadImage(crea::wx2std(wxArray[0]).c_str());*/ - - infoimage=_T("FILE(s):")+wxArray[0]; + m_results.clear(); + infoimage = wxArray[0]; + infoimageSource = _T("FILE(s)"); std::vector files; for( int i = 0; i < wxArray.GetCount(); i++) { files.push_back( crea::wx2std(wxArray[i])); } - if(!m_view.readFile(files,m_results)) + if( !m_view.readFile(files , m_attrDicomTags , m_resultsDicomAtr , m_results) ) { //TO DO WARNING MESSAGE; } @@ -89,8 +112,10 @@ namespace creaImageIO resultShowModal = dirDlg->ShowModal(); if ( resultShowModal==wxID_OK ) { - infoimage=_T("DIRECTORY:")+dirDlg->GetPath(); - if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results)) + m_results.clear(); + infoimage = dirDlg->GetPath(); + infoimageSource = _T("DIRECTORY"); + if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results)) { //TO DO WARNING MESSAGE; } @@ -120,36 +145,49 @@ namespace creaImageIO dlg.ShowModal(); if (dlg.GetReturnCode() == wxID_OK) { - // infoimage=_T("DICOM: ???_EED_???"); -//EED 07JUIN2010 dlg.GetSelectedImages(m_results,3); - std::vector out; - std::vector attr; -// attr.push_back("D0028_0010"); -// attr.push_back("D0008_0023"); -// attr.push_back("D0008_1070"); dlg.stopReading(); - dlg.getSelected(out, attr,true,""); -// crea::VtkBasicSlicer(out.front().img); + + std::vector outStrGimmick; + dlg.getSelected(outStrGimmick, m_attrDicomTags,true,""); + m_results.clear(); - int size=out.size(); + int size=(int)outStrGimmick.size(); int ii; - for (ii=0;ii ???"); + infoimageSource = _T("GIMMICK"); dlg.OnExit(); } SetReturnCode( dlg.GetReturnCode() ); -// Close(); EndModal( dlg.GetReturnCode() ); } +//----------------------------------------------------------------------------- wxString WxSimpleDlg::getInfoImage() { return infoimage; } +//----------------------------------------------------------------------------- + wxString WxSimpleDlg::getInfoImageSource() + { + return infoimageSource; + } + ////////////////////////////////////////////////////////////////////// // Return the results vector // ////////////////////////////////////////////////////////////////////// @@ -157,5 +195,109 @@ namespace creaImageIO { return m_results; } -} + +//----------------------------------------------------------------------------- + std::vector< std::map > WxSimpleDlg::getDicomInfoImagesSelected() + { + return m_resultsDicomAtr; + } + +//----------------------------------------------------------------------------- + void WxSimpleDlg::SetAttrDicomTags( std::vector attr ) + { + m_attrDicomTags=attr; + } + + +//----------------------------------------------------------------------------- + vtkImageData* WxSimpleDlg::getVolumeSelected() + { + vtkImageData *result; + +// creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); +// dlg.SetAttrDicomTags( bbGetInputDicomTags() ); +// dlg.ShowModal(); +// bbSetOutputDicomInfo( dlg.getDicomInfoImagesSelected() ); + + if (getImagesSelected().size()!=0){ +// bbSetOutputFileName( std::string( dlg.getInfoImage().mb_str() ) ); + if(getImagesSelected().size() ==1) + { + result = getImagesSelected()[0] ; + } else { + // 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 = getImagesSelected()[0]; + int dim[3]; + first->GetDimensions(dim); + if (dim[2]==1) + { + vtkImageData *out; + out = vtkImageData::New(); + out->SetScalarType(first->GetScalarType()); + out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents()); + int ext[6]; + first->GetWholeExtent(ext); + if(ext[5] == 0) + { + ext[5] = getImagesSelected().size()-1; + } else { + ext[5] = ext[5] * getImagesSelected().size()-1; // to deal with multiframes + } // ext + out->SetExtent(ext); + double spac[3]; + first->GetDimensions(dim); + first->GetSpacing(spac); + if (spac[0]==spac[1]) + { + spac[2]=spac[0]; + } + out->SetSpacing(spac); + out->SetDimensions(dim[0], dim[1], getImagesSelected().size() ); + out->AllocateScalars(); + out->Update(); + unsigned long imsize = dim[0] * dim[1]; + imsize = imsize * dim[2]; // deal with multiframes here + // differents formats char , short, etc... + // differents components 1..3 ex. jpg ->RGB 3 + imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents(); + int slice,sizeImageVector=getImagesSelected().size(); + for (slice=0 ; sliceGetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize); + //img->Delete(); + } // for slice + +//EED This is NOT working. The iteration over the pointer vtkImageData +// int slice=0; +// std::vector::iterator it; +// for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) +// { +// memcpy(out->GetScalarPointer(0,0,slice), (*it)->GetScalarPointer(0,0,0), imsize); +// slice++; +// } +// //for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) +// //{ +// // (*it)->Delete(); +// //} + + result =out; + + } else { + result = first; + } // dim + } // if getImagesSelected size + } else { + result = NULL; + } // getImagesSelected().size()!=0 + + + return result; + + } + + + +} // namespace creaImageIO