X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkCreateMeshFromPoints.cxx;h=79b999135824b68eafc2a10a76d7e737a2ccad67;hb=d59326dc256aa89dd33ca55cfa4b0a37fcae095c;hp=a6948c45ee344c4fe7d6f3966b8ec98ba0df7242;hpb=14c778f3e67bad3258fc976eaa66ab8953bdb78e;p=creaVtk.git diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkCreateMeshFromPoints.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkCreateMeshFromPoints.cxx index a6948c4..79b9991 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkCreateMeshFromPoints.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkCreateMeshFromPoints.cxx @@ -5,6 +5,7 @@ #include "bbcreaVtkPackage.h" #include "vtkTriangleStrip.h" +#include "vtkTriangle.h" #include namespace bbcreaVtk @@ -37,9 +38,9 @@ void CreateMeshFromPoints::Process() std::vector lstY = bbGetInputLstY(); std::vector lstZ = bbGetInputLstZ(); std::vector lstIndexs = bbGetInputLstIndexs(); - if ( (lstIndexs.size()<=1) || (lstX.size()==0) || (lstX.size()!=lstY.size()) || (lstY.size()!=lstZ.size()) ) + 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; @@ -78,26 +79,41 @@ void CreateMeshFromPoints::Process() triangleStrip->GetPointIds()->SetId(ii*2+1,iSeg2); iSeg1++; iSeg2++; - if (iSeg1>=maxSegment1) { iSeg1=maxSegment1-1; } - if (iSeg2>=maxSegment2) { iSeg2=maxSegment2-1; } + if (iSeg1>=maxSegment1) { iSeg1=maxSegment1-1; } + if (iSeg2>=maxSegment2) { iSeg2=maxSegment2-1; } } // for ii iGeneral=iGeneral+sizeSegment1; cells->InsertNextCell(triangleStrip); } //for LstIndexs - - if(bbGetInputCloseSurface()){ + if(bbGetInputCloseSurface()) + { + int lastId1 = lstIndexs[0]-1; + int lastId2 = sizeLstX - 1; + int firstId2 = sizeLstX - lstIndexs[sizeLstIdexes - 1]; + bool face1open = std::fabs(lstX[0] - lstX[lastId1]) > 0.0001 && std::fabs(lstY[0] - lstY[lastId1]) > 0.0001 && std::fabs(lstZ[0] - lstZ[lastId1]) > 0.0001; + bool face2open = std::fabs(lstX[firstId2] - lstX[lastId2]) > 0.0001 && std::fabs(lstY[firstId2] - lstY[lastId2]) > 0.0001 && std::fabs(lstZ[firstId2] - lstZ[lastId2]) > 0.0001; + + bool altFace1open = std::fabs(lstX[0] - lstX[firstId2]) > 0.0001 && std::fabs(lstY[0] - lstY[firstId2]) > 0.0001 && std::fabs(lstZ[0] - lstZ[firstId2]) > 0.0001; + bool altFace2open = std::fabs(lstX[lastId1] - lstX[lastId2]) > 0.0001 && std::fabs(lstY[lastId1] - lstY[lastId2]) > 0.0001 && std::fabs(lstZ[lastId1] - lstZ[lastId2]) > 0.0001; + //false = Open Contour //true = Closed Contour - if(bbGetInputOpenClose()){ - CloseContourSides(lstIndexs, true); + if(!face1open && !face2open) + { +// isClosedCont = true; + CloseContourSides(lstIndexs, true, true); + } + else if(!altFace1open && !altFace2open) + { +// isClosedCont = true; + CloseContourSides(lstIndexs, false, true); } else{ CloseOpenContourSurface(lstIndexs); } } - - + // vtkPolyData *polydata = vtkPolyData::New(); if (polydata!=NULL) polydata->Delete(); polydata = vtkPolyData::New(); @@ -113,79 +129,82 @@ 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("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){ +void CreateMeshFromPoints::CloseContourSides(std::vector lstIndexs, bool uPointOrder, bool isClosedCont){ int sizeLstIdexes = lstIndexs.size(); int sizePoints = bbGetInputLstX().size(); int firstIndex, end, centroidId, numPointsFace, contraryId; int increment = uPointOrder?1:sizeLstIdexes; double centroid[3]; - - for(int facesIdx = 0; facesIdx < 2; facesIdx++){ + int numProcessFaces = sizeLstIdexes > 1?2:1; + for(int facesIdx = 0; facesIdx < numProcessFaces; 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; contraryId = sizePoints-1; - } - else{ + }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] = {}; + 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+1); - if(normalOrder){ //(facesIdx == 0 && uPointOrder) || (facesIdx == 1 && !uPointOrder)){ - 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{ - triangleStrip1->GetPointIds()->SetId(triangleIndex+1,centroidId); + if(validCentroid) + { + bool normalOrder = isPointingCorrectly(firstIndex, firstIndex+increment, centroid, contraryId); + centroidId = points->InsertNextPoint(centroid[0], centroid[1], centroid[2]); + if( normalOrder ) + { + int initial = firstIndex; + for(int index = initial; index < end; index+=increment){ + if(index+increment >= end && !isClosedCont){ + vtkNew triangle; + triangle->GetPointIds()->SetId(0, index); + triangle->GetPointIds()->SetId(1, initial); + triangle->GetPointIds()->SetId(2, centroidId); + cells->InsertNextCell(triangle); + }else if(index+increment < end){ + vtkNew triangle; + triangle->GetPointIds()->SetId(0, index); + triangle->GetPointIds()->SetId(1, index+increment); + triangle->GetPointIds()->SetId(2, centroidId); + cells->InsertNextCell(triangle); } - triangleIndex+=2; } - cells->InsertNextCell(triangleStrip1); - } - else{ + } 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{ - triangleStrip1->GetPointIds()->SetId(triangleIndex+1,centroidId); + if(index-increment <= initial && !isClosedCont){ + vtkNew triangle; + triangle->GetPointIds()->SetId(0, index); + triangle->GetPointIds()->SetId(1, triangleStripStart); + triangle->GetPointIds()->SetId(2, centroidId); + cells->InsertNextCell(triangle); + }else if(index-increment > initial){ + vtkNew triangle; + triangle->GetPointIds()->SetId(0, index); + triangle->GetPointIds()->SetId(1, index-increment); + triangle->GetPointIds()->SetId(2, centroidId); + cells->InsertNextCell(triangle); } - triangleIndex+=2; } - cells->InsertNextCell(triangleStrip1); } }//if validCentroid }//if numPointsFace @@ -229,24 +248,24 @@ bool CreateMeshFromPoints::CheckLinePointOrder(){ 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]){ + for(int i = 0; i < lstIndexs[0] && lstIndexs[0] > 9; i+=5){ + if(i+10 < lstIndexs[0]){ points->GetPoint(i, point1); - points->GetPoint(i+1, point2); - points->GetPoint(i+2, point3); + points->GetPoint(i+5, point2); + points->GetPoint(i+10, point3); firstRadiusSum += vtkMath::Solve3PointCircle(point1, point2, point3, center); } } - for(int i = 0; i < sizePoints && lstIndexs.size() > 3; i+=(lstIndexs[0]*3)){ - if(i+(3*lstIndexs[0]) <= sizePoints){ + for(int i = 0; i < sizePoints && lstIndexs.size() > 9; i+=(lstIndexs.size()*5)){ + if(i+(10*lstIndexs.size()) < sizePoints){ points->GetPoint(i, point1); - points->GetPoint(i+lstIndexs[0], point2); - points->GetPoint(i+(2*lstIndexs[0]), point3); + points->GetPoint(i+(5*lstIndexs.size()), point2); + points->GetPoint(i+(10*lstIndexs.size()), point3); secondRadiusSum += vtkMath::Solve3PointCircle(point1, point2, point3, center); } } - + return firstRadiusSum > secondRadiusSum; } @@ -255,15 +274,13 @@ bool CreateMeshFromPoints::CheckLinePointOrder(){ * lstIndexs: number of points on each spline */ void CreateMeshFromPoints::CloseOpenContourSurface(std::vector lstIndexs){ - int sizeLstIdexes = lstIndexs.size(); - int sizeLstX = bbGetInputLstX().size(); bool linePointOrder = CheckLinePointOrder(); - CloseContourSides(lstIndexs, !linePointOrder); + CloseContourSides(lstIndexs, !linePointOrder, false); CloseContourBottom(!linePointOrder); } /** -* Calculates centroid. +* 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 @@ -273,23 +290,39 @@ void CreateMeshFromPoints::CloseOpenContourSurface(std::vector lstIndexs){ * 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] = {}; + 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 && (currPoint[0] != prevPoint[0] || currPoint[1] != prevPoint[1] || currPoint[2] != prevPoint[2])){ + 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; + return !samePoint && !collinear; } /** @@ -325,7 +358,6 @@ void CreateMeshFromPoints::bbUserSetDefaultValues() // Here we initialize the input 'In' to 0 // bbSetInputIn(0); bbSetInputCloseSurface(false); - bbSetInputOpenClose(false); points = NULL; cells = NULL; polydata = NULL;