#include <cmath>
#include <limits>
-#define __myDEBUG
+#ifdef _DEBUG_
+//#define __myDEBUG
+#endif
using namespace std;
StdMeshers_FaceSide* _wire;
int _edgeInd; // index of my EDGE in _wire
bool _advancable; // true if there is a viscous layer on my EDGE
+ bool _isStraight2D;// pcurve type
_PolyLine* _leftLine; // lines of neighbour EDGE's
_PolyLine* _rightLine;
int _firstPntInd; // index in vector<UVPtStruct> of _wire
typedef vector< _Segment >::iterator TSegIterator;
typedef vector< _LayerEdge >::iterator TEdgeIterator;
+ TIDSortedElemSet _newFaces; // faces generated from this line
+
bool IsCommonEdgeShared( const _PolyLine& other );
size_t FirstLEdge() const
{
bool Compute(const _Segment& seg1, const _Segment& seg2, bool seg2IsRay = false )
{
+ const double eps = 1e-10;
_vec1 = seg1.p2() - seg1.p1();
_vec2 = seg2.p2() - seg2.p1();
_vec21 = seg1.p1() - seg2.p1();
if ( fabs(_D) < std::numeric_limits<double>::min())
return false;
_param1 = _vec2.Crossed(_vec21) / _D;
- if (_param1 < 0 || _param1 > 1 )
+ if (_param1 < -eps || _param1 > 1 + eps )
return false;
_param2 = _vec1.Crossed(_vec21) / _D;
- if (_param2 < 0 || ( !seg2IsRay && _param2 > 1 ))
+ if (_param2 < -eps || ( !seg2IsRay && _param2 > 1 + eps ))
return false;
return true;
}
const TopoDS_Edge& E,
const TopoDS_Vertex& V);
void setLenRatio( _LayerEdge& LE, const gp_Pnt& pOut );
+ void setLayerEdgeData( _LayerEdge& lEdge,
+ const double u,
+ Handle(Geom2d_Curve)& pcurve,
+ const bool reverse);
void adjustCommonEdge( _PolyLine& LL, _PolyLine& LR );
void calcLayersHeight(const double totalThick,
vector<double>& heights);
SMESH_ComputeErrorPtr error = builder.GetError();
if ( error && !error->IsOK() )
theMesh.GetSubMesh( theFace )->GetComputeError() = error;
- // else if ( !pm )
- // pm.reset( new SMESH_ProxyMesh( theMesh ));
- pm.reset();
+ else if ( !pm )
+ pm.reset( new SMESH_ProxyMesh( theMesh ));
+ if ( getenv("ONLY_VL2D"))
+ pm.reset();
}
else
{
_helper.SetSubShape( _face );
_helper.SetElementsOnShape(true);
- _surface = BRep_Tool::Surface( theFace );
+ //_face.Orientation( TopAbs_FORWARD );
+ _surface = BRep_Tool::Surface( _face );
if ( _hyp )
_fPowN = pow( _hyp->GetStretchFactor(), _hyp->GetNumberLayers() );
if ( ! inflate() ) // advance fronts
return _proxyMesh;
+ // remove elements and nodes from _face
+ removeMeshFaces( _face );
+
if ( !shrink() ) // shrink segments on edges w/o layers
return _proxyMesh;
if ( ! refine() ) // make faces
return _proxyMesh;
- improve();
+ //improve();
return _proxyMesh;
}
while ( points[ iPnt ].normParam < lastNormPar )
++iPnt;
L._lastPntInd = iPnt;
- L._lEdges.resize( L._lastPntInd - L._firstPntInd + 1 );
+ L._lEdges.resize( Max( 3, L._lastPntInd - L._firstPntInd + 1 )); // 3 edges minimum
// TODO: add more _LayerEdge's to strongly curved EDGEs
// in order not to miss collisions
Handle(Geom2d_Curve) pcurve = L._wire->Curve2d( L._edgeInd );
- gp_Pnt2d uv; gp_Vec2d tangent;
+ const bool reverse = (( L._wire->Edge( iE ).Orientation() == TopAbs_REVERSED ) ^
+ (_face.Orientation() == TopAbs_REVERSED ));
for ( int i = L._firstPntInd; i <= L._lastPntInd; ++i )
{
_LayerEdge& lEdge = L._lEdges[ i - L._firstPntInd ];
const double u = ( i == L._firstPntInd ? wire->FirstU(iE) : points[ i ].param );
- pcurve->D1( u , uv, tangent );
- tangent.Normalize();
- if ( L._wire->Edge( iE ).Orientation() == TopAbs_REVERSED )
- tangent.Reverse();
- lEdge._uvOut = lEdge._uvIn = uv.XY();
- lEdge._normal2D.SetCoord( -tangent.Y(), tangent.X() );
- lEdge._ray.SetLocation( lEdge._uvOut );
- lEdge._ray.SetDirection( lEdge._normal2D );
- lEdge._isBlocked = false;
- lEdge._length2D = 0;
-
+ setLayerEdgeData( lEdge, u, pcurve, reverse );
setLenRatio( lEdge, SMESH_TNodeXYZ( points[ i ].node ) );
}
+ if ( L._lastPntInd - L._firstPntInd + 1 < 3 ) // add 3d _LayerEdge in the middle
+ {
+ L._lEdges[2] = L._lEdges[1];
+ const double u = 0.5 * ( wire->FirstU(iE) + wire->LastU(iE) );
+ setLayerEdgeData( L._lEdges[1], u, pcurve, reverse );
+ gp_Pnt p = 0.5 * ( SMESH_TNodeXYZ( points[ L._firstPntInd ].node ) +
+ SMESH_TNodeXYZ( points[ L._lastPntInd ].node ));
+ setLenRatio( L._lEdges[1], p );
+ }
}
}
_SegmentTree::box_type faceBndBox2D;
for ( iPoLine = 0; iPoLine < _polyLineVec.size(); ++iPoLine )
faceBndBox2D.Add( *_polyLineVec[ iPoLine]._segTree->getBox() );
+ double boxTol = 1e-3 * sqrt( faceBndBox2D.SquareExtent() );
//
if ( _thickness * maxLen2dTo3dRatio > sqrt( faceBndBox2D.SquareExtent() ) / 10 )
{
for ( size_t iL1 = 0; iL1 < _polyLineVec.size(); ++iL1 )
{
_PolyLine& L1 = _polyLineVec[ iL1 ];
- const _SegmentTree::box_type* boxL1 = L1._segTree->getBox();
- for ( size_t iL2 = iL1+1; iL2 < _polyLineVec.size(); ++iL2 )
+ _SegmentTree::box_type boxL1 = * L1._segTree->getBox();
+ boxL1.Enlarge( boxTol );
+ // consider case of a circle as well!
+ for ( size_t iL2 = iL1; iL2 < _polyLineVec.size(); ++iL2 )
{
_PolyLine& L2 = _polyLineVec[ iL2 ];
- if ( boxL1->IsOut( *L2._segTree->getBox() ))
+ _SegmentTree::box_type boxL2 = * L2._segTree->getBox();
+ boxL2.Enlarge( boxTol );
+ if ( boxL1.IsOut( boxL2 ))
continue;
for ( size_t iLE = 1; iLE < L1._lEdges.size(); ++iLE )
{
}
// add self to _reachableLines
Geom2dAdaptor_Curve pcurve( L1._wire->Curve2d( L1._edgeInd ));
- if ( pcurve.GetType() != GeomAbs_Line )
+ L1._isStraight2D = ( pcurve.GetType() == GeomAbs_Line );
+ if ( !L1._isStraight2D )
{
// TODO: check carefully
L1._reachableLines.push_back( & L1 );
EL._normal2D = normCommon;
EL._ray.SetLocation ( EL._uvOut );
EL._ray.SetDirection( EL._normal2D );
- if ( nbAdvancableL == 1 ) {
- EL._isBlocked = true;
+ if ( nbAdvancableL == 1 ) { // _normal2D is true normal (not average)
+ EL._isBlocked = true; // prevent intersecting with _Segments of _advancable line
EL._length2D = 0;
}
// update _LayerEdge::_len2dTo3dRatio according to a new direction
LR._lEdges.erase( LR._lEdges.begin()+1, eIt );
else
LL._lEdges.erase( eIt, --LL._lEdges.end() );
+ // eIt = isR ? L._lEdges.begin()+1 : L._lEdges.end()-2;
+ // for ( size_t i = 1; i < iLE; ++i, eIt += dIt )
+ // eIt->_isBlocked = true;
}
}
}
{
if ( nbAdvancableL == 1 )
{
- // make that the _LayerEdge at VERTEX is not shared by LL and LR
+ // make that the _LayerEdge at VERTEX is not shared by LL and LR:
+ // different normals is a sign that they are not shared
_LayerEdge& notSharedEdge = LL._advancable ? LR._lEdges[0] : LL._lEdges.back();
_LayerEdge& sharedEdge = LR._advancable ? LR._lEdges[0] : LL._lEdges.back();
notSharedEdge._normal2D.SetCoord( 0.,0. );
- sharedEdge._normal2D = normAvg;
- sharedEdge._isBlocked = false;
+ sharedEdge._normal2D = normAvg;
+ sharedEdge._isBlocked = false;
+ notSharedEdge._isBlocked = true;
}
}
}
}
+//================================================================================
+/*!
+ * \brief initialize data of a _LayerEdge
+ */
+//================================================================================
+
+void _ViscousBuilder2D::setLayerEdgeData( _LayerEdge& lEdge,
+ const double u,
+ Handle(Geom2d_Curve)& pcurve,
+ const bool reverse)
+{
+ gp_Pnt2d uv; gp_Vec2d tangent;
+ pcurve->D1( u, uv, tangent );
+ tangent.Normalize();
+ if ( reverse )
+ tangent.Reverse();
+ lEdge._uvOut = lEdge._uvIn = uv.XY();
+ lEdge._normal2D.SetCoord( -tangent.Y(), tangent.X() );
+ lEdge._ray.SetLocation( lEdge._uvOut );
+ lEdge._ray.SetDirection( lEdge._normal2D );
+ lEdge._isBlocked = false;
+ lEdge._length2D = 0;
+}
+
//================================================================================
/*!
* \brief Compute and set _LayerEdge::_len2dTo3dRatio
// if (nbSteps == 0 )
// return error("failed at the very first inflation step");
+
+ // remove _LayerEdge's of one line intersecting with each other
+ for ( size_t iL = 0; iL < _polyLineVec.size(); ++iL )
+ {
+ _PolyLine& L = _polyLineVec[ iL ];
+ if ( !L._advancable ) continue;
+
+ // replace an inactive (1st) _LayerEdge with an active one of a neighbour _PolyLine
+ if ( /*!L._leftLine->_advancable &&*/ L.IsCommonEdgeShared( *L._leftLine ) ) {
+ L._lEdges[0] = L._leftLine->_lEdges.back();
+ }
+ if ( !L._rightLine->_advancable && L.IsCommonEdgeShared( *L._rightLine ) ) {
+ L._lEdges.back() = L._rightLine->_lEdges[0];
+ }
+
+ _SegmentIntersection intersection;
+ for ( int isR = 0; ( isR < 2 && L._lEdges.size() > 2 ); ++isR )
+ {
+ int nbRemove = 0, deltaIt = isR ? -1 : +1;
+ _PolyLine::TEdgeIterator eIt = isR ? L._lEdges.end()-1 : L._lEdges.begin();
+ if ( eIt->_length2D == 0 ) continue;
+ _Segment seg1( eIt->_uvOut, eIt->_uvIn );
+ for ( eIt += deltaIt; nbRemove < L._lEdges.size()-1; eIt += deltaIt )
+ {
+ _Segment seg2( eIt->_uvOut, eIt->_uvIn );
+ if ( !intersection.Compute( seg1, seg2 ))
+ break;
+ ++nbRemove;
+ }
+ if ( nbRemove > 0 ) {
+ if ( nbRemove == L._lEdges.size()-1 ) // 1st and last _LayerEdge's intersect
+ {
+ --nbRemove;
+ _LayerEdge& L0 = L._lEdges.front();
+ _LayerEdge& L1 = L._lEdges.back();
+ L0._length2D *= intersection._param1 * 0.5;
+ L1._length2D *= intersection._param2 * 0.5;
+ L0._uvIn = L0._uvOut + L0._normal2D * L0._length2D;
+ L1._uvIn = L1._uvOut + L1._normal2D * L1._length2D;
+ if ( L.IsCommonEdgeShared( *L._leftLine ))
+ L._leftLine->_lEdges.back() = L0;
+ }
+ if ( isR )
+ L._lEdges.erase( L._lEdges.end()-nbRemove-1,
+ L._lEdges.end()-nbRemove );
+ else
+ L._lEdges.erase( L._lEdges.begin()+1,
+ L._lEdges.begin()+1+nbRemove );
+ }
+ }
+ }
return true;
}
bool _ViscousBuilder2D::shrink()
{
- gp_Pnt2d uv; gp_Vec2d tangent;
+ gp_Pnt2d uv; //gp_Vec2d tangent;
_SegmentIntersection intersection;
double sign;
double u1 = L._wire->FirstU( L._edgeInd ), uf = u1;
double u2 = L._wire->LastU ( L._edgeInd ), ul = u2;
- // Get length of existing segments (from edge start to node) and their nodes
+ // a ratio to pass 2D <--> 1D
+ const double len1D = 1e-3;
+ const double len2D = pcurve->Value(uf).Distance( pcurve->Value(uf+len1D));
+ double len1dTo2dRatio = len1D / len2D;
+
+ // create a vector of proxy nodes
const vector<UVPtStruct>& points = L._wire->GetUVPtStruct();
UVPtStructVec nodeDataVec( & points[ L._firstPntInd ],
& points[ L._lastPntInd + 1 ]);
nodeDataVec.back ().param = u2;
nodeDataVec.front().normParam = 0;
nodeDataVec.back ().normParam = 1;
+
+ // Get length of existing segments (from an edge start to a node) and their nodes
vector< double > segLengths( nodeDataVec.size() - 1 );
BRepAdaptor_Curve curve( E );
for ( size_t iP = 1; iP < nodeDataVec.size(); ++iP )
segLengths[ iP-1 ] = len;
}
+ // Move first and last parameters on EDGE (U of n1) according to layers' thickness
+ // and create nodes of layers on EDGE ( -x-x-x )
+
// Before
// n1 n2 n3 n4
// x-----x-----x-----x-----
// x-x-x-x-----x-----x----
// | | | | e1 e2 e3
- // Move first and last parameters on EDGE (U of n1) according to layers' thickness
- // and create nodes of layers on EDGE ( -x-x-x )
int isRShrinkedForAdjacent;
UVPtStructVec nodeDataForAdjacent;
for ( int isR = 0; isR < 2; ++isR )
// try to find length of advancement along L by intersecting L with
// an adjacent _Segment of L2
- double & length2D = nearLE._length2D;
+ double& length2D = nearLE._length2D;
+ double length1D = 0;
sign = ( isR ^ edgeReversed ) ? -1. : 1.;
- pcurve->D1( u, uv, tangent );
+ bool isConvex = false;
if ( L2->_advancable )
{
int iFSeg2 = isR ? 0 : L2->_segments.size() - 1;
Geom2dAdaptor_Curve edgeCurve( pcurve, Min( uf, ul ), Max( uf, ul ));
Geom2dAdaptor_Curve seg2Curve( seg2Line );
Geom2dInt_GInter curveInt( edgeCurve, seg2Curve, 1e-7, 1e-7 );
- double maxDist2d = 2 * L2->_lEdges[ iLSeg2 ]._length2D;
- if ( curveInt.IsDone() &&
- !curveInt.IsEmpty() &&
- curveInt.Point( 1 ).Value().Distance( uvFSeg2Out ) <= maxDist2d )
- { /* convex VERTEX */
- length2D = Abs( u - curveInt.Point( 1 ).ParamOnFirst() );
+ isConvex = ( curveInt.IsDone() && !curveInt.IsEmpty() );
+ if ( isConvex ) {
+ /* convex VERTEX */
+ length1D = Abs( u - curveInt.Point( 1 ).ParamOnFirst() );
+ double maxDist2d = 2 * L2->_lEdges[ iLSeg2 ]._length2D;
+ isConvex = ( length1D < maxDist2d * len1dTo2dRatio );
/* |L seg2
* | o---o---
* | / |
* |/ | L2
* x------x--- */
}
- else { /* concave VERTEX */ /* o-----o---
+ if ( !isConvex ) { /* concave VERTEX */ /* o-----o---
* \ |
* \ | L2
* x--x---
* /
* L / */
- length2D = sign * L2->_lEdges[ iFSeg2 ]._length2D;
+ length2D = L2->_lEdges[ iFSeg2 ]._length2D;
+ //if ( L2->_advancable ) continue;
}
}
else // L2 is advancable but in the face adjacent by L
{
length2D = farLE._length2D;
- if ( length2D == 0 )
- length2D = ( isR ? L._leftLine->_lEdges.back() : L._rightLine->_lEdges.front() )._length2D;
+ if ( length2D == 0 ) {
+ _LayerEdge& neighborLE =
+ ( isR ? L._leftLine->_lEdges.back() : L._rightLine->_lEdges.front() );
+ length2D = neighborLE._length2D;
+ if ( length2D == 0 )
+ length2D = _thickness * nearLE._len2dTo3dRatio;
+ }
}
+
// move u to the internal boundary of layers
+ // u --> u
+ // x-x-x-x-----x-----x----
double maxLen3D = Min( _thickness, edgeLen / ( 1 + nbAdvancable ));
double maxLen2D = maxLen3D * nearLE._len2dTo3dRatio;
- if ( length2D > maxLen2D )
+ if ( !length2D ) length2D = length1D / len1dTo2dRatio;
+ if ( Abs( length2D ) > maxLen2D )
length2D = maxLen2D;
nearLE._uvIn = nearLE._uvOut + nearLE._normal2D * length2D;
- u += length2D * sign;
+ u += length2D * len1dTo2dRatio * sign;
nodeDataVec[ iPEnd ].param = u;
gp_Pnt2d newUV = pcurve->Value( u );
params[ i ] = u0 + heights[ i ];
// create nodes of layers and edges between them
+ // x-x-x-x---
vector< const SMDS_MeshNode* >& layersNode = isR ? L._rightNodes : L._leftNodes;
vector<gp_XY>& nodeUV = ( isR ? L._lEdges.back() : L._lEdges[0] )._uvRefined;
nodeUV.resize ( _hyp->GetNumberLayers() );
// Shrink edges to fit in between the layers at EDGE ends
- const double newLength = GCPnts_AbscissaPoint::Length( curve, u1, u2 );
- const double lenRatio = newLength / edgeLen * ( edgeReversed ? -1. : 1. );
+ double newLength = GCPnts_AbscissaPoint::Length( curve, u1, u2 );
+ double lenRatio = newLength / edgeLen * ( edgeReversed ? -1. : 1. );
for ( size_t iP = 1; iP < nodeDataVec.size()-1; ++iP )
{
const SMDS_MeshNode* oldNode = nodeDataVec[iP].node;
// nodeDataVec[iP].y = segLengths[iP-1] / edgeLen;
}
- // add nodeDataForAdjacent to nodeDataVec
+ // Add nodeDataForAdjacent to nodeDataVec
+
if ( !nodeDataForAdjacent.empty() )
{
const double par1 = isRShrinkedForAdjacent ? u2 : uf;
nodeDataForAdjacent[iP].normParam = deltaR + normDelta * lenFromPar1 / shrinkLen;
}
// concatenate nodeDataVec and nodeDataForAdjacent
- nodeDataVec.insert( isRShrinkedForAdjacent ? nodeDataVec.end() : nodeDataVec.begin(),
+ nodeDataVec.insert(( isRShrinkedForAdjacent ? nodeDataVec.end() : nodeDataVec.begin() ),
nodeDataForAdjacent.begin(), nodeDataForAdjacent.end() );
}
+ // Extend nodeDataVec by a node located at the end of not shared _LayerEdge
+ /* n - to add to nodeDataVec
+ * o-----o---
+ * |\ |
+ * | o---o---
+ * | |x--x--- L2
+ * | /
+ * |/ L
+ * x
+ * / */
+ for ( int isR = 0; isR < 2; ++isR )
+ {
+ _PolyLine& L2 = *( isR ? L._rightLine : L._leftLine ); // line with layers
+ if ( ! L2._advancable || L.IsCommonEdgeShared( L2 ) )
+ continue;
+ vector< const SMDS_MeshNode* >& layerNodes2 = isR ? L2._leftNodes : L2._rightNodes;
+ _LayerEdge& LE2 = isR ? L2._lEdges.front() : L2._lEdges.back();
+ if ( layerNodes2.empty() )
+ {
+ // refine the not shared _LayerEdge
+ vector<double> layersHeight;
+ calcLayersHeight( LE2._length2D, layersHeight );
+
+ vector<gp_XY>& nodeUV2 = LE2._uvRefined;
+ nodeUV2.resize ( _hyp->GetNumberLayers() );
+ layerNodes2.resize( _hyp->GetNumberLayers() );
+ for ( size_t i = 0; i < layersHeight.size(); ++i )
+ {
+ gp_XY uv = LE2._uvOut + LE2._normal2D * layersHeight[i];
+ gp_Pnt p = _surface->Value( uv.X(), uv.Y() );
+ nodeUV2 [ i ] = uv;
+ layerNodes2[ i ] = _helper.AddNode( p.X(), p.Y(), p.Z(), /*id=*/0, uv.X(), uv.Y() );
+ }
+ }
+ UVPtStruct ptOfNode;
+ ptOfNode.u = LE2._uvRefined.back().X();
+ ptOfNode.v = LE2._uvRefined.back().Y();
+ ptOfNode.node = layerNodes2.back();
+ ptOfNode.param = isR ? ul : uf;
+ ptOfNode.normParam = isR ? 1 : 0;
+
+ nodeDataVec.insert(( isR ? nodeDataVec.end() : nodeDataVec.begin() ), ptOfNode );
+
+ // recompute normParam of nodes in nodeDataVec
+ newLength = GCPnts_AbscissaPoint::Length( curve,
+ nodeDataVec.front().param,
+ nodeDataVec.back().param);
+ for ( size_t iP = 1; iP < nodeDataVec.size(); ++iP )
+ {
+ const double len = GCPnts_AbscissaPoint::Length( curve,
+ nodeDataVec.front().param,
+ nodeDataVec[iP].param );
+ nodeDataVec[iP].normParam = len / newLength;
+ }
+ }
+
// create a proxy sub-mesh containing the moved nodes
_ProxyMeshOfFace::_EdgeSubMesh* edgeSM = getProxyMesh()->GetEdgeSubMesh( edgeID );
edgeSM->SetUVPtStructVec( nodeDataVec );
bool _ViscousBuilder2D::refine()
{
- // remove elements and nodes from _face
- removeMeshFaces( _face );
-
// store a proxyMesh in a sub-mesh
// make faces on each _PolyLine
vector< double > layersHeight;
_PolyLine& L = _polyLineVec[ iL ];
if ( !L._advancable ) continue;
- //if ( L._leftLine->_advancable ) L._lEdges[0] = L._leftLine->_lEdges.back();
-
// replace an inactive (1st) _LayerEdge with an active one of a neighbour _PolyLine
size_t iLE = 0, nbLE = L._lEdges.size();
- if ( /*!L._leftLine->_advancable &&*/ L.IsCommonEdgeShared( *L._leftLine ))
+ const bool leftEdgeShared = L.IsCommonEdgeShared( *L._leftLine );
+ const bool rightEdgeShared = L.IsCommonEdgeShared( *L._rightLine );
+ if ( /*!L._leftLine->_advancable &&*/ leftEdgeShared )
{
L._lEdges[0] = L._leftLine->_lEdges.back();
iLE += int( !L._leftLine->_advancable );
}
- if ( !L._rightLine->_advancable && L.IsCommonEdgeShared( *L._rightLine ))
+ if ( !L._rightLine->_advancable && rightEdgeShared )
{
L._lEdges.back() = L._rightLine->_lEdges[0];
--nbLE;
}
- // remove intersecting _LayerEdge's
- _SegmentIntersection intersection;
- for ( int isR = 0; ( isR < 2 && L._lEdges.size() > 2 ); ++isR )
- {
- int nbRemove = 0, deltaIt = isR ? -1 : +1;
- _PolyLine::TEdgeIterator eIt = isR ? L._lEdges.end()-1 : L._lEdges.begin();
- _Segment seg1( eIt->_uvOut, eIt->_uvIn );
- for ( eIt += deltaIt; nbRemove < L._lEdges.size()-2; eIt += deltaIt )
- {
- _Segment seg2( eIt->_uvOut, eIt->_uvIn );
- if ( !intersection.Compute( seg1, seg2 ))
- break;
- ++nbRemove;
- }
- if ( nbRemove > 0 ) {
- if ( isR )
- L._lEdges.erase( L._lEdges.end()-nbRemove-1,
- L._lEdges.end()-nbRemove );
- else
- L._lEdges.erase( L._lEdges.begin()+2,
- L._lEdges.begin()+2+nbRemove );
- }
- }
-
// limit length of neighbour _LayerEdge's to avoid sharp change of layers thickness
vector< double > segLen( L._lEdges.size() );
segLen[0] = 0.0;
size_t iF = 0, iL = L._lEdges.size()-1;
size_t *i = isR ? &iL : &iF;
//size_t iRef = *i;
- gp_XY uvInPrev = L._lEdges[ *i ]._uvIn;
+ _LayerEdge* prevLE = & L._lEdges[ *i ];
double weight = 0;
for ( ++iF, --iL; iF < L._lEdges.size()-1; ++iF, --iL )
{
_LayerEdge& LE = L._lEdges[*i];
- gp_XY tangent ( LE._normal2D.Y(), -LE._normal2D.X() );
- weight += Abs( tangent * ( uvInPrev - LE._uvIn )) / segLen.back();
- double proj = LE._normal2D * ( uvInPrev - LE._uvOut );
- if ( LE._length2D < proj )
- weight += 0.75 * ( 1 - weight ); // length decrease is more preferable
- LE._length2D = weight * LE._length2D + ( 1 - weight ) * proj;
- LE._uvIn = LE._uvOut + LE._normal2D * LE._length2D;
- uvInPrev = LE._uvIn;
+ if ( prevLE->_length2D > 0 ) {
+ gp_XY tangent ( LE._normal2D.Y(), -LE._normal2D.X() );
+ weight += Abs( tangent * ( prevLE->_uvIn - LE._uvIn )) / segLen.back();
+ gp_XY prevTang = ( LE._uvOut - prevLE->_uvOut );
+ gp_XY prevNorm = gp_XY( -prevTang.Y(), prevTang.X() );
+ double prevProj = prevNorm * ( prevLE->_uvIn - prevLE->_uvOut );
+ if ( prevProj > 0 ) {
+ prevProj /= prevTang.Modulus();
+ if ( LE._length2D < prevProj )
+ weight += 0.75 * ( 1 - weight ); // length decrease is more preferable
+ LE._length2D = weight * LE._length2D + ( 1 - weight ) * prevProj;
+ LE._uvIn = LE._uvOut + LE._normal2D * LE._length2D;
+ }
+ }
+ prevLE = & LE;
}
}
// Create layers of faces
- int hasLeftNode = ( !L._leftLine->_rightNodes.empty() );
- int hasRightNode = ( !L._rightLine->_leftNodes.empty() );
- size_t iS, iN0 = hasLeftNode, nbN = innerNodes.size() - hasRightNode;
- L._leftNodes .resize( _hyp->GetNumberLayers() );
- L._rightNodes.resize( _hyp->GetNumberLayers() );
+ bool hasLeftNode = ( !L._leftLine->_rightNodes.empty() && leftEdgeShared );
+ bool hasRightNode = ( !L._rightLine->_leftNodes.empty() && rightEdgeShared );
+ bool hasOwnLeftNode = ( !L._leftNodes.empty() );
+ bool hasOwnRightNode = ( !L._rightNodes.empty() );
+ size_t iS,
+ iN0 = ( hasLeftNode || hasOwnLeftNode || _polyLineVec.size() == 1 ),
+ nbN = innerNodes.size() - ( hasRightNode || hasOwnRightNode );
+ L._leftNodes .reserve( _hyp->GetNumberLayers() );
+ L._rightNodes.reserve( _hyp->GetNumberLayers() );
for ( int iF = 0; iF < _hyp->GetNumberLayers(); ++iF ) // loop on layers of faces
{
// get accumulated length of intermediate segments
for ( iS = 1; iS < segLen.size(); ++iS )
segLen[iS] /= segLen.back();
- // create innerNodes
+ // create innerNodes of a current layer
iS = 0;
for ( size_t i = iN0; i < nbN; ++i )
{
gp_Pnt p = _surface->Value( uv.X(), uv.Y() );
innerNodes[i] = _helper.AddNode( p.X(), p.Y(), p.Z(), /*id=*/0, uv.X(), uv.Y() );
}
- if ( hasLeftNode ) innerNodes.front() = L._leftLine->_rightNodes[ iF ];
- if ( hasRightNode ) innerNodes.back() = L._rightLine->_leftNodes[ iF ];
- L._rightNodes[ iF ] = innerNodes.back();
- L._leftNodes [ iF ] = innerNodes.front();
+ // use nodes created for adjacent _PolyLine's
+ if ( hasOwnLeftNode ) innerNodes.front() = L._leftNodes [ iF ];
+ else if ( hasLeftNode ) innerNodes.front() = L._leftLine->_rightNodes[ iF ];
+ if ( hasOwnRightNode ) innerNodes.back() = L._rightNodes[ iF ];
+ else if ( hasRightNode ) innerNodes.back() = L._rightLine->_leftNodes[ iF ];
+ if ( _polyLineVec.size() == 1 ) innerNodes.front() = innerNodes.back(); // circle
+ if ( !hasOwnLeftNode ) L._leftNodes.push_back( innerNodes.front() );
+ if ( !hasOwnRightNode ) L._rightNodes.push_back( innerNodes.back() );
// create faces
// TODO care of orientation
for ( size_t i = 1; i < innerNodes.size(); ++i )
- _helper.AddFace( outerNodes[ i-1 ], outerNodes[ i ],
- innerNodes[ i ], innerNodes[ i-1 ]);
+ if ( SMDS_MeshElement* f = _helper.AddFace( outerNodes[ i-1 ], outerNodes[ i ],
+ innerNodes[ i ], innerNodes[ i-1 ]))
+ L._newFaces.insert( L._newFaces.end(), f );
outerNodes.swap( innerNodes );
}
+ // faces between not shared _LayerEdge's (at concave VERTEX)
+ for ( int isR = 0; isR < 2; ++isR )
+ {
+ if ( isR ? rightEdgeShared : leftEdgeShared )
+ continue;
+ vector< const SMDS_MeshNode* > &
+ lNodes = (isR ? L._rightNodes : L._leftLine->_rightNodes ),
+ rNodes = (isR ? L._rightLine->_leftNodes : L._leftNodes );
+ if ( lNodes.empty() || rNodes.empty() || lNodes.size() != rNodes.size() )
+ continue;
+
+ for ( size_t i = 1; i < lNodes.size(); ++i )
+ _helper.AddFace( lNodes[ i-1 ], rNodes[ i-1 ],
+ rNodes[ i ], lNodes[ i ]);
+
+ const UVPtStruct& ptOnVertex = points[ isR ? L._lastPntInd : L._firstPntInd ];
+ _helper.AddFace( ptOnVertex.node, rNodes[ 0 ], lNodes[ 0 ]);
+ }
// Fill the _ProxyMeshOfFace
if ( !_proxyMesh )
return false;
- // faces to smooth
- TIDSortedElemSet facesToSmooth;
- if ( SMESHDS_SubMesh* sm = getMeshDS()->MeshElements( _face ))
- {
- SMDS_ElemIteratorPtr fIt = sm->GetElements();
- while ( fIt->more() )
- facesToSmooth.insert( facesToSmooth.end(), fIt->next() );
- }
-
// fixed nodes on EDGE's
std::set<const SMDS_MeshNode*> fixedNodes;
for ( size_t iWire = 0; iWire < _faceSideVec.size(); ++iWire )
// smoothing
SMESH_MeshEditor editor( _mesh );
- editor.Smooth( facesToSmooth, fixedNodes, SMESH_MeshEditor::CENTROIDAL, /*nbIt = */3 );
- //editor.Smooth( facesToSmooth, fixedNodes, SMESH_MeshEditor::LAPLACIAN, /*nbIt = */1 );
- //editor.Smooth( facesToSmooth, fixedNodes, SMESH_MeshEditor::CENTROIDAL, /*nbIt = */1 );
-
+ for ( size_t iL = 0; iL < _polyLineVec.size(); ++iL )
+ {
+ _PolyLine& L = _polyLineVec[ iL ];
+ if ( L._isStraight2D ) continue;
+ // SMESH_MeshEditor::SmoothMethod how =
+ // L._isStraight2D ? SMESH_MeshEditor::LAPLACIAN : SMESH_MeshEditor::CENTROIDAL;
+ //editor.Smooth( L._newFaces, fixedNodes, how, /*nbIt = */3 );
+ //editor.Smooth( L._newFaces, fixedNodes, SMESH_MeshEditor::LAPLACIAN, /*nbIt = */1 );
+ editor.Smooth( L._newFaces, fixedNodes, SMESH_MeshEditor::CENTROIDAL, /*nbIt = */3 );
+ }
return true;
}
