OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

OCC22521 triarea and checktopo DRAW commands didn't work in the right way

Browse Source
This commit is contained in:
OAN 2011-05-30 14:49:40 +00:00 committed by bugmaster
parent 824694116a
commit e1bcbb5283
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MeshTest/MeshTest_CheckTopology.cxx
View File

@ -107,9 +107,7 @@ void MeshTest_CheckTopology::Perform ()
TopLoc_Location aLoc; TopLoc_Location aLoc;
Handle(Poly_Triangulation) aT = BRep_Tool::Triangulation(aFace, aLoc); Handle(Poly_Triangulation) aT = BRep_Tool::Triangulation(aFace, aLoc);
if (aT.IsNull()) { if (aT.IsNull()) {
#ifdef DEB cout<< "face "<<iF<<" has no triangulation"<<endl;
cout<<"no Triangulation of face "<<iF<<endl;
#endif
continue; continue;
} }

60
src/MeshTest/MeshTest_PluginCommands.cxx
View File

@ -36,7 +36,7 @@ static Standard_Integer mpgetfunctionname (Draw_Interpretor& , Standard_Integer
static Standard_Integer mperror (Draw_Interpretor& , Standard_Integer , const char** ); static Standard_Integer mperror (Draw_Interpretor& , Standard_Integer , const char** );
static Standard_Integer mpincmesh (Draw_Interpretor& , Standard_Integer , const char** ); static Standard_Integer mpincmesh (Draw_Interpretor& , Standard_Integer , const char** );
static Standard_Integer triarea (Draw_Interpretor& , Standard_Integer , const char** ); static Standard_Integer triarea (Draw_Interpretor& , Standard_Integer , const char** );
static Standard_Integer checktopo (Draw_Interpretor& , Standard_Integer , const char** ); static Standard_Integer tricheck (Draw_Interpretor& , Standard_Integer , const char** );
//======================================================================= //=======================================================================
//function : PluginCommands //function : PluginCommands
@ -60,7 +60,7 @@ void MeshTest::PluginCommands(Draw_Interpretor& theCommands)
theCommands.Add("mperror" , "use mperror" , __FILE__, mperror , g); theCommands.Add("mperror" , "use mperror" , __FILE__, mperror , g);
theCommands.Add("mpincmesh" , "use mpincmesh" , __FILE__, mpincmesh , g); theCommands.Add("mpincmesh" , "use mpincmesh" , __FILE__, mpincmesh , g);
theCommands.Add("triarea","shape [eps] (computes triangles and surface area)",__FILE__, triarea, g); theCommands.Add("triarea","shape [eps] (computes triangles and surface area)",__FILE__, triarea, g);
theCommands.Add("checktopo", "shape (checks mesh topology)", __FILE__, checktopo, g); theCommands.Add("tricheck", "shape (checks triangulation of shape)", __FILE__, tricheck, g);
} }
@ -273,22 +273,22 @@ static Standard_Integer triarea (Draw_Interpretor& di, int n, const char ** a)
TopLoc_Location aLoc; TopLoc_Location aLoc;
Handle(Poly_Triangulation) aPoly = BRep_Tool::Triangulation(aFace,aLoc); Handle(Poly_Triangulation) aPoly = BRep_Tool::Triangulation(aFace,aLoc);
if (aPoly.IsNull()) { if (aPoly.IsNull()) {
cout << "face "<<i<<" has no triangulation"<<endl; cout << "face "<<i<<" has no triangulation"<<endl;
break; continue;
} }
const Poly_Array1OfTriangle& triangles = aPoly->Triangles(); const Poly_Array1OfTriangle& triangles = aPoly->Triangles();
const TColgp_Array1OfPnt& nodes = aPoly->Nodes(); const TColgp_Array1OfPnt& nodes = aPoly->Nodes();
for (int j=triangles.Lower(); j <= triangles.Upper(); j++) { for (int j=triangles.Lower(); j <= triangles.Upper(); j++) {
const Poly_Triangle& tri = triangles(j); const Poly_Triangle& tri = triangles(j);
int n1, n2, n3; int n1, n2, n3;
tri.Get (n1, n2, n3); tri.Get (n1, n2, n3);
const gp_Pnt& p1 = nodes(n1); const gp_Pnt& p1 = nodes(n1);
const gp_Pnt& p2 = nodes(n2); const gp_Pnt& p2 = nodes(n2);
const gp_Pnt& p3 = nodes(n3); const gp_Pnt& p3 = nodes(n3);
gp_Vec v1(p1, p2); gp_Vec v1(p1, p2);
gp_Vec v2(p1, p3); gp_Vec v2(p1, p3);
double ar = v1.CrossMagnitude(v2); double ar = v1.CrossMagnitude(v2);
aTriArea += ar; aTriArea += ar;
} }
} }
aTriArea /= 2; aTriArea /= 2;
@ -307,7 +307,7 @@ static Standard_Integer triarea (Draw_Interpretor& di, int n, const char ** a)
} }
//####################################################################### //#######################################################################
static Standard_Integer checktopo (Draw_Interpretor& di, int n, const char ** a) static Standard_Integer tricheck (Draw_Interpretor& di, int n, const char ** a)
{ {
if (n < 2) return 1; if (n < 2) return 1;
@ -340,21 +340,21 @@ static Standard_Integer checktopo (Draw_Interpretor& di, int n, const char ** a)
TColgp_Array1OfPnt pnts(1,2); TColgp_Array1OfPnt pnts(1,2);
TColgp_Array1OfPnt2d pnts2d(1,2); TColgp_Array1OfPnt2d pnts2d(1,2);
for (i=1; i <= nbEdge; i++) { for (i=1; i <= nbEdge; i++) {
Standard_Integer n1, n2; Standard_Integer n1, n2;
aCheck.GetFreeLink(k, i, n1, n2); aCheck.GetFreeLink(k, i, n1, n2);
cout<<"{"<<n1<<" "<<n2<<"} "; cout<<"{"<<n1<<" "<<n2<<"} ";
pnts(1) = aPoints(n1).Transformed(trsf); pnts(1) = aPoints(n1).Transformed(trsf);
pnts(2) = aPoints(n2).Transformed(trsf); pnts(2) = aPoints(n2).Transformed(trsf);
Handle(Poly_Polygon3D) poly = new Poly_Polygon3D (pnts); Handle(Poly_Polygon3D) poly = new Poly_Polygon3D (pnts);
DrawTrSurf::Set (name, poly); DrawTrSurf::Set (name, poly);
DrawTrSurf::Set (name, pnts(1)); DrawTrSurf::Set (name, pnts(1));
DrawTrSurf::Set (name, pnts(2)); DrawTrSurf::Set (name, pnts(2));
pnts2d(1) = aPoints2d(n1); pnts2d(1) = aPoints2d(n1);
pnts2d(2) = aPoints2d(n2); pnts2d(2) = aPoints2d(n2);
Handle(Poly_Polygon2D) poly2d = new Poly_Polygon2D (pnts2d); Handle(Poly_Polygon2D) poly2d = new Poly_Polygon2D (pnts2d);
DrawTrSurf::Set (name, poly2d); DrawTrSurf::Set (name, poly2d);
DrawTrSurf::Set (name, pnts2d(1)); DrawTrSurf::Set (name, pnts2d(1));
DrawTrSurf::Set (name, pnts2d(2)); DrawTrSurf::Set (name, pnts2d(2));
} }
cout<<endl; cout<<endl;
} }