#include <creaImageIOSystem.h>
#include "boost/filesystem.hpp"
-#include <gdcmSerieHelper.h> // JPR
-#include <gdcmFile.h> // JPR
-#include <vtkGdcmReader.h> // JPR
-#include <gdcmDebug.h>
+#if defined(USE_GDCM)
+#include <gdcmGlobal.h>
+#include <gdcmSerieHelper.h>
+#include <vtkGdcmReader.h>
+#endif
+
+#if defined(USE_GDCM2)
+#include <vtkGDCMImageReader.h>
+#endif
-namespace fs = boost::filesystem;
+namespace fs = boost::filesystem;
namespace creaImageIO
{
public:
ImageExtent(const std::string& x, const std::string& y, const std::string& z, const std::string& t)
{
- sscanf(x.c_str(),"%d",&mExtent[0]);
- sscanf(y.c_str(),"%d",&mExtent[1]);
- sscanf(z.c_str(),"%d",&mExtent[2]);
- sscanf(t.c_str(),"%d",&mExtent[3]);
- if(x==""){mExtent[0]=1;}
- if(y==""){mExtent[1]=1;}
- if(z==""){mExtent[2]=1;}
- if(t==""){mExtent[3]=1;}
-
- if (mExtent[3]>1) mDim=4;
- else if (mExtent[2]>1) mDim=3;
- else if (mExtent[1]>1) mDim=2;
- else if (mExtent[0]>1) mDim=1;
- else mDim=0;
+ sscanf(x.c_str(),"%d",&mExtent[0]);
+ sscanf(y.c_str(),"%d",&mExtent[1]);
+ sscanf(z.c_str(),"%d",&mExtent[2]);
+ sscanf(t.c_str(),"%d",&mExtent[3]);
+ if(x==""){mExtent[0]=1;}
+ if(y==""){mExtent[1]=1;}
+ if(z==""){mExtent[2]=1;}
+ if(t==""){mExtent[3]=1;}
+
+ if (mExtent[3]>1) mDim=4;
+ else if (mExtent[2]>1) mDim=3;
+ else if (mExtent[1]>1) mDim=2;
+ else if (mExtent[0]>1) mDim=1;
+ else mDim=0;
}
+
///Clears the extent
void Clear() { mExtent[0] = mExtent[1] = mExtent[2] = mExtent[3] = 1; }
// Anciently started the threads ...
// Threads now automatically start at first image request
//mReader.Start();
+
}
//======================================================================
}
+
//======================================================================
//======================================================================
///Reads Images (Non Threaded)
void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
{
-
+ mReader.Stop();
/* remember!
#define GIMMICK_NO_IMAGE_SELECTION 0
// Create the output data
if (im.size()==1)
{
- // O0.
+ vtkImageData * out=vtkImageData::New();
+ out->ShallowCopy(mReader.GetImage(im.front()));
+ s.push_back(out);
}
else if (im.size()>1) // Test inutile ? JPR
{
- // Read the FIRST image to get info ... about all the other ones. ?!? // JPR
vtkImageData* first = mReader.GetImage( im.front());
-
if (dimension == 2)
{
// n3D
s.push_back(out);
}
}
- else if (dimension == 3)
+ else
{
- // n*2D to 3D :: --> NON ! Ca va tres bien pour du 2D+T (le ZSpacing, on s'en tape)
- // // ne convient pas pour du n*2D a lire comme un 3D
- // // Il faut un gdcmSerieHelper !
+ // n*2D to 3D
vtkImageData* out = vtkImageData::New();
- out->CopyStructure(first);
+// out->CopyStructure(first);
out->SetScalarType(first->GetScalarType());
out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
int ext[6];
- //first->GetExtent(ext); // JPR
+ //first->GetExtent(ext); // JPR
first->GetWholeExtent(ext); // renvoie egalement 0,0 en Z // JPR
- // Normal :
if(ext[5] == 0)
{
}
out->SetExtent(ext);
- // LG : TODO : Z Spacing ? // Voir + loin // JPR
+ // LG : TODO : Z Spacing ?
int dim[3];
first->GetDimensions(dim);
// differents components 1..3 ex. jpg ->RGB 3
imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
- first->PrintSelf( std::cout , (vtkIndent)2);
// Order the file name vector
double spc[3];
- out->GetSpacing(spc);
+ first->GetSpacing(spc);
spc[2]=OrderTheFileNameVector(im);
+
out->SetSpacing(spc);
+
int slice = 0;
std::vector<std::string>::iterator it;
for (it=im.begin(); it!=im.end(); ++it)
{
- printf("EED GimmickView::ReadImagesNotThreaded %s \n", (*it).c_str() );
vtkImageData* cur = mReader.GetImage( (*it) );
memcpy(out->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize);
slice++;
}
//======================================================================
-
-double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
+#if defined(USE_GDCM)
+ double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
{
double spacing=1;
typedef std::vector<GDCM_NAME_SPACE::File* > FileList;
}
+#endif
+
+#if defined(USE_GDCM2)
+ // TO DO
+ double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
+ {
+ return 1;
+ }
+#endif
//======================================================================
if (dimension == 2)
{
// n3D
- std::vector<std::string>::iterator it;
+ std::vector<std::string>::iterator it;
for (it=im.begin(); it!=im.end(); ++it)
{
- std::cout << "----------------------------------------n3D" << std::endl;
vtkImageData* out = vtkImageData::New();
out->ShallowCopy(mReader.GetImage(*it));
s.push_back(out);
{
// n2D to 3D // NO!
// n *2D + T in a vector :
- std::cout << "---------------------------------------- n *2D + T" << std::endl;
+
std::vector<std::string>::iterator it;
for (it=im.begin(); it!=im.end(); ++it)
{
- std::cout << "---------------------------------------- [" << *it << "]" << std::endl;
- //vtkImageData* out = mReader.GetImage( (*it));
- //s.push_back(out);
- vtkImageData* out = vtkImageData::New();
- out->ShallowCopy(mReader.GetImage(*it));
+ vtkImageData* out = mReader.GetImage( (*it));
s.push_back(out);
}
}
void GimmickView::RequestReading(tree::Node* n,
int prio, int selection_index, boost::shared_ptr<ImagePointerHolder> p)
{
- if(!mReaderStarted)
- {
- mReader.Start();
- mReaderStarted=true;
- }
- ImageEventType t(n,selection_index);
- t.pointerHolder = p;
- mImageEventMap[n->GetAttribute("FullFileName")] = t;
- mReader.Request(this,n->GetAttribute("FullFileName"),prio);
+ if(!mReaderStarted)
+ {
+ mReader.Start();
+ mReaderStarted=true;
+ }
+ ImageEventType t(n,selection_index);
+ t.pointerHolder = p;
+ mImageEventMap[n->GetAttribute("FullFileName")] = t;
+ mReader.Request(this,n->GetAttribute("FullFileName"),prio);
}
//======================================================================
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff