X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.cpp;h=4cf4cb5be6f37bab2e910cdf4b509a49f8d8e104;hb=75a36cc2a5936be131f570520d4cc2f74bd0c548;hp=c8064d5f4312a8b946bef33e2182936e7456a288;hpb=415955d46ea550c344aa4d2215b8a790e348eb72;p=creaImageIO.git diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp index c8064d5..4cf4cb5 100644 --- a/src2/creaImageIOGimmickView.cpp +++ b/src2/creaImageIOGimmickView.cpp @@ -66,7 +66,7 @@ namespace creaImageIO // Anciently started the threads ... // Threads now automatically start at first image request //mReader.Start(); - + } //====================================================================== @@ -88,7 +88,7 @@ namespace creaImageIO mReaderStarted=false; } //====================================================================== - + //====================================================================== /// Finalize void GimmickView::Finalize() @@ -114,7 +114,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,22 +133,22 @@ 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() { if(mImageExtent!=0) { - // mImageExtent=0; + mImageExtent.reset(); } valid=true; } - //====================================================================== - + //====================================================================== bool ImageExtent::IsCompatible(const ImageExtent& ie) { @@ -163,7 +163,7 @@ namespace creaImageIO } //====================================================================== - + //====================================================================== void ImageExtent::Add(const ImageExtent& ie) { @@ -204,9 +204,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 +218,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,22 +254,20 @@ 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 { mMessage="The selected images are not compatible."; valid=false; } - } + } } - modifyValidationSignal(valid); SetMessage(mMessage); return valid; @@ -281,30 +279,41 @@ namespace creaImageIO mValidationSignal(ivalid); } - //====================================================================== ///Reads Images (Non Threaded) -void GimmickView::ReadImagesNotThreaded(std::vector& s,std::vector im, int dimension) +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) + } + 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; + std::vector::iterator it; for (it=im.begin(); it!=im.end(); ++it) { vtkImageData* out = vtkImageData::New(); @@ -314,14 +323,29 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s,std::vecto } else { - // n2D to 3D + // n*2D to 3D vtkImageData* out = vtkImageData::New(); out->CopyStructure(first); out->SetScalarType(first->GetScalarType()); int ext[6]; - first->GetExtent(ext); - ext[5] = im.size()-1; + //first->GetExtent(ext); // JPR + first->GetWholeExtent(ext); // renvoie egalement 0,0 en Z // JPR + +std::cout <<"in GimmickView::ReadImagesNotThreaded GetWholeExtent ext ="; +for (int jjj=0;jjj<6;jjj++) + std:cout << " [" << jjj << "]=" << ext[jjj]; +std::cout << std::endl; + + if(ext[5] == 0) + { + ext[5] = im.size()-1; + } + else + { + ext[5] = ext[5] * im.size()-1; // to deal with multiframes - JPR + } out->SetExtent(ext); + // LG : TODO : Z Spacing ? out->AllocateScalars(); @@ -331,32 +355,69 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s,std::vecto int dim[3]; first->GetDimensions(dim); - unsigned long imsize = dim[0] * dim[1];/* - ( (unsigned long)first->GetScalarPointer(0,1,0) - - (unsigned long)first->GetScalarPointer(0,0,0)) - *dim[1];*/ + unsigned long imsize = dim[0] * dim[1]; + imsize = imsize * dim[2] ; // deal with multiframes // JPR +//EED 03-11-2009 + imsize = imsize * first->GetScalarSize(); int slice = 0; std::vector::iterator it; for (it=im.begin(); it!=im.end(); ++it) - { - //std::cout << "copying slice "<GetScalarPointer(0,0,0); - void* dst = out->GetScalarPointer(0,0,slice); - // std::cout << "src="<ShallowCopy(mReader.GetImage(im.front())); + s.push_back( out ); + } + else if (im.size()>1) // Test inutile ? JPR + { + vtkImageData* first = mReader.GetImage( im.front()); + if (dimension == 2) + { + // n3D + std::vector::iterator it; + for (it=im.begin(); it!=im.end(); ++it) + { + vtkImageData* out = vtkImageData::New(); + out->ShallowCopy(mReader.GetImage(*it)); + s.push_back(out); + } + } + else + { + // n2D to 3D // NO! + // n *2D + T in a vector : + + std::vector::iterator it; + for (it=im.begin(); it!=im.end(); ++it) + { + vtkImageData* out = mReader.GetImage( (*it)); + s.push_back(out); + } + } + } } //====================================================================== @@ -391,10 +452,10 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s,std::vecto { //What to do in this case? /* - GimmickDebugMessage(5, + GimmickDebugMessage(5, "Pushing unknown image in queue" <& s,std::vecto if (i!=mImageEventMap.end()) { GimmickDebugMessage(5, - "Putting image of file '"<second); ie.image = image; ie.pointerHolder->Set(ie.image); @@ -445,7 +506,6 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s,std::vecto ie.pointerHolder->Set(GetDefaultImage()); //mImageEventMap.erase(i); } - } } @@ -455,9 +515,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s,std::vecto void GimmickView::ConnectValidationObserver(ValidationCallbackType callback) { mValidationSignal.connect(callback); - } - + } } // EO namespace creaImageIO -