From: Eduardo DAVILA Date: Thu, 19 Dec 2013 13:26:30 +0000 (+0100) Subject: 2217 creaVtk Support New Normal Correction of Heart Angles Box X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaVtk.git;a=commitdiff_plain;h=d08511b9873fd007b39e9eccc002198b585a9b1a 2217 creaVtk Support New Normal Correction of Heart Angles Box --- diff --git a/lib/creaVtk/creaVtkHeartAngles.cpp b/lib/creaVtk/creaVtkHeartAngles.cpp index 7633c1e..790b24c 100644 --- a/lib/creaVtk/creaVtkHeartAngles.cpp +++ b/lib/creaVtk/creaVtkHeartAngles.cpp @@ -200,43 +200,42 @@ std::cout << "CFT creaVtkHeartAngles::calculateImages Start"<SetNumberOfScalarComponents( image->GetNumberOfScalarComponents() ); betaImage->AllocateScalars(); - unsigned char* pPix; - pPix = (unsigned char*)image->GetScalarPointer(); - double a; - double b; + unsigned char* pPix; + pPix = (unsigned char*)image->GetScalarPointer(); + double a; + double b; - int numberOfPoints = dim[0]*dim[1]*dim[2]; + int numberOfPoints = dim[0]*dim[1]*dim[2]; - vtkDoubleArray *array; + vtkDoubleArray *array; array = (vtkDoubleArray*) image->GetPointData()->GetVectors(); //for(int i = 0 ; i < 8600 ; i++) { // std::cout<<" arreglo #"<< i << " "<< array->GetValue(i)<<" tuple3 "<< array->GetTuple3(i)[0]<<" "<< array->GetTuple3(i)[1]<<" "<GetTuple3(i)[2]<< std::endl; //} - int i, j, k; - int numTuple=0; + int i, j, k; + int numTuple=0; - for( k = 0 ; k < dim[2] ; k++ ) + for( k = 0 ; k < dim[2] ; k++ ) { for( j = 0 ; j < dim[1] ; j++ ) + { + for( i = 0 ; i < dim[0] ; i++ ) { - for( i = 0 ; i < dim[0] ; i++ ) - { - //unsigned char* pPix = (unsigned char *)image->GetScalarPointer( i , j , k ); - - double p1 = array->GetTuple3(numTuple)[0]; - double p2 = array->GetTuple3(numTuple)[1]; - double p3 = array->GetTuple3(numTuple)[2]; - numTuple++; + //unsigned char* pPix = (unsigned char *)image->GetScalarPointer( i , j , k ); + + double p1 = array->GetTuple3(numTuple)[0]; + double p2 = array->GetTuple3(numTuple)[1]; + double p3 = array->GetTuple3(numTuple)[2]; + numTuple++; - //std::cout << " p1: " << p1 << " p2: " << p2 <<" p3: " << p3 << std::endl; - //std::cout << " Px: " << Px << " Py: " << Py <<" Pz: " << Pz << std::endl; - //std::cout << " p2x: " << p2x << " p2y: " << p2y <<" p2z: " << p2z << std::endl; + //std::cout << " p1: " << p1 << " p2: " << p2 <<" p3: " << p3 << std::endl; + //std::cout << " Px: " << Px << " Py: " << Py <<" Pz: " << Pz << std::endl; + //std::cout << " p2x: " << p2x << " p2y: " << p2y <<" p2z: " << p2z << std::endl; - double* vecProj; - vecProj = vectorProjection (Nx, Ny, Nz, - p1, p2, p3); + double* vecProj; + vecProj = vectorProjection (Nx, Ny, Nz, p1, p2, p3); //std::cout << " vecProj[0]: " << vecProj[0] << " vecProj[1]: " << vecProj[1] <<" vecProj[2]: " << vecProj[2] << std::endl; a = alpha (Px, Py, Pz, p1, p2, p3, @@ -262,7 +261,6 @@ std::cout << "CFT creaVtkHeartAngles::calculateImages Start"<