Merge remote-tracking branch 'origin/vtk8itk5wx3-mingw64' into vtk8itk5wx3-macos

[creaRigidRegistration.git] / lib / Transparency.cxx

diff --git a/lib/Transparency.cxx b/lib/Transparency.cxx
index 874968555fb68b43109df524653f919f25abfe5c..6b3549f281714ea1b7643454b745b7a1487c10d0 100644 (file)
--- a/lib/Transparency.cxx
+++ b/lib/Transparency.cxx
@@ -33,11 +33,11 @@
 //------------------------------------------------------------
 Transparency::Transparency()
 {
-       _image1=NULL;
-       _image2=NULL;
-       _percent=0;
-       _newImage = NULL;
-       _processed=false;
+       _image1         = NULL;
+       _image2         = NULL;
+       _percent        = 0;
+       _newImage       = NULL;
+       _processed      = false;
 }
 
 /*
@@ -52,36 +52,28 @@ Transparency::~Transparency()
 //------------------------------------------------------------
 void Transparency::calculateImage()
 {
-
        if(_image1!=NULL && _image2!=NULL)
        {
-
                // IMAGE 1
                        
                // Information from image1
                _image1->GetSpacing(spcImg1);
                _image1->GetExtent(extImg1);
                _type = _image1->GetScalarType();
-               
                // The Z dimension is 1 for a 2D image
                dimImg1[0] = extImg1[1] - extImg1[0]+1;
                dimImg1[1] = extImg1[3] - extImg1[2]+1;
                dimImg1[2] = 1;
-
                //IMAGE 2
-
                // Information from image2
                _image2->GetSpacing(spcImg2);
                _image2->GetExtent(extImg2);
-               
                // The Z dimension is 1 for a 2D image
                dimImg2[0] = extImg2[1] - extImg2[0]+1;
                dimImg2[1] = extImg2[3] - extImg2[2]+1;
                dimImg2[2] = 1;
-
                long numPixelsImg1 = dimImg1[0]*dimImg1[1];
-               long numPixelsImg2 = dimImg2[0]*dimImg2[1];
-               
+               long numPixelsImg2 = dimImg2[0]*dimImg2[1];             
                double factorX = 1;
                double factorY = 1;
                vtkImageResample *resample = vtkImageResample::New();
@@ -99,7 +91,6 @@ void Transparency::calculateImage()
                        resample->SetAxisMagnificationFactor(0,factorX);
                        resample->SetAxisMagnificationFactor(1,factorY);
                        resample->SetInformationInput(_image2);
-
                        initialize(dimImg2, spcImg2);
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
@@ -107,7 +98,6 @@ void Transparency::calculateImage()
 #else
                        resample->Update();
 #endif
-
                        result = resample->GetOutput();
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
@@ -116,10 +106,7 @@ void Transparency::calculateImage()
                        //...
 #endif
                        createImage(result,_image2,dimImg2[0],dimImg2[1]);              
-                       
-               } //if
-               else if (numPixelsImg1>numPixelsImg2)
-               {
+               } else if (numPixelsImg1>numPixelsImg2) {
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
                        resample->SetInput(_image2);
@@ -131,9 +118,7 @@ void Transparency::calculateImage()
                        resample->SetAxisMagnificationFactor(0,factorX);
                        resample->SetAxisMagnificationFactor(1,factorY);
                        resample->SetInformationInput(_image1);
-
                        initialize(dimImg1, spcImg1);
-
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
                        // ...
@@ -148,11 +133,8 @@ void Transparency::calculateImage()
 #else
                        result->Modified();
 #endif
-
                        createImage(_image1,result,dimImg1[0],dimImg1[1]);
-               } // else if
-               else
-               {
+               } else {
                        //If both images have the same number of pixels, the resultant image will have the 
                        //properties of the first image.
 //EED 2017-01-01 Migration VTK7
@@ -173,23 +155,18 @@ void Transparency::calculateImage()
 #else
                        resample->Update();
 #endif
-
                        result = resample->GetOutput();
-
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
                        result->Update();
 #else
                        result->Modified();
 #endif
-                       
                        createImage(_image1,result,dimImg1[0],dimImg1[1]);
-
                } //else
-               
                resample->Delete();             
                _processed=true;
-       }
+               }
 }
 
 void Transparency::initialize(int dimensions[], double spacing[])
@@ -206,28 +183,23 @@ void Transparency::initialize(int dimensions[], double spacing[])
 #else
        _newImage->AllocateScalars(_type,1);
 #endif
-
-
 }
 
 void Transparency::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX, int sizeY)
 {
-//     int i, j;  EED ???
-
        if(_type == VTK_CHAR)
        {
                //POINTERS: 
-               char* dataImagePointer1 = NULL;
-               char* dataImagePointer2 = NULL;
-               char* dataImageResultPointer = NULL;
-       
+               char* dataImagePointer1                 = NULL;
+               char* dataImagePointer2                 = NULL;
+               char* dataImageResultPointer    = NULL;
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
        }
        else if(_type == VTK_SIGNED_CHAR)
        {
                //POINTERS: 
-               signed char* dataImagePointer1 = NULL;
-               signed char* dataImagePointer2 = NULL;
+               signed char* dataImagePointer1          = NULL;
+               signed char* dataImagePointer2          = NULL;
                signed char* dataImageResultPointer = NULL;
        
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
@@ -235,27 +207,27 @@ void Transparency::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX
        else if(_type == VTK_UNSIGNED_CHAR)
        {
                //POINTERS: 
-               unsigned char* dataImagePointer1 = NULL;
-               unsigned char* dataImagePointer2 = NULL;
-               unsigned char* dataImageResultPointer = NULL;
+               unsigned char* dataImagePointer1                = NULL;
+               unsigned char* dataImagePointer2                = NULL;
+               unsigned char* dataImageResultPointer   = NULL;
        
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
        }
        else if(_type == VTK_SHORT)
        {
                //POINTERS: 
-               short* dataImagePointer1 = NULL;
-               short* dataImagePointer2 = NULL;
-               short* dataImageResultPointer = NULL;
+               short* dataImagePointer1                = NULL;
+               short* dataImagePointer2                = NULL;
+               short* dataImageResultPointer   = NULL;
        
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
        }
        else if(_type == VTK_UNSIGNED_SHORT)
        {
                //POINTERS: 
-               unsigned short* dataImagePointer1 = NULL;
-               unsigned short* dataImagePointer2 = NULL;
-               unsigned short* dataImageResultPointer = NULL;
+               unsigned short* dataImagePointer1               = NULL;
+               unsigned short* dataImagePointer2               = NULL;
+               unsigned short* dataImageResultPointer  = NULL;
        
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
        }
@@ -289,27 +261,27 @@ void Transparency::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX
        else if(_type == VTK_UNSIGNED_LONG)
        {
                //POINTERS: 
-               unsigned long* dataImagePointer1 = NULL;
-               unsigned long* dataImagePointer2 = NULL;
-               unsigned long* dataImageResultPointer = NULL;
+               unsigned long* dataImagePointer1                = NULL;
+               unsigned long* dataImagePointer2                = NULL;
+               unsigned long* dataImageResultPointer   = NULL;
        
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);              
        }
        else if(_type == VTK_FLOAT)
        {
                //POINTERS: 
-               float* dataImagePointer1 = NULL;
-               float* dataImagePointer2 = NULL;
-               float* dataImageResultPointer = NULL;
+               float* dataImagePointer1                = NULL;
+               float* dataImagePointer2                = NULL;
+               float* dataImageResultPointer   = NULL;
        
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
        }
        else if(_type == VTK_DOUBLE)
        {
                //POINTERS: 
-               double* dataImagePointer1 = NULL;
-               double* dataImagePointer2 = NULL;
-               double* dataImageResultPointer = NULL;
+               double* dataImagePointer1               = NULL;
+               double* dataImagePointer2               = NULL;
+               double* dataImageResultPointer  = NULL;
 
                createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
        }
@@ -320,15 +292,12 @@ void Transparency::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX
 #else
        _newImage->Modified();
 #endif
-
-
 }
 
 template <class T>
 void Transparency::createImageByType(T* dataImagePointer1, T* dataImagePointer2, T* dataImageResultPointer, vtkImageData *img1, vtkImageData *img2, int sizeX, int sizeY)
 {
        int i, j;
-       
        dataImagePointer1 = (T*) img1->GetScalarPointer(0,0,0);
        dataImagePointer2 = (T*) img2->GetScalarPointer(0,0,0);
        dataImageResultPointer = (T*) _newImage->GetScalarPointer(0,0,0);
@@ -339,12 +308,11 @@ void Transparency::createImageByType(T* dataImagePointer1, T* dataImagePointer2,
                        dataImagePointer1 = (T*)img1->GetScalarPointer(i,j,0);
                        dataImagePointer2 = (T*)img2->GetScalarPointer(i,j,0);
                        dataImageResultPointer = (T*)_newImage->GetScalarPointer(i,j,0);
-                       
                        *dataImageResultPointer = (T)*dataImagePointer1*_percent + (T)*dataImagePointer2*(1-_percent);                          
-               }
-       }
+               } // for h
+       } // for i
 }
-
+       
 /*
 * Get new image
 */