std::vector<double> lstY = bbGetInputLstY();
std::vector<double> lstZ = bbGetInputLstZ();
std::vector<int> 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;
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 = 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];
+
+ bool altFace1open = lstX[0] != lstX[firstId2] && lstY[0] != lstY[firstId2] && lstZ[0] != lstZ[firstId2];
+ bool altFace2open = lstX[lastId1] != lstX[lastId2] && lstY[lastId1] != lstY[lastId2] && lstZ[lastId1] != lstZ[lastId2];
+
+ isClosedCont = false;
//false = Open Contour
//true = Closed Contour
- if(bbGetInputOpenClose()){
+ if(!face1open && !face2open)
+ {
+ isClosedCont = true;
CloseContourSides(lstIndexs, true);
}
+ else if(!altFace1open && !altFace2open)
+ {
+ isClosedCont = true;
+ CloseContourSides(lstIndexs, false);
+ }
else{
CloseOpenContourSurface(lstIndexs);
}
}
-
-
+
// vtkPolyData *polydata = vtkPolyData::New();
if (polydata!=NULL) polydata->Delete();
polydata = vtkPolyData::New();
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.
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]);
+ if(validCentroid)
+ {
+ bool normalOrder = isPointingCorrectly(firstIndex, firstIndex+increment, centroid, contraryId);
+ centroidId = points->InsertNextPoint(centroid[0], centroid[1], centroid[2]);
vtkSmartPointer<vtkTriangleStrip> triangleStrip1 = vtkSmartPointer<vtkTriangleStrip>::New();
- triangleStrip1->GetPointIds()->SetNumberOfIds(numPointsFace*2+1);
- if(normalOrder){ //(facesIdx == 0 && uPointOrder) || (facesIdx == 1 && !uPointOrder)){
+ triangleStrip1->GetPointIds()->SetNumberOfIds(numPointsFace*2 + (!isClosedCont?2:0));
+ if( normalOrder )
+ {
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);
+ triangleStrip1->GetPointIds()->SetId(triangleIndex+1,centroidId);//1
+ if(index+increment >= end && !isClosedCont){
+ triangleStrip1->GetPointIds()->SetId(triangleIndex+2,initial);//2
+ triangleStrip1->GetPointIds()->SetId(triangleIndex+3,centroidId);//3
}
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);
+ triangleStrip1->GetPointIds()->SetId(triangleIndex+1,centroidId);
+ if(index-increment <= initial && !isClosedCont){
+ triangleStrip1->GetPointIds()->SetId(triangleIndex+2,triangleStripStart);
+ triangleStrip1->GetPointIds()->SetId(triangleIndex+3,centroidId);
}
triangleIndex+=2;
}
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;
}
* lstIndexs: number of points on each spline
*/
void CreateMeshFromPoints::CloseOpenContourSurface(std::vector<int> lstIndexs){
- int sizeLstIdexes = lstIndexs.size();
- int sizeLstX = bbGetInputLstX().size();
bool linePointOrder = CheckLinePointOrder();
CloseContourSides(lstIndexs, !linePointOrder);
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
* 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;
}
/**
// Here we initialize the input 'In' to 0
// bbSetInputIn(0);
bbSetInputCloseSurface(false);
- bbSetInputOpenClose(false);
+ isClosedCont = NULL;
points = NULL;
cells = NULL;
polydata = NULL;
git://git.creatis.insa-lyon.fr / creaVtk.git / blobdiff