#include <creaImageIOGimmickView.h>
#include <creaImageIOSystem.h>
-
#include "boost/filesystem.hpp"
namespace fs = boost::filesystem;
//======================================================================
// CTor
- GimmickView::GimmickView(Gimmick* gimmick, int threads)
+ GimmickView::GimmickView(boost::shared_ptr<Gimmick> gimmick, int threads)
: mGimmick(gimmick),
mReader(threads)
{
///
void GimmickView::Initialize()
{
- mImageExtent=0;
mReaderStarted=false;
}
//======================================================================
{
if(mImageExtent!=0)
{
- mImageExtent=0;
+ mImageExtent.reset();
}
valid=true;
}
}
}
+ //======================================================================
+ /// No selected image
+ bool GimmickView::NoValidateSelected ()
+ {
+ GimmickDebugMessage(2,"Validating selected"<<std::endl);
+ std::string mMessage;
+ mMessage="Cannot have 0 images selected!";
+ valid=false;
+ modifyValidationSignal(valid);
+ SetMessage(mMessage);
+ return valid;
+ }
+
//======================================================================
///Validates the dimension compliance of the images with the maximum and
///minimum given, and between their sizes
}
else
{
- ImageExtent* ie=new ImageExtent((*sel).GetAttribute("D0028_0010"),
+ boost::shared_ptr<ImageExtent> ie=boost::shared_ptr<ImageExtent>(new ImageExtent((*sel).GetAttribute("D0028_0010"),
(*sel).GetAttribute("D0028_0011"),
(*sel).GetAttribute("D0028_0012"),
- "");
+ ""));
if(mImageExtent==0)
{
mImageExtent=ie;
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;
mValidationSignal(ivalid);
}
-
//======================================================================
///Reads Images (Non Threaded)
-void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<std::string> im, int dimension)
+void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
{
-
// Create the output data
if (im.size()==1)
{
out->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)
{
// n3D
- std::vector<std::string>::iterator it;
+ std::vector<std::string>::iterator it;
for (it=im.begin(); it!=im.end(); ++it)
{
vtkImageData* out = vtkImageData::New();
out->SetScalarType(first->GetScalarType());
int ext[6];
first->GetExtent(ext);
- ext[5] = im.size();
- out->SetExtent(ext) -1;
+ 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();
int dim[3];
first->GetDimensions(dim);
- unsigned long imsize = dim[0] * dim[1];/*
+ unsigned long imsize = dim[0] * dim[1];
+ imsize = imsize * dim[2] ; // deal with multiframes// JPR
+
+ /*
( (unsigned long)first->GetScalarPointer(0,1,0)
- (unsigned long)first->GetScalarPointer(0,0,0))
*dim[1];*/
int slice = 0;
std::vector<std::string>::iterator it;
for (it=im.begin(); it!=im.end(); ++it)
- {
- //std::cout << "copying slice "<<slice <<std::endl;
- vtkImageData* cur = mReader.GetImage( (*it));
-
- void* src = cur->GetScalarPointer(0,0,0);
- void* dst = out->GetScalarPointer(0,0,slice);
- // std::cout << "src="<<src<<std::endl;
- // std::cout << "dst="<<dst<<std::endl;
- // std::cout << "siz="<<imsize<<std::endl;
- std::cout << slice;
- memcpy(dst,src,imsize);
+ {
+
+ 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++;
- }
+ }
s.push_back(out);
-
}
- }
+ }
+}
+ //======================================================================
+
+void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
+{
+ // Create the output data
+ if (im.size()==1)
+ {
+ // Only one image : give it
+ vtkImageData* out = vtkImageData::New();
+ GimmickDebugMessage(3, "State Check: Full Filename: "
+ <<im.front()
+ <<std::endl);
+ out->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<std::string>::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<std::string>::iterator it;
+ for (it=im.begin(); it!=im.end(); ++it)
+ {
+ vtkImageData* out = mReader.GetImage( (*it));
+ s.push_back(out);
+ }
+ }
+ }
}
//======================================================================
//======================================================================
///Requests the reading of an image
void GimmickView::RequestReading(tree::Node* n,
- int prio, int selection_index, ImagePointerHolder *p)
+ int prio, int selection_index, boost::shared_ptr<ImagePointerHolder> p)
{
if(!mReaderStarted)
{
mReader.Start();
mReaderStarted=true;
}
- ImageEventType t(n,selection_index, p);
+ ImageEventType t(n,selection_index);
+ t.pointerHolder = p;
mImageEventMap[n->GetAttribute("FullFileName")] = t;
mReader.Request(this,n->GetAttribute("FullFileName"),prio);
}
{
//What to do in this case?
/*
- GimmickDebugMessage(5,
+ GimmickDebugMessage(5,
"Pushing unknown image in queue"
<<std::endl);
- mImageEventQueue.push_back(ImageEventType(image));*/
+ mImageEventQueue.push_back(ImageEventType(image));*/
return;
}
ImageEventTypeMap::iterator i;
if (i!=mImageEventMap.end())
{
GimmickDebugMessage(5,
- "Putting image of file '"<<filename<<"' on pointer"
- <<std::endl);
+ "Putting image of file '"<<filename<<"' on pointer"
+ <<std::endl);
ImageEventType ie(i->second);
ie.image = image;
ie.pointerHolder->Set(ie.image);
ie.pointerHolder->Set(GetDefaultImage());
//mImageEventMap.erase(i);
}
-
}
}
void GimmickView::ConnectValidationObserver(ValidationCallbackType callback)
{
mValidationSignal.connect(callback);
- }
-
+ }
} // EO namespace creaImageIO
-
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff