/// 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]);
}
}
i->second->UpdateLevel(l);
}
+
//======================================================================
/// Clears the status and begins a new selection process
void GimmickView::ResetExtent()
valid=true;
}
-
//======================================================================
//======================================================================
else
{
boost::shared_ptr<ImageExtent> ie=boost::shared_ptr<ImageExtent>(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;
{
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;
}
}
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;
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)
{
// Only one image : give it
vtkImageData* out = vtkImageData::New();
GimmickDebugMessage(3, "State Check: Full Filename: "
- <<im.front()
- <<std::endl);
+ <<im.front()
+ <<std::endl);
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)
+ 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->CopyStructure(first);
out->SetScalarType(first->GetScalarType());
int ext[6];
- first->GetExtent(ext);
- ext[5] = im.size()-1;
+ //first->GetExtent(ext); // JPR
+ first->GetWholeExtent(ext);
+std::cout <<"in GimmickView::ReadImagesNotThreaded GetWholeExtent ext =";
+for (int jjj=0;jjj<6;jjj++)
+ std:cout << " [" << jjj << "]=" << ext[jjj];
+std::cout << 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 ?
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<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);
+ }
+ }
+ }
}
//======================================================================
{
//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