X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Quadrangle_2D.cxx;h=589ca5267154eb5c1ee17ab5217ee835f5e54a02;hb=a68d1c0471e2eed5cfbff9d8e28d5fdfc9ffce8f;hp=fb24bf950a44897734db3efcff1e54701d88a8f7;hpb=ac2a1f09d823efe794f54124cd953c2f06f38927;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index fb24bf950..589ca5267 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -27,33 +27,38 @@ // Module : SMESH // $Header$ -using namespace std; #include "StdMeshers_Quadrangle_2D.hxx" + +#include "StdMeshers_FaceSide.hxx" + #include "SMESH_Gen.hxx" #include "SMESH_Mesh.hxx" #include "SMESH_subMesh.hxx" +#include "SMESH_MesherHelper.hxx" +#include "SMESH_Block.hxx" #include "SMDS_MeshElement.hxx" #include "SMDS_MeshNode.hxx" #include "SMDS_EdgePosition.hxx" #include "SMDS_FacePosition.hxx" +#include #include +#include #include #include - #include #include #include #include #include #include - #include #include #include #include #include +#include #include "utilities.h" #include "Utils_ExceptHandlers.hxx" @@ -61,12 +66,14 @@ using namespace std; #ifndef StdMeshers_Array2OfNode_HeaderFile #define StdMeshers_Array2OfNode_HeaderFile typedef const SMDS_MeshNode* SMDS_MeshNodePtr; -#include DEFINE_BASECOLLECTION (StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr) DEFINE_ARRAY2(StdMeshers_Array2OfNode, StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr) #endif +using namespace std; + +typedef gp_XY gp_UV; //============================================================================= /*! @@ -93,8 +100,6 @@ StdMeshers_Quadrangle_2D::StdMeshers_Quadrangle_2D (int hypId, int studyId, SMES StdMeshers_Quadrangle_2D::~StdMeshers_Quadrangle_2D() { MESSAGE("StdMeshers_Quadrangle_2D::~StdMeshers_Quadrangle_2D"); - if ( myTool ) - delete myTool; } //============================================================================= @@ -128,52 +133,47 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, const TopoDS_Shape& aShape) throw (SALOME_Exception) { Unexpect aCatch(SalomeException); - //MESSAGE("StdMeshers_Quadrangle_2D::Compute"); + SMESHDS_Mesh * meshDS = aMesh.GetMeshDS(); aMesh.GetSubMesh(aShape); - if ( !myTool ) - myTool = new SMESH_MesherHelper(aMesh); - _quadraticMesh = myTool->IsQuadraticSubMesh(aShape); + SMESH_MesherHelper helper(aMesh); + myTool = &helper; - //FaceQuadStruct *quad = CheckAnd2Dcompute(aMesh, aShape); - FaceQuadStruct* quad = CheckNbEdges(aMesh, aShape); + _quadraticMesh = myTool->IsQuadraticSubMesh(aShape); - if (!quad) { - delete myTool; myTool = 0; + FaceQuadStruct *quad = CheckNbEdges( aMesh, aShape ); + std::auto_ptr quadDeleter( quad ); // to delete quad at exit from Compute() + if (!quad) return false; - } if(myQuadranglePreference) { - int n1 = quad->nbPts[0]; - int n2 = quad->nbPts[1]; - int n3 = quad->nbPts[2]; - int n4 = quad->nbPts[3]; + int n1 = quad->side[0]->NbPoints(); + int n2 = quad->side[1]->NbPoints(); + int n3 = quad->side[2]->NbPoints(); + int n4 = quad->side[3]->NbPoints(); int nfull = n1+n2+n3+n4; int ntmp = nfull/2; ntmp = ntmp*2; if( nfull==ntmp && ( (n1!=n3) || (n2!=n4) ) ) { // special path for using only quandrangle faces bool ok = ComputeQuadPref(aMesh, aShape, quad); - delete myTool; myTool = 0; return ok; } } // set normalized grid on unit square in parametric domain - SetNormalizedGrid(aMesh, aShape, quad); - if (!quad) { - delete myTool; myTool = 0; + + if (!SetNormalizedGrid(aMesh, aShape, quad)) return false; - } // --- compute 3D values on points, store points & quadrangles - int nbdown = quad->nbPts[0]; - int nbup = quad->nbPts[2]; + int nbdown = quad->side[0]->NbPoints(); + int nbup = quad->side[2]->NbPoints(); - int nbright = quad->nbPts[1]; - int nbleft = quad->nbPts[3]; + int nbright = quad->side[1]->NbPoints(); + int nbleft = quad->side[3]->NbPoints(); int nbhoriz = Min(nbdown, nbup); int nbvertic = Min(nbright, nbleft); @@ -226,16 +226,15 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, b = quad->uv_grid[j * nbhoriz + i + 1].node; c = quad->uv_grid[(j + 1) * nbhoriz + i + 1].node; d = quad->uv_grid[(j + 1) * nbhoriz + i].node; - //SMDS_MeshFace * face = meshDS->AddFace(a, b, c, d); SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); meshDS->SetMeshElementOnShape(face, geomFaceID); } } - - UVPtStruct *uv_e0 = quad->uv_edges[0]; - UVPtStruct *uv_e1 = quad->uv_edges[1]; - UVPtStruct *uv_e2 = quad->uv_edges[2]; - UVPtStruct *uv_e3 = quad->uv_edges[3]; + + const vector& uv_e0 = quad->side[0]->GetUVPtStruct(true,0 ); + const vector& uv_e1 = quad->side[1]->GetUVPtStruct(false,1); + const vector& uv_e2 = quad->side[2]->GetUVPtStruct(true,1 ); + const vector& uv_e3 = quad->side[3]->GetUVPtStruct(false,0); double eps = Precision::Confusion(); @@ -549,63 +548,86 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, } } - QuadDelete(quad); - delete myTool; myTool = 0; - bool isOk = true; return isOk; } - //============================================================================= /*! * */ //============================================================================= -FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh & aMesh, +FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape) throw(SALOME_Exception) { Unexpect aCatch(SalomeException); const TopoDS_Face & F = TopoDS::Face(aShape); + const bool ignoreMediumNodes = _quadraticMesh; // verify 1 wire only, with 4 edges - - if (NumberOfWires(F) != 1) { + TopoDS_Vertex V; + list< TopoDS_Edge > edges; + list< int > nbEdgesInWire; + int nbWire = SMESH_Block::GetOrderedEdges (F, V, edges, nbEdgesInWire); + if (nbWire != 1) { INFOS("only 1 wire by face (quadrangles)"); return 0; } - const TopoDS_Wire& W = BRepTools::OuterWire(F); - BRepTools_WireExplorer wexp (W, F); - FaceQuadStruct* quad = new FaceQuadStruct; - for (int i = 0; i < 4; i++) - quad->uv_edges[i] = 0; quad->uv_grid = 0; - - int nbEdges = 0; - for (wexp.Init(W, F); wexp.More(); wexp.Next()) { - const TopoDS_Edge& E = wexp.Current(); - int nb = aMesh.GetSubMesh(E)->GetSubMeshDS()->NbNodes(); - if (nbEdges < 4) { - quad->edge[nbEdges] = E; - if(!_quadraticMesh) { - quad->nbPts[nbEdges] = nb + 2; // internal points + 2 extrema + quad->side.reserve(nbEdgesInWire.front()); + + int nbSides = 0; + list< TopoDS_Edge >::iterator edgeIt = edges.begin(); + if ( nbEdgesInWire.front() == 4 ) { // exactly 4 edges + for ( ; edgeIt != edges.end(); ++edgeIt, nbSides++ ) + quad->side.push_back( new StdMeshers_FaceSide(F, *edgeIt, &aMesh, + nbSides 4 ) { // more than 4 edges - try to unite some + list< TopoDS_Edge > sideEdges; + while ( !edges.empty()) { + sideEdges.clear(); + sideEdges.splice( sideEdges.end(), edges, edges.begin()); // edges.front() -> sideEdges.end() + bool sameSide = true; + while ( !edges.empty() && sameSide ) { + GeomAbs_Shape cont = SMESH_Algo::Continuity( sideEdges.back(), edges.front() ); + sameSide = ( cont >= GeomAbs_G1 ); + if ( sameSide ) + sideEdges.splice( sideEdges.end(), edges, edges.begin()); } - else { - int tmp = nb/2; - quad->nbPts[nbEdges] = tmp + 2; // internal not medium points + 2 extrema + if ( nbSides == 0 ) { // go backward from the first edge + sameSide = true; + while ( !edges.empty() && sameSide ) { + GeomAbs_Shape cont = SMESH_Algo::Continuity( sideEdges.front(), edges.back() ); + sameSide = ( cont >= GeomAbs_G1 ); + if ( sameSide ) + sideEdges.splice( sideEdges.begin(), edges, --edges.end()); + } } + quad->side.push_back( new StdMeshers_FaceSide(F, sideEdges, &aMesh, + nbSidesside[i]->NbEdges(); ++e ) + cout << myTool->GetMeshDS()->ShapeToIndex( quad->side[i]->Edge( e )) << " "; + cout << ")"; + } + cout << endl; +#else + INFOS("face must have 4 edges / quadrangle"); +#endif + delete quad; + quad = 0; } return quad; @@ -618,9 +640,9 @@ FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh & aMesh, //============================================================================= FaceQuadStruct *StdMeshers_Quadrangle_2D::CheckAnd2Dcompute - (SMESH_Mesh & aMesh, + (SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, - const bool CreateQuadratic) throw(SALOME_Exception) + const bool CreateQuadratic) throw(SALOME_Exception) { Unexpect aCatch(SalomeException); @@ -642,20 +664,24 @@ FaceQuadStruct *StdMeshers_Quadrangle_2D::CheckAnd2Dcompute */ //============================================================================= -void StdMeshers_Quadrangle_2D::QuadDelete (FaceQuadStruct * quad) +faceQuadStruct::~faceQuadStruct() { - //MESSAGE("StdMeshers_Quadrangle_2D::QuadDelete"); - if (quad) + for (int i = 0; i < side.size(); i++) { + if (side[i]) delete side[i]; + //if (uv_edges[i]) delete [] uv_edges[i]; + } + if (uv_grid) delete [] uv_grid; +} + +namespace { + inline const vector& GetUVPtStructIn(FaceQuadStruct* quad, int i, int nbSeg) { - for (int i = 0; i < 4; i++) - { - if (quad->uv_edges[i]) - delete [] quad->uv_edges[i]; - quad->edge[i].Nullify(); - } - if (quad->uv_grid) - delete [] quad->uv_grid; - delete quad; + bool isXConst = ( i == BOTTOM_SIDE || i == TOP_SIDE ); + double constValue = ( i == BOTTOM_SIDE || i == LEFT_SIDE ) ? 0 : 1; + return + quad->isEdgeOut[i] ? + quad->side[i]->SimulateUVPtStruct(nbSeg,isXConst,constValue) : + quad->side[i]->GetUVPtStruct(isXConst,constValue); } } @@ -665,7 +691,7 @@ void StdMeshers_Quadrangle_2D::QuadDelete (FaceQuadStruct * quad) */ //============================================================================= -void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, +bool StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, const TopoDS_Shape& aShape, FaceQuadStruct* & quad) throw (SALOME_Exception) { @@ -676,7 +702,7 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, // transport - projection sur le carré unité // MESSAGE("StdMeshers_Quadrangle_2D::SetNormalizedGrid"); - const TopoDS_Face& F = TopoDS::Face(aShape); +// const TopoDS_Face& F = TopoDS::Face(aShape); // 1 --- find orientation of the 4 edges, by test on extrema @@ -692,88 +718,27 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, // =down // - Handle(Geom2d_Curve) c2d[4]; - gp_Pnt2d pf[4]; - gp_Pnt2d pl[4]; - for (int i = 0; i < 4; i++) - { - c2d[i] = BRep_Tool::CurveOnSurface(quad->edge[i], F, - quad->first[i], quad->last[i]); - pf[i] = c2d[i]->Value(quad->first[i]); - pl[i] = c2d[i]->Value(quad->last[i]); - quad->isEdgeForward[i] = false; - } + // 3 --- 2D normalized values on unit square [0..1][0..1] - double l0f1 = pl[0].SquareDistance(pf[1]); - double l0l1 = pl[0].SquareDistance(pl[1]); - double f0f1 = pf[0].SquareDistance(pf[1]); - double f0l1 = pf[0].SquareDistance(pl[1]); - if ( Min( l0f1, l0l1 ) < Min ( f0f1, f0l1 )) - { - quad->isEdgeForward[0] = true; - } else { - double tmp = quad->first[0]; - quad->first[0] = quad->last[0]; - quad->last[0] = tmp; - pf[0] = c2d[0]->Value(quad->first[0]); - pl[0] = c2d[0]->Value(quad->last[0]); - } - for (int i = 1; i < 4; i++) - { - l0l1 = pl[i - 1].SquareDistance(pl[i]); - l0f1 = pl[i - 1].SquareDistance(pf[i]); - quad->isEdgeForward[i] = ( l0f1 < l0l1 ); - if (!quad->isEdgeForward[i]) - { - double tmp = quad->first[i]; - quad->first[i] = quad->last[i]; - quad->last[i] = tmp; - pf[i] = c2d[i]->Value(quad->first[i]); - pl[i] = c2d[i]->Value(quad->last[i]); - } - } + int nbhoriz = Min(quad->side[0]->NbPoints(), quad->side[2]->NbPoints()); + int nbvertic = Min(quad->side[1]->NbPoints(), quad->side[3]->NbPoints()); - // 2 --- load 2d edge points (u,v) with orientation and value on unit square + quad->isEdgeOut[0] = (quad->side[0]->NbPoints() > quad->side[2]->NbPoints()); + quad->isEdgeOut[1] = (quad->side[1]->NbPoints() > quad->side[3]->NbPoints()); + quad->isEdgeOut[2] = (quad->side[2]->NbPoints() > quad->side[0]->NbPoints()); + quad->isEdgeOut[3] = (quad->side[3]->NbPoints() > quad->side[1]->NbPoints()); - bool loadOk = true; - for (int i = 0; i < 2; i++) - { - quad->uv_edges[i] = LoadEdgePoints(aMesh, F, quad->edge[i], - quad->first[i], quad->last[i]); - if (!quad->uv_edges[i]) loadOk = false; - } + UVPtStruct *uv_grid = quad->uv_grid = new UVPtStruct[nbvertic * nbhoriz]; - for (int i = 2; i < 4; i++) - { - quad->uv_edges[i] = LoadEdgePoints(aMesh, F, quad->edge[i], - quad->last[i], quad->first[i]); - if (!quad->uv_edges[i]) loadOk = false; - } + const vector& uv_e0 = GetUVPtStructIn( quad, 0, nbhoriz - 1 ); + const vector& uv_e1 = GetUVPtStructIn( quad, 1, nbvertic - 1 ); + const vector& uv_e2 = GetUVPtStructIn( quad, 2, nbhoriz - 1 ); + const vector& uv_e3 = GetUVPtStructIn( quad, 3, nbvertic - 1 ); - if (!loadOk) - { - INFOS("StdMeshers_Quadrangle_2D::SetNormalizedGrid - LoadEdgePoints failed"); - QuadDelete( quad ); - quad = 0; - return; + if ( uv_e0.empty() || uv_e1.empty() || uv_e2.empty() || uv_e3.empty() ) { + MESSAGE("Nodes from edges not loaded"); + return false; } - // 3 --- 2D normalized values on unit square [0..1][0..1] - - int nbhoriz = Min(quad->nbPts[0], quad->nbPts[2]); - int nbvertic = Min(quad->nbPts[1], quad->nbPts[3]); - - quad->isEdgeOut[0] = (quad->nbPts[0] > quad->nbPts[2]); - quad->isEdgeOut[1] = (quad->nbPts[1] > quad->nbPts[3]); - quad->isEdgeOut[2] = (quad->nbPts[2] > quad->nbPts[0]); - quad->isEdgeOut[3] = (quad->nbPts[3] > quad->nbPts[1]); - - quad->uv_grid = new UVPtStruct[nbvertic * nbhoriz]; - - UVPtStruct *uv_grid = quad->uv_grid; - UVPtStruct *uv_e0 = quad->uv_edges[0]; - UVPtStruct *uv_e1 = quad->uv_edges[1]; - UVPtStruct *uv_e2 = quad->uv_edges[2]; - UVPtStruct *uv_e3 = quad->uv_edges[3]; // nodes Id on "in" edges if (! quad->isEdgeOut[0]) { @@ -805,21 +770,6 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, } } - // falsificate "out" edges - if (quad->isEdgeOut[0]) // down - uv_e0 = MakeEdgePoints - (aMesh, F, quad->edge[0], quad->first[0], quad->last[0], nbhoriz - 1); - else if (quad->isEdgeOut[2]) // up - uv_e2 = MakeEdgePoints - (aMesh, F, quad->edge[2], quad->last[2], quad->first[2], nbhoriz - 1); - - if (quad->isEdgeOut[1]) // right - uv_e1 = MakeEdgePoints - (aMesh, F, quad->edge[1], quad->first[1], quad->last[1], nbvertic - 1); - else if (quad->isEdgeOut[3]) // left - uv_e3 = MakeEdgePoints - (aMesh, F, quad->edge[3], quad->last[3], quad->first[3], nbvertic - 1); - // normalized 2d values on grid for (int i = 0; i < nbhoriz; i++) { @@ -843,10 +793,10 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, } // 4 --- projection on 2d domain (u,v) - gp_Pnt2d a0 = pf[0]; - gp_Pnt2d a1 = pf[1]; - gp_Pnt2d a2 = pf[2]; - gp_Pnt2d a3 = pf[3]; + gp_UV a0( uv_e0.front().u, uv_e0.front().v ); + gp_UV a1( uv_e0.back().u, uv_e0.back().v ); + gp_UV a2( uv_e2.back().u, uv_e2.back().v ); + gp_UV a3( uv_e2.front().u, uv_e2.front().v ); for (int i = 0; i < nbhoriz; i++) { @@ -855,157 +805,85 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, int ij = j * nbhoriz + i; double x = uv_grid[ij].x; double y = uv_grid[ij].y; - double param_0 = uv_e0[0].param + x * (uv_e0[nbhoriz - 1].param - uv_e0[0].param); // sud - double param_2 = uv_e2[0].param + x * (uv_e2[nbhoriz - 1].param - uv_e2[0].param); // nord - double param_1 = uv_e1[0].param + y * (uv_e1[nbvertic - 1].param - uv_e1[0].param); // est - double param_3 = uv_e3[0].param + y * (uv_e3[nbvertic - 1].param - uv_e3[0].param); // ouest + double param_0 = uv_e0[0].normParam + x * (uv_e0.back().normParam - uv_e0[0].normParam); // sud + double param_2 = uv_e2[0].normParam + x * (uv_e2.back().normParam - uv_e2[0].normParam); // nord + double param_1 = uv_e1[0].normParam + y * (uv_e1.back().normParam - uv_e1[0].normParam); // est + double param_3 = uv_e3[0].normParam + y * (uv_e3.back().normParam - uv_e3[0].normParam); // ouest //MESSAGE("params "<Value(param_0); - gp_Pnt2d p1 = c2d[1]->Value(param_1); - gp_Pnt2d p2 = c2d[2]->Value(param_2); - gp_Pnt2d p3 = c2d[3]->Value(param_3); - - double u = (1 - y) * p0.X() + x * p1.X() + y * p2.X() + (1 - x) * p3.X(); - double v = (1 - y) * p0.Y() + x * p1.Y() + y * p2.Y() + (1 - x) * p3.Y(); + gp_UV p0 = quad->side[0]->Value2d(param_0).XY(); + gp_UV p1 = quad->side[1]->Value2d(param_1).XY(); + gp_UV p2 = quad->side[2]->Value2d(param_2).XY(); + gp_UV p3 = quad->side[3]->Value2d(param_3).XY(); - u -= (1 - x) * (1 - y) * a0.X() + x * (1 - y) * a1.X() + - x * y * a2.X() + (1 - x) * y * a3.X(); - v -= (1 - x) * (1 - y) * a0.Y() + x * (1 - y) * a1.Y() + - x * y * a2.Y() + (1 - x) * y * a3.Y(); + gp_UV uv = (1 - y) * p0 + x * p1 + y * p2 + (1 - x) * p3; + uv -= (1 - x) * (1 - y) * a0 + x * (1 - y) * a1 + x * y * a2 + (1 - x) * y * a3; - uv_grid[ij].u = u; - uv_grid[ij].v = v; + uv_grid[ij].u = uv.X(); + uv_grid[ij].v = uv.Y(); } } + return true; } - //======================================================================= //function : ShiftQuad //purpose : auxilary function for ComputeQuadPref //======================================================================= -static void ShiftQuad(FaceQuadStruct* quad, const int num, bool WisF) + +static void ShiftQuad(FaceQuadStruct* quad, const int num, bool) { - if(num>3) return; - int i; - for(i=1; i<=num; i++) { - int nbPts3 = quad->nbPts[0]; - quad->nbPts[0] = quad->nbPts[1]; - quad->nbPts[1] = quad->nbPts[2]; - quad->nbPts[2] = quad->nbPts[3]; - quad->nbPts[3] = nbPts3; - TopoDS_Edge edge3 = quad->edge[0]; - quad->edge[0] = quad->edge[1]; - quad->edge[1] = quad->edge[2]; - quad->edge[2] = quad->edge[3]; - quad->edge[3] = edge3; - double first3 = quad->first[0]; - quad->first[0] = quad->first[1]; - quad->first[1] = quad->first[2]; - quad->first[2] = quad->first[3]; - quad->first[3] = first3; - double last3 = quad->last[0]; - quad->last[0] = quad->last[1]; - quad->last[1] = quad->last[2]; - quad->last[2] = quad->last[3]; - quad->last[3] = last3; - bool isEdgeForward3 = quad->isEdgeForward[0]; - quad->isEdgeForward[0] = quad->isEdgeForward[1]; - quad->isEdgeForward[1] = quad->isEdgeForward[2]; - quad->isEdgeForward[2] = quad->isEdgeForward[3]; - quad->isEdgeForward[3] = isEdgeForward3; - bool isEdgeOut3 = quad->isEdgeOut[0]; - quad->isEdgeOut[0] = quad->isEdgeOut[1]; - quad->isEdgeOut[1] = quad->isEdgeOut[2]; - quad->isEdgeOut[2] = quad->isEdgeOut[3]; - quad->isEdgeOut[3] = isEdgeOut3; - UVPtStruct* uv_edges3 = quad->uv_edges[0]; - quad->uv_edges[0] = quad->uv_edges[1]; - quad->uv_edges[1] = quad->uv_edges[2]; - quad->uv_edges[2] = quad->uv_edges[3]; - quad->uv_edges[3] = uv_edges3; - } - if(!WisF) { - // replacement left and right edges - int nbPts3 = quad->nbPts[1]; - quad->nbPts[1] = quad->nbPts[3]; - quad->nbPts[3] = nbPts3; - TopoDS_Edge edge3 = quad->edge[1]; - quad->edge[1] = quad->edge[3]; - quad->edge[3] = edge3; - double first3 = quad->first[1]; - quad->first[1] = quad->first[3]; - quad->first[3] = first3; - double last3 = quad->last[1]; - quad->last[1] = quad->last[2]; - quad->last[3] = last3; - bool isEdgeForward3 = quad->isEdgeForward[1]; - quad->isEdgeForward[1] = quad->isEdgeForward[3]; - quad->isEdgeForward[3] = isEdgeForward3; - bool isEdgeOut3 = quad->isEdgeOut[1]; - quad->isEdgeOut[1] = quad->isEdgeOut[3]; - quad->isEdgeOut[3] = isEdgeOut3; - UVPtStruct* uv_edges3 = quad->uv_edges[1]; - quad->uv_edges[1] = quad->uv_edges[3]; - quad->uv_edges[3] = uv_edges3; + StdMeshers_FaceSide* side[4] = { quad->side[0], quad->side[1], quad->side[2], quad->side[3] }; + for (int i = BOTTOM_SIDE; i < NB_SIDES; ++i ) { + int id = ( i + num ) % NB_SIDES; + bool wasForward = ( i < TOP_SIDE ); + bool newForward = ( id < TOP_SIDE ); + if ( wasForward != newForward ) + side[ i ]->Reverse(); + quad->side[ id ] = side[ i ]; } } - //======================================================================= //function : CalcUV //purpose : auxilary function for ComputeQuadPref //======================================================================= -static gp_XY CalcUV(double x0, double x1, double y0, double y1, + +static gp_UV CalcUV(double x0, double x1, double y0, double y1, FaceQuadStruct* quad, - const gp_Pnt2d& a0, const gp_Pnt2d& a1, - const gp_Pnt2d& a2, const gp_Pnt2d& a3, - const Handle(Geom2d_Curve)& c2db, - const Handle(Geom2d_Curve)& c2dr, - const Handle(Geom2d_Curve)& c2dt, - const Handle(Geom2d_Curve)& c2dl) + const gp_UV& a0, const gp_UV& a1, + const gp_UV& a2, const gp_UV& a3) { - int nb = quad->nbPts[0]; - int nr = quad->nbPts[1]; - int nt = quad->nbPts[2]; - int nl = quad->nbPts[3]; - - UVPtStruct* uv_eb = quad->uv_edges[0]; - UVPtStruct* uv_er = quad->uv_edges[1]; - UVPtStruct* uv_et = quad->uv_edges[2]; - UVPtStruct* uv_el = quad->uv_edges[3]; + const vector& uv_eb = quad->side[0]->GetUVPtStruct(true,0 ); + const vector& uv_er = quad->side[1]->GetUVPtStruct(false,1); + const vector& uv_et = quad->side[2]->GetUVPtStruct(true,1 ); + const vector& uv_el = quad->side[3]->GetUVPtStruct(false,0); double x = (x0 + y0 * (x1 - x0)) / (1 - (y1 - y0) * (x1 - x0)); double y = y0 + x * (y1 - y0); - double param_b = uv_eb[0].param + x * (uv_eb[nb-1].param - uv_eb[0].param); - double param_t = uv_et[0].param + x * (uv_et[nt-1].param - uv_et[0].param); - double param_r = uv_er[0].param + y * (uv_er[nr-1].param - uv_er[0].param); - double param_l = uv_el[0].param + y * (uv_el[nl-1].param - uv_el[0].param); + double param_b = uv_eb[0].normParam + x * (uv_eb.back().normParam - uv_eb[0].normParam); + double param_t = uv_et[0].normParam + x * (uv_et.back().normParam - uv_et[0].normParam); + double param_r = uv_er[0].normParam + y * (uv_er.back().normParam - uv_er[0].normParam); + double param_l = uv_el[0].normParam + y * (uv_el.back().normParam - uv_el[0].normParam); - gp_Pnt2d p0 = c2db->Value(param_b); - gp_Pnt2d p1 = c2dr->Value(param_r); - gp_Pnt2d p2 = c2dt->Value(param_t); - gp_Pnt2d p3 = c2dl->Value(param_l); + gp_UV p0 = quad->side[BOTTOM_SIDE]->Value2d(param_b).XY(); + gp_UV p1 = quad->side[RIGHT_SIDE ]->Value2d(param_r).XY(); + gp_UV p2 = quad->side[TOP_SIDE ]->Value2d(param_t).XY(); + gp_UV p3 = quad->side[LEFT_SIDE ]->Value2d(param_l).XY(); - double u = (1 - y) * p0.X() + x * p1.X() + y * p2.X() + (1 - x) * p3.X(); - double v = (1 - y) * p0.Y() + x * p1.Y() + y * p2.Y() + (1 - x) * p3.Y(); + gp_UV uv = p0 * (1 - y) + p1 * x + p2 * y + p3 * (1 - x); - u -= (1 - x) * (1 - y) * a0.X() + x * (1 - y) * a1.X() + - x * y * a2.X() + (1 - x) * y * a3.X(); - v -= (1 - x) * (1 - y) * a0.Y() + x * (1 - y) * a1.Y() + - x * y * a2.Y() + (1 - x) * y * a3.Y(); + uv -= (1 - x) * (1 - y) * a0 + x * (1 - y) * a1 + x * y * a2 + (1 - x) * y * a3; //cout<<"x0="<uv_edges[0]; - UVPtStruct* uv_er = quad->uv_edges[1]; - UVPtStruct* uv_et = quad->uv_edges[2]; - UVPtStruct* uv_el = quad->uv_edges[3]; + const vector& uv_eb = quad->side[0]->GetUVPtStruct(true,0 ); + const vector& uv_er = quad->side[1]->GetUVPtStruct(false,1); + const vector& uv_et = quad->side[2]->GetUVPtStruct(true,1 ); + const vector& uv_el = quad->side[3]->GetUVPtStruct(false,0); // arrays for normalized params //cout<<"Dump B:"<X()<<","<Y()<<","<Z()<<")"<D0(uv_eb[0].param,a[0]); - c2d[0]->D0(uv_eb[nb-1].param,a[1]); - c2d[2]->D0(uv_et[nt-1].param,a[2]); - c2d[2]->D0(uv_et[0].param,a[3]); - //cout<<" a[0]("<0) { // add top nodes @@ -1192,8 +1046,7 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref // diagonal node double y0 = npl.Value(i+1); double y1 = npr.Value(i+1); - gp_XY UV = CalcUV(x0, x1, y0, y1, quad, a[0], a[1], a[2], a[3], - c2d[0], c2d[1], c2d[2], c2d[3]); + gp_UV UV = CalcUV(x0, x1, y0, y1, quad, a0, a1, a2, a3); gp_Pnt P = S->Value(UV.X(),UV.Y()); SMDS_MeshNode * N = meshDS->AddNode(P.X(), P.Y(), P.Z()); meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); @@ -1203,8 +1056,7 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref for(j=2; jValue(UV.X(),UV.Y()); SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); @@ -1244,9 +1096,7 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref else { // fill UVL using c2d for(i=1; iD0(uv_el[i].param,p2d); - UVL.Append(p2d.XY()); + UVL.Append( gp_UV ( uv_el[i].u, uv_el[i].v )); } } @@ -1267,8 +1117,7 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref // diagonal node double y0 = npl.Value(i+1); double y1 = npr.Value(i+1); - gp_XY UV = CalcUV(x0, x1, y0, y1, quad, a[0], a[1], a[2], a[3], - c2d[0], c2d[1], c2d[2], c2d[3]); + gp_UV UV = CalcUV(x0, x1, y0, y1, quad, a0, a1, a2, a3); gp_Pnt P = S->Value(UV.X(),UV.Y()); SMDS_MeshNode * N = meshDS->AddNode(P.X(), P.Y(), P.Z()); meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); @@ -1278,8 +1127,7 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref for(j=2; jValue(UV.X(),UV.Y()); SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); @@ -1311,9 +1159,7 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref else { // fill UVR using c2d for(i=1; iD0(uv_er[i].param,p2d); - UVR.Append(p2d.XY()); + UVR.Append( gp_UV( uv_er[i].u, uv_er[i].v )); } } @@ -1333,11 +1179,9 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref for(i=dl+2; iD0(uv_eb[i-1].param,p2d); - } + // create and add needed nodes // add linear layers for(i=2; iValue(UV.X(),UV.Y()); SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); @@ -1391,470 +1234,7 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref } } - QuadDelete(quad); bool isOk = true; return isOk; } - -//============================================================================= -/*! - * LoadEdgePoints2 - */ -//============================================================================= -UVPtStruct* StdMeshers_Quadrangle_2D::LoadEdgePoints2 (SMESH_Mesh & aMesh, - const TopoDS_Face& F, - const TopoDS_Edge& E, - bool IsReverse) -{ - //MESSAGE("StdMeshers_Quadrangle_2D::LoadEdgePoints"); - // --- IDNodes of first and last Vertex - TopoDS_Vertex VFirst, VLast; - TopExp::Vertices(E, VFirst, VLast); // corresponds to f and l - - ASSERT(!VFirst.IsNull()); - SMDS_NodeIteratorPtr lid = aMesh.GetSubMesh(VFirst)->GetSubMeshDS()->GetNodes(); - if (!lid->more()) { - MESSAGE ( "NO NODE BUILT ON VERTEX" ); - return 0; - } - const SMDS_MeshNode* idFirst = lid->next(); - - ASSERT(!VLast.IsNull()); - lid = aMesh.GetSubMesh(VLast)->GetSubMeshDS()->GetNodes(); - if (!lid->more()) { - MESSAGE ( "NO NODE BUILT ON VERTEX" ); - return 0; - } - const SMDS_MeshNode* idLast = lid->next(); - - // --- edge internal IDNodes (relies on good order storage, not checked) - - map params; - SMDS_NodeIteratorPtr ite = aMesh.GetSubMesh(E)->GetSubMeshDS()->GetNodes(); - int nbPoints = aMesh.GetSubMesh(E)->GetSubMeshDS()->NbNodes(); - - if(!_quadraticMesh) { - while(ite->more()) { - const SMDS_MeshNode* node = ite->next(); - const SMDS_EdgePosition* epos = - static_cast(node->GetPosition().get()); - double param = epos->GetUParameter(); - params[param] = node; - } - } - else { - vector nodes(nbPoints+2); - nodes[0] = idFirst; - nodes[nbPoints+1] = idLast; - nbPoints = nbPoints/2; - int nn = 1; - while(ite->more()) { - const SMDS_MeshNode* node = ite->next(); - nodes[nn++] = node; - // check if node is medium - bool IsMedium = false; - SMDS_ElemIteratorPtr itn = node->GetInverseElementIterator(); - while (itn->more()) { - const SMDS_MeshElement* elem = itn->next(); - if ( elem->GetType() != SMDSAbs_Edge ) - continue; - if(elem->IsMediumNode(node)) { - IsMedium = true; - break; - } - } - if(IsMedium) - continue; - const SMDS_EdgePosition* epos = - static_cast(node->GetPosition().get()); - double param = epos->GetUParameter(); - params[param] = node; - } - } - - if (nbPoints != params.size()) { - MESSAGE( "BAD NODE ON EDGE POSITIONS" ); - return 0; - } - UVPtStruct* uvslf = new UVPtStruct[nbPoints + 2]; - - double f, l; - Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); - - const TopoDS_Wire& W = BRepTools::OuterWire(F); - bool FisF = (F.Orientation()==TopAbs_FORWARD); - bool WisF = (W.Orientation()==TopAbs_FORWARD); - bool isForward = (E.Orientation()==TopAbs_FORWARD); - //if(isForward) cout<<"E is FORWARD"<Value(f); // first point = Vertex Forward - uvslf[0].x = p.X(); - uvslf[0].y = p.Y(); - uvslf[0].param = f; - uvslf[0].node = idFirst; - //MESSAGE("__ f "<::iterator itp = params.begin(); - for (int i = 1; i <= nbPoints; i++) { // nbPoints internal - double param = (*itp).first; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].node = (*itp).second; - //MESSAGE("__ "<Value(l); // last point = Vertex Reversed - uvslf[nbPoints + 1].x = p.X(); - uvslf[nbPoints + 1].y = p.Y(); - uvslf[nbPoints + 1].param = l; - uvslf[nbPoints + 1].node = idLast; - //MESSAGE("__ l "<Value(l); // first point = Vertex Reversed - uvslf[0].x = p.X(); - uvslf[0].y = p.Y(); - uvslf[0].param = l; - uvslf[0].node = idLast; - //MESSAGE("__ l "<::reverse_iterator itp = params.rbegin(); - for (int j = nbPoints; j >= 1; j--) { // nbPoints internal - double param = (*itp).first; - int i = nbPoints + 1 - j; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].node = (*itp).second; - //MESSAGE("__ "<Value(f); // last point = Vertex Forward - uvslf[nbPoints + 1].x = p.X(); - uvslf[nbPoints + 1].y = p.Y(); - uvslf[nbPoints + 1].param = f; - uvslf[nbPoints + 1].node = idFirst; - //MESSAGE("__ f "<GetSubMeshDS()->GetNodes(); - if (!lid->more()) - { - MESSAGE ( "NO NODE BUILT ON VERTEX" ); - return 0; - } - const SMDS_MeshNode* idFirst = lid->next(); - - ASSERT(!VLast.IsNull()); - lid = aMesh.GetSubMesh(VLast)->GetSubMeshDS()->GetNodes(); - if (!lid->more()) - { - MESSAGE ( "NO NODE BUILT ON VERTEX" ); - return 0; - } - const SMDS_MeshNode* idLast = lid->next(); - - // --- edge internal IDNodes (relies on good order storage, not checked) - -// if(_quadraticMesh) { - // fill myNLinkNodeMap -// SMDS_ElemIteratorPtr iter = aMesh.GetSubMesh(E)->GetSubMeshDS()->GetElements(); -// while(iter->more()) { -// const SMDS_MeshElement* elem = iter->next(); -// SMDS_ElemIteratorPtr nodeIt = elem->nodesIterator(); -// const SMDS_MeshNode* n1 = static_cast( nodeIt->next() ); -// const SMDS_MeshNode* n2 = static_cast( nodeIt->next() ); -// const SMDS_MeshNode* n3 = static_cast( nodeIt->next() ); -// NLink link(( n1 < n2 ? n1 : n2 ), ( n1 < n2 ? n2 : n1 )); -// myNLinkNodeMap.insert(NLinkNodeMap::value_type(link,n3)); -// myNLinkNodeMap[link] = n3; -// } -// } - - map params; - SMDS_NodeIteratorPtr ite = aMesh.GetSubMesh(E)->GetSubMeshDS()->GetNodes(); - int nbPoints = aMesh.GetSubMesh(E)->GetSubMeshDS()->NbNodes(); - - if(!_quadraticMesh) { - while(ite->more()) { - const SMDS_MeshNode* node = ite->next(); - const SMDS_EdgePosition* epos = - static_cast(node->GetPosition().get()); - double param = epos->GetUParameter(); - params[param] = node; - } - } - else { - nbPoints = nbPoints/2; - while(ite->more()) { - const SMDS_MeshNode* node = ite->next(); - // check if node is medium - bool IsMedium = false; - SMDS_ElemIteratorPtr itn = node->GetInverseElementIterator(); - while (itn->more()) { - const SMDS_MeshElement* elem = itn->next(); - if ( elem->GetType() != SMDSAbs_Edge ) - continue; - if(elem->IsMediumNode(node)) { - IsMedium = true; - break; - } - } - if(IsMedium) - continue; - const SMDS_EdgePosition* epos = - static_cast(node->GetPosition().get()); - double param = epos->GetUParameter(); - params[param] = node; - } - } - - if (nbPoints != params.size()) { - MESSAGE( "BAD NODE ON EDGE POSITIONS" ); - return 0; - } - UVPtStruct* uvslf = new UVPtStruct[nbPoints + 2]; - - double f, l; - Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); - - bool isForward = (((l - f) * (last - first)) > 0); - double paramin = 0; - double paramax = 0; - if (isForward) - { - paramin = f; - paramax = l; - gp_Pnt2d p = C2d->Value(f); // first point = Vertex Forward - uvslf[0].x = p.X(); - uvslf[0].y = p.Y(); - uvslf[0].param = f; - uvslf[0].node = idFirst; - //MESSAGE("__ f "<::iterator itp = params.begin(); - for (int i = 1; i <= nbPoints; i++) // nbPoints internal - { - double param = (*itp).first; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].node = (*itp).second; - //MESSAGE("__ "<Value(l); // last point = Vertex Reversed - uvslf[nbPoints + 1].x = p.X(); - uvslf[nbPoints + 1].y = p.Y(); - uvslf[nbPoints + 1].param = l; - uvslf[nbPoints + 1].node = idLast; - //MESSAGE("__ l "<Value(l); // first point = Vertex Reversed - uvslf[0].x = p.X(); - uvslf[0].y = p.Y(); - uvslf[0].param = l; - uvslf[0].node = idLast; - //MESSAGE("__ l "<::reverse_iterator itp = params.rbegin(); - - for (int j = nbPoints; j >= 1; j--) // nbPoints internal - { - double param = (*itp).first; - int i = nbPoints + 1 - j; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].node = (*itp).second; - //MESSAGE("__ "<Value(f); // last point = Vertex Forward - uvslf[nbPoints + 1].x = p.X(); - uvslf[nbPoints + 1].y = p.Y(); - uvslf[nbPoints + 1].param = f; - uvslf[nbPoints + 1].node = idFirst; - //MESSAGE("__ f "< params; - - // --- edge internal points - double fi, li; - Handle(Geom_Curve) Curve = BRep_Tool::Curve(E, fi, li); - if (!Curve.IsNull()) { - try { - GeomAdaptor_Curve C3d (Curve); - double length = EdgeLength(E); - double eltSize = length / nb_segm; - GCPnts_UniformAbscissa Discret (C3d, eltSize, fi, li); - if (!Discret.IsDone()) return false; - int NbPoints = Discret.NbPoints(); - for (int i = 1; i <= NbPoints; i++) { - double param = Discret.Parameter(i); - params.push_back(param); - } - } - catch (Standard_Failure) { - return 0; - } - } - else - { - // Edge is a degenerated Edge - BRep_Tool::Range(E, fi, li); - double du = (li - fi) / nb_segm; - for (int i = 1; i <= nb_segm + 1; i++) - { - double param = fi + (i - 1) * du; - params.push_back(param); - } - } - - double f, l; - Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); - ASSERT(f != l); - - bool isForward = (((l - f) * (last - first)) > 0); - if (isForward) { - list::iterator itU = params.begin(); - for (int i = 0; i <= nb_segm; i++) // nbPoints internal - { - double param = *itU; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].normParam = (param - f) / (l - f); - itU++; - } - } else { - list::reverse_iterator itU = params.rbegin(); - for (int j = nb_segm; j >= 0; j--) // nbPoints internal - { - double param = *itU; - int i = nb_segm - j; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].normParam = (param - l) / (f - l); - itU++; - } - } - - return uvslf; -} - - -//============================================================================= -/*! - * - */ -//============================================================================= - -ostream & StdMeshers_Quadrangle_2D::SaveTo(ostream & save) -{ - return save; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -istream & StdMeshers_Quadrangle_2D::LoadFrom(istream & load) -{ - return load; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -ostream & operator <<(ostream & save, StdMeshers_Quadrangle_2D & hyp) -{ - return hyp.SaveTo( save ); -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -istream & operator >>(istream & load, StdMeshers_Quadrangle_2D & hyp) -{ - return hyp.LoadFrom( load ); -}