X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkCreateMeshFromPoints.cxx;h=463e632ca411f127a9a7f0f9e0cd8473252007c8;hb=480c35b0a2e635921565e4c08fb9f187188f78ff;hp=2c17fb7be02d511263fc4fd5f4531dd4d0bc56a7;hpb=dea735ad5b9c9ad06d172e48df52fc989e174dda;p=creaVtk.git diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkCreateMeshFromPoints.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkCreateMeshFromPoints.cxx index 2c17fb7..463e632 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkCreateMeshFromPoints.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkCreateMeshFromPoints.cxx @@ -39,7 +39,7 @@ void CreateMeshFromPoints::Process() std::vector lstIndexs = bbGetInputLstIndexs(); if ( (lstIndexs.size()<=1) || (lstX.size()==0) || (lstX.size()!=lstY.size()) || (lstY.size()!=lstZ.size()) ) { - printf("PG CreateMeshFromPoints::Process: List of points X Y Z and LstIndexes is not correct\n"); + printf("Warning! CreateMeshFromPoints::Process: List of points X Y Z and LstIndexes is not correct\n"); bbSetOutputOut(NULL); } else { int ii,sizeSegment1,sizeSegment2; @@ -84,16 +84,25 @@ void CreateMeshFromPoints::Process() iGeneral=iGeneral+sizeSegment1; cells->InsertNextCell(triangleStrip); } //for LstIndexs + + int lastId1 = lstIndexs[0]-1; + int lastId2 = sizeLstX - 1; + int firstId2 = sizeLstX - lstIndexs[sizeLstIdexes - 1]; + bool face1open = lstX[0] != lstX[lastId1] && lstY[0] != lstY[lastId1] && lstZ[0] != lstZ[lastId1]; + bool face2open = lstX[firstId2] != lstX[lastId2] && lstY[firstId2] != lstY[lastId2] && lstZ[firstId2] != lstZ[lastId2]; - //false = Open - //true = Close - if(bbGetInputOpenClose()){ - CloseContourSides(lstIndexs, true); - } - else{ - CloseOpenContourSurface(lstIndexs); + if(bbGetInputCloseSurface()) + { + //false = Open Contour + //true = Closed Contour + if(!face1open && !face2open) + { + CloseContourSides(lstIndexs, true); + }else{ + CloseOpenContourSurface(lstIndexs); + } } - + // vtkPolyData *polydata = vtkPolyData::New(); if (polydata!=NULL) polydata->Delete(); polydata = vtkPolyData::New(); @@ -109,104 +118,202 @@ void CreateMeshFromPoints::Process() triangle = vtkTriangleFilter::New(); triangle->SetInputData( clean->GetOutput() ); triangle->Update(); - bbSetOutputOut( clean->GetOutput() ); + bbSetOutputOut( triangle->GetOutput() ); + // bbSetOutputOut( clean->GetOutput() ); }// if listXYZ size - printf("CreateMeshFromPoints::Process: End\n"); + //printf("PG CreateMeshFromPoints::Process: End\n"); } +/** +* Closes the sides of the contour +* iterates in one way or the other, depending on the order of the points and calculated vectors. +* uPointOrder: Points are order in a U shape +* lstIndexs: number of points on each spline +*/ void CreateMeshFromPoints::CloseContourSides(std::vector lstIndexs, bool uPointOrder){ int sizeLstIdexes = lstIndexs.size(); int sizePoints = bbGetInputLstX().size(); - int firstIndex, end, centroidId, numPointsFace; + int firstIndex, end, centroidId, numPointsFace, contraryId; int increment = uPointOrder?1:sizeLstIdexes; - double centroid[3], currentPoint[3] = {}; + double centroid[3]; for(int facesIdx = 0; facesIdx < 2; facesIdx++){ std::fill(std::begin(centroid), std::end(centroid), 0); - if(facesIdx == 0){ + if(facesIdx == 0) + { firstIndex = 0; numPointsFace = uPointOrder?lstIndexs[0]: sizeLstIdexes; end = uPointOrder?firstIndex + numPointsFace:sizePoints - lstIndexs[sizeLstIdexes - 1] + 1; - } - else{ - firstIndex = uPointOrder?sizePoints - lstIndexs[sizeLstIdexes-1]:lstIndexs[0] - 1; + contraryId = sizePoints-1; + }else{ + firstIndex = uPointOrder?sizePoints - lstIndexs[sizeLstIdexes-1]:lstIndexs[0]-1; numPointsFace = uPointOrder?lstIndexs[sizeLstIdexes-1]:sizeLstIdexes; end = uPointOrder?firstIndex + numPointsFace:sizePoints; + contraryId = 0; } - if(numPointsFace > 1){ - double lastPoint[3] = {}; - CalcCentroid(centroid, firstIndex, end, increment, numPointsFace); - centroidId = points->InsertNextPoint(centroid[0], centroid[1], centroid[2]); - vtkSmartPointer triangleStrip1 = vtkSmartPointer::New(); - triangleStrip1->GetPointIds()->SetNumberOfIds(numPointsFace*2+1); - if(facesIdx == 0){ - int initial = firstIndex; - int triangleIndex = 0; - for(int index = initial; index < end; index+=increment){ - triangleStrip1->GetPointIds()->SetId(triangleIndex,index); - if(index+increment >= end){ - triangleStrip1->GetPointIds()->SetId(triangleIndex+1,initial); - triangleStrip1->GetPointIds()->SetId(triangleIndex+2,centroidId); - } - else{ + if(numPointsFace > 1) + { + bool validCentroid = CalcValidCentroid(centroid, firstIndex, end, increment, numPointsFace); + if(validCentroid) + { + bool normalOrder = isPointingCorrectly(firstIndex, firstIndex+increment, centroid, contraryId); + centroidId = points->InsertNextPoint(centroid[0], centroid[1], centroid[2]); + vtkSmartPointer triangleStrip1 = vtkSmartPointer::New(); + triangleStrip1->GetPointIds()->SetNumberOfIds(numPointsFace*2+2); + if( normalOrder ) + { + int initial = firstIndex; + int triangleIndex = 0; + for(int index = initial; index < end; index+=increment){ + triangleStrip1->GetPointIds()->SetId(triangleIndex,index); triangleStrip1->GetPointIds()->SetId(triangleIndex+1,centroidId); + if(index+increment >= end){ + triangleStrip1->GetPointIds()->SetId(triangleIndex+2,initial); + triangleStrip1->GetPointIds()->SetId(triangleIndex+3,centroidId); + } + triangleIndex+=2; } - triangleIndex+=2; - } - cells->InsertNextCell(triangleStrip1); - } - else{ - int initial = firstIndex-1; - int triangleIndex = 0; - int triangleStripStart = end-1; - for(int index = triangleStripStart; index > initial ; index-=increment){ - triangleStrip1->GetPointIds()->SetId(triangleIndex,index); - if(index-increment <= initial){ - triangleStrip1->GetPointIds()->SetId(triangleIndex+1,triangleStripStart); - triangleStrip1->GetPointIds()->SetId(triangleIndex+2,centroidId); - } - else{ + cells->InsertNextCell(triangleStrip1); + } else { + int initial = firstIndex-1; + int triangleIndex = 0; + int triangleStripStart = end-1; + for(int index = triangleStripStart; index > initial; index-=increment){ + triangleStrip1->GetPointIds()->SetId(triangleIndex,index); triangleStrip1->GetPointIds()->SetId(triangleIndex+1,centroidId); + if(index-increment <= initial){ + triangleStrip1->GetPointIds()->SetId(triangleIndex+2,triangleStripStart); + triangleStrip1->GetPointIds()->SetId(triangleIndex+3,centroidId); + } + triangleIndex+=2; } - triangleIndex+=2; + cells->InsertNextCell(triangleStrip1); } - cells->InsertNextCell(triangleStrip1); - } - } - } + }//if validCentroid + }//if numPointsFace + }//for facesIdx } -void CreateMeshFromPoints::CloseOpenContourSurface(std::vector lstIndexs){ - int sizeLstIdexes = lstIndexs.size(); - int sizeLstX = bbGetInputLstX().size(); - bool linePointOrder = false; +/** +* Checks if the normal from firstPointId, secPointId and centroid points away +* from the vector centroid to contrPointId. +* Used to check that the order used to create the new polygons is correct. +*/ +bool CreateMeshFromPoints::isPointingCorrectly( int firstPointId, int secPointId, double(¢roid)[3], int contrPointId) { - if(linePointOrder){ - CloseContourSides(lstIndexs, false); - CloseContourBottom(false); + double firstPoint[3], secPoint[3], contrPoint[3]; + points->GetPoint(firstPointId, firstPoint); + points->GetPoint(secPointId, secPoint); + + double firstVect[3], secVect[3], normal[3], contrVect[3]; + + vtkMath::Subtract(firstPoint, centroid, firstVect); + vtkMath::Subtract(secPoint, centroid, secVect); + + points->GetPoint(contrPointId, contrPoint); + vtkMath::Subtract(contrPoint, centroid, contrVect); + + vtkMath::Cross(firstVect, secVect, normal); + double dotCalc; + dotCalc = vtkMath::Dot(normal, contrVect); + + return dotCalc>0; +} + +/** +* Checks if points on each side of the shapes represent a curve. +*/ +bool CreateMeshFromPoints::CheckLinePointOrder(){ + int sizePoints = bbGetInputLstX().size(); + std::vector lstIndexs = bbGetInputLstIndexs(); + double point1[3], point2[3], point3[3]; + double center[3]; + double firstRadiusSum = 0; + double secondRadiusSum = 0; + for(int i = 0; i < lstIndexs[0] && lstIndexs[0] > 3; i+=3){ + if(i+3 <= lstIndexs[0]){ + points->GetPoint(i, point1); + points->GetPoint(i+1, point2); + points->GetPoint(i+2, point3); + firstRadiusSum += vtkMath::Solve3PointCircle(point1, point2, point3, center); + } } - else{ - CloseContourSides(lstIndexs, true); - CloseContourBottom(true); + + for(int i = 0; i < sizePoints && lstIndexs.size() > 3; i+=(lstIndexs[0]*3)){ + if(i+(3*lstIndexs[0]) <= sizePoints){ + points->GetPoint(i, point1); + points->GetPoint(i+lstIndexs[0], point2); + points->GetPoint(i+(2*lstIndexs[0]), point3); + secondRadiusSum += vtkMath::Solve3PointCircle(point1, point2, point3, center); + } } - + + return firstRadiusSum > secondRadiusSum; } -void CreateMeshFromPoints::CalcCentroid(double(¢roid)[3], int start, int end, int increment, int numPoints){ - double currPoint[3] = {}; +/** +* Closes an open contour +* lstIndexs: number of points on each spline +*/ +void CreateMeshFromPoints::CloseOpenContourSurface(std::vector lstIndexs){ + bool linePointOrder = CheckLinePointOrder(); + CloseContourSides(lstIndexs, !linePointOrder); + CloseContourBottom(!linePointOrder); +} + +/** +* Calculates centroid and checks if points are collinear. +* centroid: array to store calculation +* start: start index of points to use +* end: end index of points to use +* increment: increment to be used in point iteration +* numPoints: number of points used to calculate the centroid. +* Returns a bool indicating the validity of the centroid calculated. +* False = invalid centroid = all points are the same. +*/ +bool CreateMeshFromPoints::CalcValidCentroid(double(¢roid)[3], int start, int end, int increment, int numPoints){ + double currPoint[3] = {}, prevPoint[3] = {}, middlePoint[3] = {}, firstPoint[3] = {}; + double vector1[3], vector2[3]; + bool samePoint = true; + int splineMidPoint = numPoints/2; + bool collinear = true; + + points->GetPoint(start, firstPoint); + points->GetPoint(splineMidPoint, middlePoint); + vtkMath::Subtract(middlePoint, firstPoint, vector1); + for(int i = start; i < end; i+=increment){ points->GetPoint(i, currPoint); + if(samePoint && i > start && (currPoint[0] != prevPoint[0] || currPoint[1] != prevPoint[1] || currPoint[2] != prevPoint[2])){ + samePoint = false; + } + + vtkMath::Subtract(currPoint, firstPoint, vector2); + double angle = vtkMath::AngleBetweenVectors(vector1, vector2); + if(angle > 0.0001 && collinear){ + collinear = false; + } + centroid[0] += currPoint[0]; centroid[1] += currPoint[1]; centroid[2] += currPoint[2]; + std::copy(std::begin(currPoint), std::end(currPoint), prevPoint); } + centroid[0] /= numPoints; centroid[1] /= numPoints; centroid[2] /= numPoints; + + return !samePoint && !collinear; } +/** +* Closes the bottom of the given countour. +* Should only be used when its an open contour. +* uPointOrder: points are ordered in U shape +*/ void CreateMeshFromPoints::CloseContourBottom(bool uPointOrder){ std::vector lstIndexs = bbGetInputLstIndexs(); int sizeLstIdexes = lstIndexs.size(); @@ -234,7 +341,7 @@ void CreateMeshFromPoints::bbUserSetDefaultValues() // SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX // Here we initialize the input 'In' to 0 // bbSetInputIn(0); - bbSetInputOpenClose(false); + bbSetInputCloseSurface(false); points = NULL; cells = NULL; polydata = NULL;