From: Eduardo DAVILA Date: Thu, 30 Jul 2020 13:21:30 +0000 (+0200) Subject: #3463 creaRigid Registration Bug New Normal - Clean comments transparency X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=64b196583562fdfeb19e60c79ac19558dbd39bb9;p=creaRigidRegistration.git #3463 creaRigid Registration Bug New Normal - Clean comments transparency --- diff --git a/lib/Transparency.cxx b/lib/Transparency.cxx index 1855283..6b3549f 100644 --- a/lib/Transparency.cxx +++ b/lib/Transparency.cxx @@ -52,11 +52,8 @@ Transparency::~Transparency() //------------------------------------------------------------ void Transparency::calculateImage() { -printf("EED Transparency::calculateImage Start\n"); if(_image1!=NULL && _image2!=NULL) { -printf("EED Transparency::calculateImage 1\n"); - // IMAGE 1 // Information from image1 @@ -81,7 +78,6 @@ printf("EED Transparency::calculateImage 1\n"); double factorY = 1; vtkImageResample *resample = vtkImageResample::New(); vtkImageData *result; -printf("EED Transparency::calculateImage 2\n"); if(numPixelsImg1Update(); #endif -printf("EED Transparency::calculateImage 3\n"); result = resample->GetOutput(); //EED 2017-01-01 Migration VTK7 #if VTK_MAJOR_VERSION <= 5 @@ -112,7 +107,6 @@ printf("EED Transparency::calculateImage 3\n"); #endif createImage(result,_image2,dimImg2[0],dimImg2[1]); } else if (numPixelsImg1>numPixelsImg2) { -printf("EED Transparency::calculateImage 4\n"); //EED 2017-01-01 Migration VTK7 #if VTK_MAJOR_VERSION <= 5 resample->SetInput(_image2); @@ -139,11 +133,8 @@ printf("EED Transparency::calculateImage 4\n"); #else result->Modified(); #endif -printf("EED Transparency::calculateImage 4.1\n"); createImage(_image1,result,dimImg1[0],dimImg1[1]); -printf("EED Transparency::calculateImage 4.2\n"); } else { -printf("EED Transparency::calculateImage 5\n"); //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 @@ -172,15 +163,10 @@ printf("EED Transparency::calculateImage 5\n"); result->Modified(); #endif createImage(_image1,result,dimImg1[0],dimImg1[1]); -printf("EED Transparency::calculateImage 6\n"); } //else resample->Delete(); _processed=true; -printf("EED Transparency::calculateImage 7\n"); - } - -printf("EED Transparency::calculateImage End\n"); - + } } void Transparency::initialize(int dimensions[], double spacing[]) @@ -201,11 +187,8 @@ void Transparency::initialize(int dimensions[], double spacing[]) void Transparency::createImage(vtkImageData *img1, vtkImageData *img2, int sizeX, int sizeY) { -printf("EED Transparency::createImage Start\n"); -// int i, j; EED ??? if(_type == VTK_CHAR) { -printf("EED Transparency::createImage 1\n"); //POINTERS: char* dataImagePointer1 = NULL; char* dataImagePointer2 = NULL; @@ -214,7 +197,6 @@ printf("EED Transparency::createImage 1\n"); } else if(_type == VTK_SIGNED_CHAR) { -printf("EED Transparency::createImage 2\n"); //POINTERS: signed char* dataImagePointer1 = NULL; signed char* dataImagePointer2 = NULL; @@ -224,7 +206,6 @@ printf("EED Transparency::createImage 2\n"); } else if(_type == VTK_UNSIGNED_CHAR) { -printf("EED Transparency::createImage 3\n"); //POINTERS: unsigned char* dataImagePointer1 = NULL; unsigned char* dataImagePointer2 = NULL; @@ -234,7 +215,6 @@ printf("EED Transparency::createImage 3\n"); } else if(_type == VTK_SHORT) { -printf("EED Transparency::createImage 4\n"); //POINTERS: short* dataImagePointer1 = NULL; short* dataImagePointer2 = NULL; @@ -244,7 +224,6 @@ printf("EED Transparency::createImage 4\n"); } else if(_type == VTK_UNSIGNED_SHORT) { -printf("EED Transparency::createImage 5\n"); //POINTERS: unsigned short* dataImagePointer1 = NULL; unsigned short* dataImagePointer2 = NULL; @@ -254,7 +233,6 @@ printf("EED Transparency::createImage 5\n"); } else if(_type == VTK_INT) { -printf("EED Transparency::createImage 6\n"); //POINTERS: int* dataImagePointer1 = NULL; int* dataImagePointer2 = NULL; @@ -264,7 +242,6 @@ printf("EED Transparency::createImage 6\n"); } else if(_type == VTK_UNSIGNED_INT) { -printf("EED Transparency::createImage 7\n"); //POINTERS: unsigned int* dataImagePointer1 = NULL; unsigned int* dataImagePointer2 = NULL; @@ -274,7 +251,6 @@ printf("EED Transparency::createImage 7\n"); } else if(_type == VTK_LONG) { -printf("EED Transparency::createImage 8\n"); //POINTERS: long* dataImagePointer1 = NULL; long* dataImagePointer2 = NULL; @@ -284,7 +260,6 @@ printf("EED Transparency::createImage 8\n"); } else if(_type == VTK_UNSIGNED_LONG) { -printf("EED Transparency::createImage 9\n"); //POINTERS: unsigned long* dataImagePointer1 = NULL; unsigned long* dataImagePointer2 = NULL; @@ -294,7 +269,6 @@ printf("EED Transparency::createImage 9\n"); } else if(_type == VTK_FLOAT) { -printf("EED Transparency::createImage 10\n"); //POINTERS: float* dataImagePointer1 = NULL; float* dataImagePointer2 = NULL; @@ -304,7 +278,6 @@ printf("EED Transparency::createImage 10\n"); } else if(_type == VTK_DOUBLE) { -printf("EED Transparency::createImage 11\n"); //POINTERS: double* dataImagePointer1 = NULL; double* dataImagePointer2 = NULL; @@ -319,34 +292,25 @@ printf("EED Transparency::createImage 11\n"); #else _newImage->Modified(); #endif -printf("EED Transparency::createImage End\n"); } template void Transparency::createImageByType(T* dataImagePointer1, T* dataImagePointer2, T* dataImageResultPointer, vtkImageData *img1, vtkImageData *img2, int sizeX, int sizeY) { -printf("EED Transparency::createImageByType Start %d %d\n", sizeX, 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); -printf("EED Transparency::createImageByType 0 %d %d\n", sizeX, sizeY); for(i = 0; i < sizeX; i++) { for(j = 0; j < sizeY; j++) { -printf("EED Transparency::createImageByType 2 %d %d\n", sizeX, sizeY); dataImagePointer1 = (T*)img1->GetScalarPointer(i,j,0); -printf("EED Transparency::createImageByType 3 %d %d\n", sizeX, sizeY); dataImagePointer2 = (T*)img2->GetScalarPointer(i,j,0); -printf("EED Transparency::createImageByType 4 %d %d\n", sizeX, sizeY); dataImageResultPointer = (T*)_newImage->GetScalarPointer(i,j,0); -printf("EED Transparency::createImageByType 5 %d %d\n", sizeX, sizeY); *dataImageResultPointer = (T)*dataImagePointer1*_percent + (T)*dataImagePointer2*(1-_percent); -printf("EED Transparency::createImageByType 6 %d %d\n", sizeX, sizeY); } // for h } // for i -printf("EED Transparency::createImageByType End\n"); } /*