ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-01 20:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021893: EDF 2133 SMESH : Improvement of 3D extrusion algorithm

Browse Source 
fix ~faceQuadStruct() as same side can repeat in vector< StdMeshers_FaceSide*>
This commit is contained in:
eap 2013-02-04 11:41:26 +00:00
parent 4167c89c41
commit fae3ba8fdd
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -959,7 +959,6 @@ FaceQuadStruct::Ptr StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh &
MESSAGE (myHelper->GetMeshDS()->ShapeToIndex(quad->side[i]->Edge(e)) << " "); MESSAGE (myHelper->GetMeshDS()->ShapeToIndex(quad->side[i]->Edge(e)) << " ");
MESSAGE (")\n"); MESSAGE (")\n");
} }
//cout << endl;
#endif #endif
if (!nbSides) if (!nbSides)
nbSides = nbEdgesInWire.front(); nbSides = nbEdgesInWire.front();
@ -1187,10 +1186,20 @@ StdMeshers_Quadrangle_2D::CheckAnd2Dcompute (SMESH_Mesh & aMesh,
faceQuadStruct::~faceQuadStruct() faceQuadStruct::~faceQuadStruct()
{ {
for (int i = 0; i < side.size(); i++) { for (size_t i = 0; i < side.size(); i++) {
if (side[i]) delete side[i]; if (side[i]) {
delete side[i];
for (size_t j = i+1; j < side.size(); j++)
if ( side[i] == side[j] )
side[j] = 0;
}
}
side.clear();
if (uv_grid) {
delete [] uv_grid;
uv_grid = 0;
} }
if (uv_grid) delete [] uv_grid;
} }
namespace namespace
@ -1527,13 +1536,9 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref (SMESH_Mesh & aMesh,
UpdateDegenUV( quad ); UpdateDegenUV( quad );
// arrays for normalized params // arrays for normalized params
//cout<<"Dump B:"<<endl;
TColStd_SequenceOfReal npb, npr, npt, npl; TColStd_SequenceOfReal npb, npr, npt, npl;
for (i=0; i<nb; i++) { for (i=0; i<nb; i++) {
npb.Append(uv_eb[i].normParam); npb.Append(uv_eb[i].normParam);
//cout<<"i="<<i<<" par="<<uv_eb[i].normParam<<" npar="<<uv_eb[i].normParam;
//const SMDS_MeshNode* N = uv_eb[i].node;
//cout<<" node("<<N->X()<<","<<N->Y()<<","<<N->Z()<<")"<<endl;
} }
for (i=0; i<nr; i++) { for (i=0; i<nr; i++) {
npr.Append(uv_er[i].normParam); npr.Append(uv_er[i].normParam);
@ -1561,18 +1566,11 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref (SMESH_Mesh & aMesh,
npl.InsertAfter(1,npl.Value(2)-dpr); npl.InsertAfter(1,npl.Value(2)-dpr);
} }
} }
//cout<<"npb:";
//for (i=1; i<=npb.Length(); i++) {
// cout<<" "<<npb.Value(i);
//}
//cout<<endl;
gp_XY a0(uv_eb.front().u, uv_eb.front().v); gp_XY a0(uv_eb.front().u, uv_eb.front().v);
gp_XY a1(uv_eb.back().u, uv_eb.back().v); gp_XY a1(uv_eb.back().u, uv_eb.back().v);
gp_XY a2(uv_et.back().u, uv_et.back().v); gp_XY a2(uv_et.back().u, uv_et.back().v);
gp_XY a3(uv_et.front().u, uv_et.front().v); gp_XY a3(uv_et.front().u, uv_et.front().v);
//cout<<" a0("<<a0.X()<<","<<a0.Y()<<")"<<" a1("<<a1.X()<<","<<a1.Y()<<")"
// <<" a2("<<a2.X()<<","<<a2.Y()<<")"<<" a3("<<a3.X()<<","<<a3.Y()<<")"<<endl;
int nnn = Min(nr,nl); int nnn = Min(nr,nl);
// auxilary sequence of XY for creation nodes // auxilary sequence of XY for creation nodes
@ -1619,14 +1617,6 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref (SMESH_Mesh & aMesh,
for (i=1; i<=UVtmp.Length() && UVL.Length()<nbv-nnn; i++) { for (i=1; i<=UVtmp.Length() && UVL.Length()<nbv-nnn; i++) {
UVL.Append(UVtmp.Value(i)); UVL.Append(UVtmp.Value(i));
} }
//cout<<"Dump NodesL:"<<endl;
//for (i=1; i<=dl+1; i++) {
// cout<<"i="<<i;
// for (j=1; j<=nl; j++) {
// cout<<" ("<<NodesL.Value(i,j)->X()<<","<<NodesL.Value(i,j)->Y()<<","<<NodesL.Value(i,j)->Z()<<")";
// }
// cout<<endl;
//}
// create faces // create faces
for (i=1; i<=dl; i++) { for (i=1; i<=dl; i++) {
for (j=1; j<nl; j++) { for (j=1; j<nl; j++) {
@ -1752,12 +1742,6 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref (SMESH_Mesh & aMesh,
} }
} }
// add diagonal layers // add diagonal layers
//cout<<"UVL.Length()="<<UVL.Length()<<" UVR.Length()="<<UVR.Length()<<endl;
//cout<<"Dump UVL:"<<endl;
//for (i=1; i<=UVL.Length(); i++) {
// cout<<" ("<<UVL.Value(i).X()<<","<<UVL.Value(i).Y()<<")";
//}
//cout<<endl;
gp_UV A2 = UVR.Value(nbv-nnn); gp_UV A2 = UVR.Value(nbv-nnn);
gp_UV A3 = UVL.Value(nbv-nnn); gp_UV A3 = UVL.Value(nbv-nnn);
for (i=1; i<nbv-nnn; i++) { for (i=1; i<nbv-nnn; i++) {