#include "creaVtkUnMosaicVectorVtkImageData.h"
+#define _USE_MATH_DEFINES // for C
+#include <math.h>
+
creaVtkUnMosaicVectorVtkImageData::creaVtkUnMosaicVectorVtkImageData()
{
}
{
}
-std::vector<vtkImageData*> creaVtkUnMosaicVectorVtkImageData::unMosaicVectorVtkImageData (int NbImagesPerRow, int NbImagesInMosaic, std::vector<vtkImageData*> bbGetInputIn)
+std::vector<vtkImageData*> creaVtkUnMosaicVectorVtkImageData::unMosaicVectorVtkImageData (std::vector<vtkImageData*> imageInput, std::vector<int> NbImagesInMosaicVector)
{
- int nbImagesPerRow = NbImagesPerRow;
- int nbImagesInMosaic = NbImagesInMosaic;
+ std::vector<int> nbImagesPerRow;
+ std::vector<int> nbImagesInMosaic;
+ double imagesInMosaic;
+
+ for(int i = 0; i < NbImagesInMosaicVector.size(); i++)
+ {
+ imagesInMosaic = NbImagesInMosaicVector[i];
+ nbImagesPerRow.push_back( ceil(sqrt(imagesInMosaic)) );
+ nbImagesInMosaic.push_back(NbImagesInMosaicVector[i]);
+ }
- if (nbImagesPerRow == 0 || nbImagesInMosaic == 0)
+ if(imageInput.size() != NbImagesInMosaicVector.size())
+ {
+ for(int j = NbImagesInMosaicVector.size(); j < imageInput.size(); j++)
+ {
+ imagesInMosaic = NbImagesInMosaicVector[NbImagesInMosaicVector.size()-1];
+ nbImagesPerRow.push_back( ceil(sqrt(imagesInMosaic)) );
+ nbImagesInMosaic.push_back( NbImagesInMosaicVector[NbImagesInMosaicVector.size()-1] );
+ }
+ }
+
+ if (nbImagesPerRow.size() == 0 || nbImagesInMosaic.size() == 0)
{
std::cout << "VtkUnMosaicVectorVtkImageData ERROR: The number of Images by mosaic is not set " << std::endl;
}
- std::vector<vtkImageData*> imageIn = bbGetInputIn;
+ std::vector<vtkImageData*> imageIn = imageInput;
std::vector<vtkImageData*> mImageOut;
for (int i = 0 ; i < (unsigned int)imageIn.size() ; i++) {
- mImageOut.push_back( unMosaic(imageIn[i], NbImagesPerRow, NbImagesInMosaic) );
+ mImageOut.push_back( unMosaic(imageIn[i], nbImagesPerRow[i], nbImagesInMosaic[i]) );
}
return mImageOut;
int outputdims[3];
imageIn->GetDimensions (inputdims);
unsigned short *input = (unsigned short *)(imageIn->GetScalarPointer());
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
imageIn->Update();
+#else
+ imageIn->Modified();
+#endif
unsigned int div = (unsigned int)ceil(sqrt( (double)numberOfImagesInMosaic ) );
outputdims[0] = inputdims[0] / div;
vtkImageOut = vtkImageData::New();
vtkImageOut->SetDimensions( outputdims );
vtkImageOut->SetExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
vtkImageOut->SetWholeExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
vtkImageOut->SetNumberOfScalarComponents(1);
//vtkImageOut->SetSpacing( blabla );
vtkImageOut->SetScalarType( VTK_UNSIGNED_SHORT );
vtkImageOut->AllocateScalars();
vtkImageOut->Update();
-
+#else
+ vtkImageOut->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+#endif
+
+
unsigned short *output =(unsigned short *)(vtkImageOut->GetScalarPointer());
unsigned short *dest = output;