X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.cpp;h=d990cb56b942e509197655e39841dd74c612c30a;hb=b0843014c5482f70050fab8036c6780172e3b6c9;hp=46ab5643d04fd73baae7da439846cef77cd3dbbd;hpb=6ce1377c642f91e9b173b8a5440543eb5320fcd5;p=creaImageIO.git diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp index 46ab564..d990cb5 100644 --- a/src2/creaImageIOGimmickView.cpp +++ b/src2/creaImageIOGimmickView.cpp @@ -1,7 +1,9 @@ #include #include #include "boost/filesystem.hpp" - +#include +#include +#include namespace fs = boost::filesystem; namespace creaImageIO @@ -66,7 +68,7 @@ namespace creaImageIO // Anciently started the threads ... // Threads now automatically start at first image request //mReader.Start(); - + } //====================================================================== @@ -88,7 +90,7 @@ namespace creaImageIO mReaderStarted=false; } //====================================================================== - + //====================================================================== /// Finalize void GimmickView::Finalize() @@ -114,7 +116,7 @@ namespace creaImageIO /// Create a tree view with a given name void GimmickView::CreateSingleTreeView(std::string &i_name) { - this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]); + this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]); } @@ -133,8 +135,9 @@ namespace creaImageIO GimmickError("INTERNAL ERROR : GimmickView::UpdateTreeView : '" <second->UpdateLevel(l); + i->second->UpdateLevel(l); } + //====================================================================== /// Clears the status and begins a new selection process void GimmickView::ResetExtent() @@ -146,9 +149,8 @@ namespace creaImageIO valid=true; } - //====================================================================== - + //====================================================================== bool ImageExtent::IsCompatible(const ImageExtent& ie) { @@ -163,7 +165,7 @@ namespace creaImageIO } //====================================================================== - + //====================================================================== void ImageExtent::Add(const ImageExtent& ie) { @@ -204,9 +206,9 @@ namespace creaImageIO else { boost::shared_ptr ie=boost::shared_ptr(new ImageExtent((*sel).GetAttribute("D0028_0010"), - (*sel).GetAttribute("D0028_0011"), - (*sel).GetAttribute("D0028_0012"), - "")); + (*sel).GetAttribute("D0028_0011"), + (*sel).GetAttribute("D0028_0012"), + "")); if(mImageExtent==0) { mImageExtent=ie; @@ -218,7 +220,7 @@ namespace creaImageIO { std::stringstream out; out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected"; - mMessage = out.str(); + mMessage = out.str(); mImageExtent->SetDimension(2); valid=true; } @@ -254,10 +256,10 @@ namespace creaImageIO } else { - mImageExtent->Add(*ie); - std::stringstream out; - out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected"; - mMessage = out.str(); + mImageExtent->Add(*ie); + std::stringstream out; + out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected"; + mMessage = out.str(); } } else @@ -283,22 +285,29 @@ namespace creaImageIO ///Reads Images (Non Threaded) void GimmickView::ReadImagesNotThreaded(std::vector& s, std::vector im, int dimension) { + +/* remember! + +#define GIMMICK_NO_IMAGE_SELECTION 0 +#define GIMMICK_2D_IMAGE_SELECTION 2 +#define GIMMICK_3D_IMAGE_SELECTION 3 +#define GIMMICK_4D_IMAGE_SELECTION 4 + +#define NATIVE 0 +#define _2D 2 +#define _3D 3 + +*/ // Create the output data if (im.size()==1) - { - // Only one image : give it - vtkImageData* out = vtkImageData::New(); - GimmickDebugMessage(3, "State Check: Full Filename: " - <ShallowCopy(mReader.GetImage(im.front())); - s.push_back( out ); - } - else if (im.size()>1) // Test inutile ? JPR + { + // O0. + } + else if (im.size()>1) // Test inutile ? JPR { vtkImageData* first = mReader.GetImage( im.front()); - if (dimension == 2) - { + if (dimension == 2) + { // n3D std::vector::iterator it; for (it=im.begin(); it!=im.end(); ++it) @@ -310,12 +319,15 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s, std::vect } else { - // n2D to 3D + // n*2D to 3D vtkImageData* out = vtkImageData::New(); out->CopyStructure(first); out->SetScalarType(first->GetScalarType()); + out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents()); int ext[6]; - first->GetExtent(ext); + //first->GetExtent(ext); // JPR + first->GetWholeExtent(ext); // renvoie egalement 0,0 en Z // JPR + if(ext[5] == 0) { ext[5] = im.size()-1; @@ -325,40 +337,99 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s, std::vect ext[5] = ext[5] * im.size()-1; // to deal with multiframes - JPR } out->SetExtent(ext); - // LG : TODO : Z Spacing ? - - out->AllocateScalars(); - //first->Print(std::cout); - // out->Print(std::cout); + // LG : TODO : Z Spacing ? int dim[3]; first->GetDimensions(dim); + + out->SetDimensions(dim[0], dim[1], im.size() ); + out->AllocateScalars(); + out->Update(); + unsigned long imsize = dim[0] * dim[1]; - imsize = imsize * dim[2] ; // deal with multiframes// JPR + imsize = imsize * dim[2] ; // deal with multiframes // JPR - /* - ( (unsigned long)first->GetScalarPointer(0,1,0) - - (unsigned long)first->GetScalarPointer(0,0,0)) - *dim[1];*/ +//EED 03-11-2009 + // differents formats char , short, etc... + // differents components 1..3 ex. jpg ->RGB 3 + imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents(); + + + // Order the file name vector + + double spc[3]; + out->GetSpacing(spc); + spc[2]=OrderTheFileNameVector(im); + out->SetSpacing(spc); int slice = 0; std::vector::iterator it; + for (it=im.begin(); it!=im.end(); ++it) { - - vtkImageData* cur = mReader.GetImage( (*it)); - // void* src = cur->GetScalarPointer(0,0,0); - // void* dst = out->GetScalarPointer(0,0,slice); - memcpy(out->GetScalarPointer(0,0,slice),cur->GetScalarPointer(0,0,0),imsize); - - slice++; + vtkImageData* cur = mReader.GetImage( (*it) ); + memcpy(out->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize); + slice++; } s.push_back(out); + + } // dimension == 3 + + } // size >1 + +} + //====================================================================== + + +double GimmickView::OrderTheFileNameVector(std::vector &im) +{ + double spacing=1; + typedef std::vector FileList; + FileList fileVector; + //GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New(); + GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New(); + std::vector lstAux; + std::vector::iterator it; + for (it=im.begin(); it!=im.end(); ++it) + { + ///\TODO liberer les GDCM_NAME_SPACE::File a la fin! // JPR + GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New(); + f->SetFileName(*it); + f->Load(); + if (f->IsReadable()) + { + fileVector.push_back(f); + } else { + lstAux.push_back(*it); } + } // for + + + if ((fileVector.size()>1) && (sh->IsCoherent( &fileVector ))) + { + sh->OrderFileList(&fileVector); + spacing= sh->GetZSpacing(); + im.clear(); + int i; + for (i=0; iGetFileName() ); + } + for (i=0; i& s, std::vector im, int dimension) {