2319 creaVtk Feature New Normal Change in box and lib UnMosaicVectorVtkImageData...

[creaVtk.git] / lib / creaVtk / creaVtkUnMosaicVectorVtkImageData.cpp

diff --git a/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp b/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp
index 2392af91642cb4eb33135818c02851048b63b8e6..59a5235a62d63db06fde945bb140f65f683313b2 100644 (file)
--- a/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp
+++ b/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp
@@ -26,7 +26,7 @@
 */
 
 #include "creaVtkUnMosaicVectorVtkImageData.h"
-
+#include <math.h>
 creaVtkUnMosaicVectorVtkImageData::creaVtkUnMosaicVectorVtkImageData()
 {
 }
@@ -35,20 +35,33 @@ 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;
+
+       for(int i = 0; i < NbImagesInMosaicVector.size(); i++){
+               nbImagesInMosaic.push_back(NbImagesInMosaicVector[i]);
+               nbImagesPerRow.push_back( ceil(sqrt(NbImagesInMosaicVector[i])) );
+       }
 
-  if (nbImagesPerRow == 0 || nbImagesInMosaic == 0) {
-               std::cout << "Not possible" << std::endl; 
+       if(imageInput.size() != NbImagesInMosaicVector.size()){
+               for(int j = NbImagesInMosaicVector.size(); j < imageInput.size(); j++)  {       
+                       nbImagesInMosaic.push_back( NbImagesInMosaicVector[NbImagesInMosaicVector.size()-1] );
+                       nbImagesPerRow.push_back( ceil(sqrt(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;       
@@ -85,10 +98,13 @@ vtkImageData * creaVtkUnMosaicVectorVtkImageData::unMosaic(vtkImageData *imageIn
     int dimYImageElem = outputdims[1];
     int lgrImage = dimXImageElem*dimYImageElem;
     int debImage;
-    for (int i=0; i<numberOfImagesInMosaic; i++)
+    int i,j;
+//    for (i=0; i<numberOfImagesInMosaic; i++)
+      for (i=numberOfImagesInMosaic-1; i>=0; i--)
     {
        debImage=(i/nbImagesPerRow) * lgrImage*nbImagesPerRow + (i%nbImagesPerRow)*dimXImageElem;
-       for(int j=0; j<dimYImageElem; j++)
+       for(j=0; j<dimYImageElem; j++)
+//       for(int j=dimYImageElem-1; j>=0; j--)
        {
           memcpy(dest, input+debImage, dimXImageElem*sizeof(unsigned short));
           debImage += dimXImageElem*nbImagesPerRow;