X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FcreaVtkUnMosaicVectorVtkImageData.cpp;h=3609557e26bdedac789b54c255b7c1809a0a4daf;hb=baedf84edee0776111219f64436cc08803ed14c3;hp=c3334e9d1ed5ce08ceca573cc8ec3e3ed862e734;hpb=215f2f66f351e645b81a2451e3318a8e07ea7c3e;p=creaVtk.git diff --git a/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp b/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp index c3334e9..3609557 100644 --- a/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp +++ b/lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp @@ -26,7 +26,10 @@ */ #include "creaVtkUnMosaicVectorVtkImageData.h" + +#define _USE_MATH_DEFINES // for C #include + creaVtkUnMosaicVectorVtkImageData::creaVtkUnMosaicVectorVtkImageData() { } @@ -39,15 +42,21 @@ std::vector creaVtkUnMosaicVectorVtkImageData::unMosaicVectorVtkI { std::vector nbImagesPerRow; std::vector nbImagesInMosaic; + double imagesInMosaic; - for(int i = 0; i < NbImagesInMosaicVector.size(); i++){ - nbImagesPerRow.push_back( ceil(sqrt(NbImagesInMosaicVector[i])) ); + for(int i = 0; i < NbImagesInMosaicVector.size(); i++) + { + imagesInMosaic = NbImagesInMosaicVector[i]; + nbImagesPerRow.push_back( ceil(sqrt(imagesInMosaic)) ); nbImagesInMosaic.push_back(NbImagesInMosaicVector[i]); } - if(imageInput.size() != NbImagesInMosaicVector.size()){ - for(int j = NbImagesInMosaicVector.size(); j < imageInput.size(); j++) { - nbImagesPerRow.push_back( ceil(sqrt(NbImagesInMosaicVector[NbImagesInMosaicVector.size()-1])) ); + 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] ); } }