#2469 creaVtk Bug New Normal windows compilation conflit witn math.h definitions

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

diff --git a/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp b/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp
index 2e7847c5c8141a423c6e897d74951750a262aafa..3609557e26bdedac789b54c255b7c1809a0a4daf 100644 (file)
--- a/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp
+++ b/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp
@@ -27,6 +27,9 @@
 
 #include "creaVtkUnMosaicVectorVtkImageData.h"
 
+#define _USE_MATH_DEFINES // for C
+#include <math.h>
+
 creaVtkUnMosaicVectorVtkImageData::creaVtkUnMosaicVectorVtkImageData()
 {
 }
@@ -35,21 +38,39 @@ 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;