// Anciently started the threads ...
// Threads now automatically start at first image request
//mReader.Start();
-
+
}
//======================================================================
mReaderStarted=false;
}
//======================================================================
-
+
//======================================================================
/// Finalize
void GimmickView::Finalize()
/// 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]);
}
GimmickError("INTERNAL ERROR : GimmickView::UpdateTreeView : '"
<<t<<"' is not in TreeViewMap");
}
- i->second->UpdateLevel(l);
+ i->second->UpdateLevel(l);
}
+
//======================================================================
/// Clears the status and begins a new selection process
void GimmickView::ResetExtent()
valid=true;
}
-
//======================================================================
-
+
//======================================================================
bool ImageExtent::IsCompatible(const ImageExtent& ie)
{
}
//======================================================================
-
+
//======================================================================
void ImageExtent::Add(const ImageExtent& ie)
{
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
///Reads Images (Non Threaded)
void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vector<std::string> 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: "
- <<im.front()
- <<std::endl);
+ <<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)
- {
+ if (dimension == 2)
+ {
// n3D
std::vector<std::string>::iterator it;
for (it=im.begin(); it!=im.end(); ++it)
}
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);
+ //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;
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];
- imsize = imsize * dim[2] ; // deal with multiframes// JPR
+ imsize = imsize * dim[2] ; // deal with multiframes // JPR
//EED 03-11-2009
imsize = imsize * first->GetScalarSize();
- /*
- ( (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)
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*first->GetScalarSize());
+ memcpy(out->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize);
slice++;
}