- static cast for signed unsigned comparisons

[STMS.git] / Lib / PrePostProcessing / itkSTMS_TemporalSetToImageSequence.txx

diff --git a/Lib/PrePostProcessing/itkSTMS_TemporalSetToImageSequence.txx b/Lib/PrePostProcessing/itkSTMS_TemporalSetToImageSequence.txx
index f5a00e9c08706091ca710fac3b5cf62e6a3c8c0d..c988bb7b821ce23edb88557b4ca76b01be6de67d 100755 (executable)
--- a/Lib/PrePostProcessing/itkSTMS_TemporalSetToImageSequence.txx
+++ b/Lib/PrePostProcessing/itkSTMS_TemporalSetToImageSequence.txx
@@ -138,13 +138,13 @@ itkSTMS_TemporalSetToImageSequence< ImageType, ClassImageType >
     for( unsigned int i=1 ; i<=stmsParameters->numTimePoints - stmsParameters->startTimePoint + 1; ++i )
     {
         char buffer[6];
-        int n;
+         // int n;
 
-        if( sizeof(STMS_NUMBERING_FORM_ONE) == 6 ) n=sprintf (buffer, "%05d", i + stmsParameters->startTimePoint - 1);
-        if( sizeof(STMS_NUMBERING_FORM_ONE) == 5 ) n=sprintf (buffer, "%04d", i + stmsParameters->startTimePoint - 1);
-        if( sizeof(STMS_NUMBERING_FORM_ONE) == 4 ) n=sprintf (buffer, "%03d", i + stmsParameters->startTimePoint - 1);
-        if( sizeof(STMS_NUMBERING_FORM_ONE) == 3 ) n=sprintf (buffer, "%02d", i + stmsParameters->startTimePoint - 1);
-        if( sizeof(STMS_NUMBERING_FORM_ONE) == 2 ) n=sprintf (buffer, "%01d", i + stmsParameters->startTimePoint - 1);
+        if( sizeof(STMS_NUMBERING_FORM_ONE) == 6 ) sprintf( buffer, "%05d", i + stmsParameters->startTimePoint - 1);
+        if( sizeof(STMS_NUMBERING_FORM_ONE) == 5 ) sprintf( buffer, "%04d", i + stmsParameters->startTimePoint - 1);
+        if( sizeof(STMS_NUMBERING_FORM_ONE) == 4 ) sprintf( buffer, "%03d", i + stmsParameters->startTimePoint - 1);
+        if( sizeof(STMS_NUMBERING_FORM_ONE) == 3 ) sprintf( buffer, "%02d", i + stmsParameters->startTimePoint - 1);
+        if( sizeof(STMS_NUMBERING_FORM_ONE) == 2 ) sprintf( buffer, "%01d", i + stmsParameters->startTimePoint - 1);
 
         outputPath = expDescription->experimentPath+expDescription->outputFolder+
                 expDescription->outputCommonRoot+
@@ -154,15 +154,12 @@ itkSTMS_TemporalSetToImageSequence< ImageType, ClassImageType >
                 "_R-"+std::to_string(stmsParameters->rScale)+"_"+
                 buffer+expDescription->outputImageExtension;
 
-        ImagePointer outImage
-                = ImageType::New();
-
+        ImagePointer outImage           = ImageType::New();
         outImage->SetRegions( region );
         outImage->Allocate();
         outImage->FillBuffer( 15.0 );
 
-        WriterPointer writer
-                = WriterType::New();
+        WriterPointer writer            = WriterType::New();
         writer->SetFileName( outputPath );
 
         //#pragma omp parrallel for ...
@@ -198,7 +195,7 @@ itkSTMS_TemporalSetToImageSequence< ImageType, ClassImageType >
 template < class ImageType, class ClassImageType>
 void
 itkSTMS_TemporalSetToImageSequence< ImageType, ClassImageType >
-::GenerateCSVFile()
+::GenerateCSVFile(const std::string &delimiter)
 {
     std::string CSVFilename = expDescription->experimentPath+expDescription->outputFolder+
             expDescription->outputCommonRoot+
@@ -207,15 +204,16 @@ itkSTMS_TemporalSetToImageSequence< ImageType, ClassImageType >
             "_Z-"+std::to_string((unsigned int)stmsParameters->spScales[2])+
             "_R-"+std::to_string(stmsParameters->rScale)+".csv";
 
-    std::cout << "Writing CSV File (classID, nb of pixels, values of time serie), : " << CSVFilename << std::endl;
+    std::cout << "Writing CSV File (classID, nb of pixels, values of time serie) : " << CSVFilename << std::endl;
     std::ofstream ofs;
     ofs.open (CSVFilename.c_str(), std::ofstream::out | std::ofstream::trunc);
 
     for(unsigned int j=0 ; j<rangeSet->size() ; ++j)
     {
-        ofs << j+1 <<", " << std::count (classSet->begin(), classSet->end(), j+1);
+        ofs << j+1 << delimiter << std::count (classSet->begin(), classSet->end(), j+1);
+        ofs << delimiter << stmsParameters->startTimePoint << delimiter << stmsParameters->numTimePoints;
         for( unsigned int i=1 ; i<=stmsParameters->numTimePoints - stmsParameters->startTimePoint + 1; ++i )
-           ofs << ", " << rangeSet->at(j)[i-1]*stmsParameters->rScale ;
+           ofs << delimiter << rangeSet->at(j)[i-1]*stmsParameters->rScale ;
         ofs << std::endl;
     }