X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=e750b912c185811e58608c261985f64daf97fee4;hb=7fe8cc3b940607846369ea5d10e2c2aaa6359862;hp=5bc3cd7a38195423fc05319efbdc84d1a2d127b9;hpb=517be64c97dd4af922cda7cd182a55cf56d6ac41;p=creaImageIO.git diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp index 5bc3cd7..e750b91 100644 --- a/src/creaImageIOWxSimpleDlg.cpp +++ b/src/creaImageIOWxSimpleDlg.cpp @@ -1,31 +1,65 @@ +/* +# --------------------------------------------------------------------- +# +# 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" + namespace creaImageIO { + ///Ctor - WxSimpleDlg::WxSimpleDlg(wxWindow *parent, wxString i_title) - : wxDialog(parent, -1,_T("DISPLAY IMAGES"), wxDefaultPosition, wxSize(230,150)) + WxSimpleDlg::WxSimpleDlg(wxWindow *parent, + 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; + if(!i_title.empty()) { this->SetTitle(i_title); } // Button to select file(s) - wxButton *fileBut = new wxButton(this, -1,_T("Select a 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 - wxButton *gimmickBut = new wxButton(this, -1,_T("Select Gimmick"), wxPoint(10,70) ); + wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,70) ); Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); /// \TODO Button to select Bruker directory - + bInfo = false; Layout(); } @@ -34,30 +68,34 @@ namespace creaImageIO ////////////////////////////////////////////////////////////////////// void WxSimpleDlg::OnReadFile(wxCommandEvent& event) { - wxFileDialog* FD = new wxFileDialog( 0, _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition); + int resultShowModal; + wxFileDialog* fileDlg = new wxFileDialog( 0, _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition); - if (FD->ShowModal()==wxID_OK) + resultShowModal = fileDlg->ShowModal(); + if ( resultShowModal==wxID_OK ) { wxArrayString wxArray; - FD->GetPaths(wxArray); + fileDlg->GetPaths(wxArray); if(wxArray.size() >0) { + m_results.clear(); + infoimage=_T("FILE(s):")+wxArray[0]; 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; } - } - else - { + } else { // TO DO WARNING MESSAGES } } - Close(); + SetReturnCode( resultShowModal ); +// Close(); + EndModal( resultShowModal ); } ////////////////////////////////////////////////////////////////////// @@ -66,17 +104,23 @@ namespace creaImageIO void WxSimpleDlg::OnReadDirectory(wxCommandEvent &event) { + int resultShowModal; long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; - wxDirDialog* FD = new wxDirDialog( 0, _T("Select the directory to display"), _T(""), style); + wxDirDialog* dirDlg = new wxDirDialog( 0, _T("Select the directory to display"), _T(""), style); - if (FD->ShowModal()==wxID_OK) + resultShowModal = dirDlg->ShowModal(); + if ( resultShowModal==wxID_OK ) { - if(! m_view.readDirectory(crea::wx2std(FD->GetPath()),m_results)) + m_results.clear(); + infoimage=_T("DIRECTORY:")+dirDlg->GetPath(); + if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results)) { //TO DO WARNING MESSAGE; } } - Close(); + SetReturnCode( resultShowModal ); +// Close(); + EndModal( resultShowModal ); } ////////////////////////////////////////////////////////////////////// @@ -86,8 +130,10 @@ namespace creaImageIO void WxSimpleDlg::OnReadGimmick(wxCommandEvent &event) { // Run Gimmick - WxGimmickReaderDialog dlg(0,-1, "localdatabase_Descriptor.dscp", - "Local Database", _T("Select image(s) - Gimmick! (c) CREATIS-LRMN 2008"), + WxGimmickReaderDialog dlg(0,-1, + namedescp, + namedb, + _T("Select image(s) - Gimmick! (c) CREATIS-LRMN 2008"), wxDefaultPosition, wxSize(810,750), GIMMICK_2D_IMAGE_SELECTION, @@ -97,12 +143,40 @@ namespace creaImageIO dlg.ShowModal(); if (dlg.GetReturnCode() == wxID_OK) { - dlg.GetSelectedImages(m_results,3); + dlg.stopReading(); + + std::vector outStrGimmick; + dlg.getSelected(outStrGimmick, m_attrDicomTags,true,""); + + m_results.clear(); + int size=(int)outStrGimmick.size(); + int ii; +// if(!bInfo) +// { + for (ii=0;ii > 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