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

23032: EDF SMESH: Projection 1D-2D fails with Netgen 1D-2D

Browse Source 
+ 22792: EDF 8159 SMESH: Multi-dimensional extrusion/extrusion along a path/revolution
   1) Enable selection of sub-meshes on groups
   2) Fix preview that was not shown

+ In SMESHGUI/CMakeList, remove includes that never need not be included
This commit is contained in:
eap 2015-04-06 21:07:26 +03:00
parent 2d88c4add1
commit a713f0b919
14 changed files with 311 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/salome/gui/SMESH/images/2d_from_3d_example.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

5
doc/salome/gui/SMESH/input/make_2dmesh_from_3d.doc
View File

@ -3,7 +3,10 @@
\page make_2dmesh_from_3d_page Generate boundary elements
\n This functionality allows to generate mesh elements on the borders of
elements of a higher dimension.
elements of a higher dimension, for example, to create 2D elements
around a block of 3D elements as in the following figure.
\image html 2d_from_3d_example.png "Missing 2D elements were generated"
<em>To generate border elements:</em>
<ol>

12
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -302,10 +302,20 @@ void SMESH_MesherHelper::SetSubShape(const TopoDS_Shape& aSh)
isSeam = ( Abs( uv1.Coord(2) - myPar1[1] ) < Precision::PConfusion() ||
Abs( uv1.Coord(2) - myPar2[1] ) < Precision::PConfusion() );
}
if ( isSeam ) // vertices are on period boundary, check a middle point (23032)
{
double f,l, r = 0.2345;
Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface( edge, face, f, l );
uv2 = C2d->Value( f * r + l * ( 1.-r ));
if ( du < Precision::PConfusion() )
isSeam = ( Abs( uv1.Coord(1) - uv2.Coord(1) ) < Precision::PConfusion() );
else
isSeam = ( Abs( uv1.Coord(2) - uv2.Coord(2) ) < Precision::PConfusion() );
}
}
if ( isSeam )
{
// store seam shape indices, negative if shape encounters twice
// store seam shape indices, negative if shape encounters twice ('real seam')
mySeamShapeIds.insert( IsSeamShape( edgeID ) ? -edgeID : edgeID );
for ( TopExp_Explorer v( edge, TopAbs_VERTEX ); v.More(); v.Next() ) {
int vertexID = meshDS->ShapeToIndex( v.Current() );

8
src/SMESH/SMESH_Pattern.cxx
View File

@ -716,7 +716,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh,
{
if ( isClosed && ( iE == 0 || iE == *nbEinW ))
{
// new wire begins; put EDGEs in eVec
// new wire begins; put wire EDGEs in eVec
list<TopoDS_Edge>::iterator eEnd = elIt;
std::advance( eEnd, *nbEinW );
eVec.assign( elIt, eEnd );
@ -733,7 +733,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh,
TopoDS_Shape v1 = TopExp::FirstVertex( edge, true ); // always FORWARD
TopoDS_Shape v2 = TopExp::LastVertex( edge, true ); // always REVERSED
// to make adjacent edges share key-point, we make v2 FORWARD too
// (as we have different points for same shape with different orienation)
// (as we have different points for same shape with different orientation)
v2.Reverse();
// on closed face we must have REVERSED some of seam vertices
@ -745,7 +745,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh,
v2.Reverse();
}
}
else { // on CLOSED edge (i.e. having one vertex with different orienations)
else { // on CLOSED edge (i.e. having one vertex with different orientations)
for ( int is2 = 0; is2 < 2; ++is2 ) {
TopoDS_Shape & v = is2 ? v2 : v1;
if ( helper.IsRealSeam( v ) ) {
@ -2516,7 +2516,7 @@ bool SMESH_Pattern::Apply (const TopoDS_Face& theFace,
list< TopoDS_Edge >& wire = (*wlIt);
int nbEdges = wire.size();
wlIt++;
if ( wlIt == wireList.end() || (*wlIt).size() != nbEdges ) // a unique size wire
if ( wlIt != wireList.end() && (*wlIt).size() != nbEdges ) // a unique size wire
{
// choose the best first edge of a wire
setFirstEdge( wire, id1 );

3
src/SMESHDS/SMESH_Controls.hxx
View File

@ -24,7 +24,8 @@
#define _SMESH_CONTROLS_HXX_
// This file is named incosistently with others, i.e. not SMESHDS_Controls.hxx,
// because it was moved from ../Controls/SMESH_Controls.hxx
// because it was moved from ../Controls/SMESH_Controls.hxx.
// It was moved here for the sake of SMESHDS_GroupOnFilter
#include "SMDSAbs_ElementType.hxx"

5
src/SMESHFiltersSelection/SMESH_Type.h
View File

@ -59,7 +59,10 @@ namespace SMESH{
GROUP_0D,
GROUP_BALL,
COMPONENT,
IDSOURCE
IDSOURCE,
IDSOURCE_EDGE, // IDSource including edges
IDSOURCE_FACE,
IDSOURCE_VOLUME
};
};
#endif

55
src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
View File

@ -22,10 +22,10 @@
#include "SMESH_TypeFilter.hxx"
#include <SUIT_Session.h>
#include <SalomeApp_Study.h>
#include <LightApp_DataOwner.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SMESH_Gen)
@ -39,6 +39,40 @@ SMESH_TypeFilter::~SMESH_TypeFilter()
{
}
namespace
{
//================================================================================
/*!
* \brief Returns true if \a obj is SMESH_IDSource including elements of a given \a type
*/
//================================================================================
bool isIDSourceOfType( _PTR(SObject) obj, SMESH::ElementType type )
{
bool Ok = false;
SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
(SUIT_Session::session()->activeApplication());
_PTR(GenericAttribute) anAttr;
if ( obj->FindAttribute(anAttr, "AttributeIOR"))
{
_PTR(AttributeIOR) anIOR = anAttr;
std::string aVal = anIOR->Value();
if ( aVal.size() > 0 )
{
CORBA::Object_var corbaObj = app->orb()->string_to_object( aVal.c_str() );
SMESH::SMESH_IDSource_var ids = SMESH::SMESH_IDSource::_narrow( corbaObj );
if ( ! ids->_is_nil() )
{
SMESH::array_of_ElementType_var types = ids->GetTypes();
for ( int i = 0, nb = types->length(); i < nb && !Ok; ++i )
Ok = ( types[i] == type );
}
}
}
return Ok;
}
}
bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
{
bool Ok = false, extractReference = true;
@ -215,6 +249,21 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
SMESH_TypeFilter(SMESH::GROUP) .isOk( theDataOwner ));
break;
}
case SMESH::IDSOURCE_EDGE:
{
Ok = isIDSourceOfType( obj, SMESH::EDGE );
break;
}
case SMESH::IDSOURCE_FACE:
{
Ok = isIDSourceOfType( obj, SMESH::FACE );
break;
}
case SMESH::IDSOURCE_VOLUME:
{
Ok = isIDSourceOfType( obj, SMESH::VOLUME );
break;
}
}
}
return Ok;

2
src/SMESHGUI/CMakeLists.txt
View File

@ -39,9 +39,7 @@ INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMESHFiltersSelection
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH_I
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base

5
src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
View File

@ -162,14 +162,17 @@ SMESHGUI_3TypesSelector::SMESHGUI_3TypesSelector( QWidget * parent ):
aListOfFilters.append(new SMESH_TypeFilter (SMESH::GROUP_NODE));
myFilter[0] =
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);
aListOfFilters.append(0);
aListOfFilters[0] = new SMESH_TypeFilter (SMESH::MESH);
aListOfFilters[1] = new SMESH_TypeFilter (SMESH::SUBMESH_EDGE);
aListOfFilters[2] = new SMESH_TypeFilter (SMESH::GROUP_EDGE);
aListOfFilters[3] = new SMESH_TypeFilter (SMESH::IDSOURCE_EDGE); // for sub-mesh on group of EDGEs
myFilter[1] =
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);
aListOfFilters[0] = new SMESH_TypeFilter (SMESH::MESH);
aListOfFilters[1] = new SMESH_TypeFilter (SMESH::SUBMESH_FACE);
aListOfFilters[2] = new SMESH_TypeFilter (SMESH::GROUP_FACE);
aListOfFilters[3] = new SMESH_TypeFilter (SMESH::IDSOURCE_FACE); // for sub-mesh on group of FACEs
myFilter[2] =
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);
@ -864,7 +867,7 @@ bool SMESHGUI_ExtrusionDlg::isValuesValid()
}
else if ( ExtrMethod_RBut2->isChecked() )
{
aModule = (double)SpinBox_VDist->value();
aModule = Abs((double)SpinBox_VDist->value());
}
return aModule > 1.0E-38;

10
src/SMESHGUI/SMESHGUI_Utils.cxx
View File

@ -189,7 +189,7 @@ namespace SMESH
}
CORBA::Object_var SObjectToObject (_PTR(SObject) theSObject,
_PTR(Study) theStudy)
_PTR(Study) /*theStudy*/)
{
SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
(SUIT_Session::session()->activeApplication());
@ -197,11 +197,11 @@ namespace SMESH
_PTR(GenericAttribute) anAttr;
if (theSObject->FindAttribute(anAttr, "AttributeIOR")) {
_PTR(AttributeIOR) anIOR = anAttr;
CORBA::String_var aVal = anIOR->Value().c_str();
std::string aVal = anIOR->Value();
// string_to_object() DOC: If the input string is not valid ...
// a CORBA::SystemException is thrown.
if ( aVal && strlen( aVal ) > 0 )
return app->orb()->string_to_object(aVal);
if ( aVal.size() > 0 )
return app->orb()->string_to_object( aVal.c_str() );
}
}
return CORBA::Object::_nil();
@ -209,7 +209,7 @@ namespace SMESH
CORBA::Object_var SObjectToObject (_PTR(SObject) theSObject)
{
_PTR(Study) aStudy = GetActiveStudyDocument();
_PTR(Study) aStudy;// = GetActiveStudyDocument(); -- aStudy is not used
return SObjectToObject(theSObject,aStudy);
}

10
src/SMESH_I/SMESH_MeshEditor_i.cxx
View File

@ -2524,14 +2524,14 @@ SMESH_MeshEditor_i::ExtrusionSweepObjects(const SMESH::ListOfIDSources & theNode
idSourceToSet( theFaces[i], getMeshDS(), elemsNodes[0], SMDSAbs_Face );
TIDSortedElemSet* workElements = & elemsNodes[0], copyElements[2];
SMDSAbs_ElementType previewType = SMDSAbs_All; //SMDSAbs_Face;
if ( myIsPreviewMode )
{
SMDSAbs_ElementType previewType = SMDSAbs_All; //SMDSAbs_Face;
// if ( (*elemsNodes.begin())->GetType() == SMDSAbs_Node )
// previewType = SMDSAbs_Edge;
SMDSAbs_ElementType select = SMDSAbs_All, avoid = SMDSAbs_Volume;
TPreviewMesh * tmpMesh = getPreviewMesh();
TPreviewMesh * tmpMesh = getPreviewMesh( previewType );
tmpMesh->Copy( elemsNodes[0], copyElements[0], select, avoid );
tmpMesh->Copy( elemsNodes[1], copyElements[1], select, avoid );
workElements = & copyElements[0];
@ -2561,7 +2561,7 @@ SMESH_MeshEditor_i::ExtrusionSweepObjects(const SMESH::ListOfIDSources & theNode
}
else
{
getPreviewMesh()->Remove( SMDSAbs_Volume );
getPreviewMesh( previewType )->Remove( SMDSAbs_Volume );
}
return aGroups ? aGroups : new SMESH::ListOfGroups;
@ -2607,9 +2607,9 @@ SMESH_MeshEditor_i::ExtrusionByNormal(const SMESH::ListOfIDSources& objects,
idSourceToSet( objects[i], getMeshDS(), elemsNodes[0], elemType );
TIDSortedElemSet* workElements = & elemsNodes[0], copyElements[2];
SMDSAbs_ElementType previewType = SMDSAbs_Face;
if ( myIsPreviewMode )
{
SMDSAbs_ElementType previewType = SMDSAbs_Face;
SMDSAbs_ElementType select = SMDSAbs_All, avoid = SMDSAbs_Volume;
TPreviewMesh * tmpMesh = getPreviewMesh( previewType );
tmpMesh->Copy( elemsNodes[0], copyElements[0], select, avoid );
@ -2637,7 +2637,7 @@ SMESH_MeshEditor_i::ExtrusionByNormal(const SMESH::ListOfIDSources& objects,
}
else
{
getPreviewMesh()->Remove( SMDSAbs_Volume );
getPreviewMesh( previewType )->Remove( SMDSAbs_Volume );
}
declareMeshModified( /*isReComputeSafe=*/true ); // does not influence Compute()

215
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -52,6 +52,7 @@
#include <BRep_Tool.hxx>
#include <Bnd_Box.hxx>
#include <Geom2d_Curve.hxx>
#include <Geom_Curve.hxx>
#include <TopAbs.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
@ -84,7 +85,7 @@ using namespace std;
// gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( (v) ));\
// cout<<msg<<" "<<shapeIndex((v))<<" ( "<<p.X()<<", "<<p.Y()<<", "<<p.Z()<<" )"<<endl;} \
// else {\
// cout << msg << " "; TopAbs::Print((v).ShapeType(),cout) <<" "<<shapeIndex((v))<<endl;}\
// cout << msg << " "; TopAbs::Print((v).ShapeType(),cout) <<" "<<shapeIndex((v))<<endl;}\
// }
#define SHOW_LIST(msg,l) \
// { \
@ -233,6 +234,7 @@ namespace {
v2 = SMESH_MesherHelper::IthVertex( 0, *eIt2 );
HERE::InsertAssociation( v1, v2, theMap );
}
theMap.SetAssocType( HERE::TShapeShapeMap::FEW_EF );
return true;
}
return false;
@ -388,6 +390,7 @@ namespace {
}
}
}
theMap.SetAssocType( HERE::TShapeShapeMap::PROPAGATION );
return true;
}
@ -432,23 +435,36 @@ namespace {
return true;
}
}
SMESH_MesherHelper helper( mesh );
helper.SetSubShape( shape );
TopExp_Explorer expF( shape, TopAbs_FACE ), expE;
if ( expF.More() ) {
for ( ; expF.More(); expF.Next() ) {
TopoDS_Shape wire =
StdMeshers_ProjectionUtils::OuterShape( TopoDS::Face( expF.Current() ), TopAbs_WIRE );
for ( expE.Init( wire, TopAbs_EDGE ); expE.More(); expE.Next() )
if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( expE.Current() )))
allBndEdges.push_back( TopoDS::Edge( expE.Current() ));
if ( ! helper.IsClosedEdge( TopoDS::Edge( expE.Current() )))
{
if ( helper.IsSeamShape( expE.Current() ))
allBndEdges.push_back( TopoDS::Edge( expE.Current() ));
else
allBndEdges.push_front( TopoDS::Edge( expE.Current() ));
}
}
}
else if ( shape.ShapeType() != TopAbs_EDGE) { // no faces
for ( expE.Init( shape, TopAbs_EDGE ); expE.More(); expE.Next() )
if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( expE.Current() )))
allBndEdges.push_back( TopoDS::Edge( expE.Current() ));
if ( ! helper.IsClosedEdge( TopoDS::Edge( expE.Current() )))
{
if ( helper.IsSeamShape( expE.Current() ))
allBndEdges.push_back( TopoDS::Edge( expE.Current() ));
else
allBndEdges.push_front( TopoDS::Edge( expE.Current() ));
}
}
else if ( shape.ShapeType() == TopAbs_EDGE ) {
if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( shape )))
if ( ! helper.IsClosedEdge( TopoDS::Edge( shape )))
allBndEdges.push_back( TopoDS::Edge( shape ));
}
return !allBndEdges.empty();
@ -477,9 +493,9 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
{
// Structure of this long function is following
// 1) Group -> Group projection: theShape1 is a group member,
// theShape2 is another group. We find a group theShape1 is in and recall self.
// theShape2 is another group. We find the group theShape1 is in and recall self.
// 2) Accosiate same shapes with different location (partners).
// 3) If vertex association is given, perform accosiation according to shape type:
// 3) If vertex association is given, perform association according to shape type:
// switch ( ShapeType ) {
// case TopAbs_EDGE:
// case ...:
@ -499,7 +515,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
// =================================================================================
// 1) Is it the case of associating a group member -> another group? (PAL16202, 16203)
// =================================================================================
if ( theShape1.ShapeType() != theShape2.ShapeType() ) {
if ( theShape1.ShapeType() != theShape2.ShapeType() )
{
TopoDS_Shape group1, group2;
if ( theShape1.ShapeType() == TopAbs_COMPOUND ) {
group1 = theShape1;
@ -538,6 +555,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
for ( ; s1It.More(); s1It.Next(), s2It.Next() )
shapesQueue.push_back( make_pair( s1It.Value(), s2It.Value() ));
}
theMap.SetAssocType( TShapeShapeMap::PARTNER );
return true;
}
@ -546,6 +564,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
//======================================================================
// 3) HAS initial vertex association
//======================================================================
bool isVCloseness = ( theMap._assocType == TShapeShapeMap::CLOSE_VERTEX );
theMap.SetAssocType( TShapeShapeMap::INIT_VERTEX );
switch ( theShape1.ShapeType() ) {
// ----------------------------------------------------------------------
case TopAbs_EDGE: { // TopAbs_EDGE
@ -594,7 +614,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
}
}
list< TopoDS_Edge > edges1, edges2;
int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2 );
int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2, isVCloseness );
if ( !nbE ) RETURN_BAD_RESULT("FindFaceAssociation() failed");
fixAssocByPropagation( nbE, edges1, edges2, theMesh1, theMesh2 );
@ -698,8 +718,6 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
F2 = FF2[ 1 ];
}
TopTools_MapOfShape boundEdges;
// association of face sub-shapes and neighbour faces
list< pair < TopoDS_Face, TopoDS_Edge > > FE1, FE2;
list< pair < TopoDS_Face, TopoDS_Edge > >::iterator fe1, fe2;
@ -715,7 +733,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
TopExp::Vertices( edge1, VV1[0], VV1[1], true );
TopExp::Vertices( edge2, VV2[0], VV2[1], true );
list< TopoDS_Edge > edges1, edges2;
int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2 );
int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2, isVCloseness );
if ( !nbE ) RETURN_BAD_RESULT("FindFaceAssociation() failed");
InsertAssociation( face1, face2, theMap ); // assoc faces
MESSAGE("Assoc FACE " << theMesh1->GetMeshDS()->ShapeToIndex( face1 )<<
@ -728,8 +746,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
list< TopoDS_Edge >::iterator eIt2 = edges2.begin();
for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 )
{
if ( !boundEdges.Add( *eIt1 )) continue; // already associated
InsertAssociation( *eIt1, *eIt2, theMap ); // assoc edges
if ( !InsertAssociation( *eIt1, *eIt2, theMap )) // assoc edges
continue; // already associated
VV1[0] = TopExp::FirstVertex( *eIt1, true );
VV2[0] = TopExp::FirstVertex( *eIt2, true );
InsertAssociation( VV1[0], VV2[0], theMap ); // assoc vertices
@ -1011,6 +1029,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
InsertAssociation( edge1, prpEdge, theMap ); // insert with a proper orientation
}
InsertAssociation( theShape1, theShape2, theMap );
theMap.SetAssocType( TShapeShapeMap::PROPAGATION );
return true; // done
}
}
@ -1086,6 +1105,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
InsertAssociation( VV1[0], VV2[0], theMap );
}
InsertAssociation( theShape1, theShape2, theMap );
theMap.SetAssocType( TShapeShapeMap::PROPAGATION );
return true;
}
}
@ -1150,7 +1170,11 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
if ( !VV1[1].IsNull() ) {
InsertAssociation( VV1[0], VV2[0], theMap );
InsertAssociation( VV1[1], VV2[1], theMap );
return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap);
if ( FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap ))
{
theMap.SetAssocType( TShapeShapeMap::PROPAGATION );
return true;
}
}
}
break; // try by vertex closeness
@ -1207,7 +1231,10 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
InsertAssociation( VV1[0], VV1[0], theMap );
InsertAssociation( VV1[1], VV1[1], theMap );
if (FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap ))
{
theMap.SetAssocType( TShapeShapeMap::COMMON_VERTEX );
return true;
}
}
}
}
@ -1301,6 +1328,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
break;
}
}
theMap.SetAssocType( TShapeShapeMap::CLOSE_VERTEX );
InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap );
InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap );
@ -1325,6 +1353,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
* \param VV2 - vertices of face 2 associated with ones of face 1
* \param edges1 - out list of edges of face 1
* \param edges2 - out list of edges of face 2
* \param isClosenessAssoc - is association starting by VERTEX closeness
* \retval int - nb of edges in an outer wire in a success case, else zero
*/
//================================================================================
@ -1334,7 +1363,8 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
const TopoDS_Face& face2,
TopoDS_Vertex VV2[2],
list< TopoDS_Edge > & edges1,
list< TopoDS_Edge > & edges2)
list< TopoDS_Edge > & edges2,
const bool isClosenessAssoc)
{
bool OK = false;
list< int > nbEInW1, nbEInW2;
@ -1363,46 +1393,56 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
// Define if we need to reverse one of wires to make edges in lists match each other
bool reverse = false;
const bool severalWires = ( nbEInW1.size() > 1 );
if ( !VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) {
if ( !VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true )))
{
reverse = true;
edgeIt = --edges1.end();
// check if the second vertex belongs to the first or last edge in the wire
edgeIt = --edges1.end(); // pointer to the last edge in the outer wire
if ( severalWires ) {
edgeIt = edges1.begin();
std::advance( edgeIt, nbEInW1.front()-1 );
}
if ( TopExp::FirstVertex( *edgeIt ).IsSame( TopExp::LastVertex( *edgeIt )) &&
SMESH_Algo::isDegenerated( *edgeIt )) {
--edgeIt; // skip a degenerated edge (www.salome-platform.org/forum/forum_11/173031193)
}
if ( !VV1[1].IsSame( TopExp::FirstVertex( *edgeIt, true ))) {
bool KO = true; // belongs to none
if ( nbEInW1.size() > 1 ) { // several wires
edgeIt = edges1.begin();
std::advance( edgeIt, nbEInW1.front()-1 );
KO = !VV1[1].IsSame( TopExp::FirstVertex( *edgeIt, true ));
}
if ( KO )
CONT_BAD_RESULT("GetOrderedEdges() failed");
CONT_BAD_RESULT("GetOrderedEdges() failed");
}
}
if ( !VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))) {
if ( !VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true )))
{
reverse = !reverse;
edgeIt = --edges2.end();
// move a degenerated edge from back to front
// http://www.salome-platform.org/forum/forum_11/173031193
if ( TopExp::FirstVertex( *edgeIt ).IsSame( TopExp::LastVertex( *edgeIt ))) {
edges2.splice( edges2.begin(), edges2, edgeIt );
edgeIt = --edges2.end();
}
// check if the second vertex belongs to the first or last edge in the wire
edgeIt = --edges2.end(); // pointer to the last edge in the outer wire
if ( severalWires ) {
edgeIt = edges2.begin();
std::advance( edgeIt, nbEInW2.front()-1 );
}
if ( TopExp::FirstVertex( *edgeIt ).IsSame( TopExp::LastVertex( *edgeIt )) &&
SMESH_Algo::isDegenerated( *edgeIt )) {
--edgeIt; // skip a degenerated edge
}
if ( !VV2[1].IsSame( TopExp::FirstVertex( *edgeIt, true ))) {
bool KO = true; // belongs to none
if ( nbEInW2.size() > 1 ) { // several wires
edgeIt = edges2.begin();
std::advance( edgeIt, nbEInW2.front()-1 );
KO = !VV2[1].IsSame( TopExp::FirstVertex( *edgeIt, true ));
}
if ( KO )
CONT_BAD_RESULT("GetOrderedEdges() failed");
CONT_BAD_RESULT("GetOrderedEdges() failed");
}
}
if ( reverse )
{
reverseEdges( edges2 , nbEInW2.front());
if ( SMESH_Algo::isDegenerated( edges2.front() ))
{
// move a degenerated edge to the back of the outer wire
edgeIt = edges2.end();
if ( severalWires ) {
edgeIt = edges2.begin();
std::advance( edgeIt, nbEInW2.front() );
}
edges2.splice( edgeIt, edges2, edges2.begin() );
}
if (( VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) !=
( VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))))
CONT_BAD_RESULT("GetOrderedEdges() failed");
@ -1410,6 +1450,65 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
OK = true;
} // loop algos getting an outer wire
if ( OK && nbEInW1.front() > 4 ) // care of a case where faces are closed (23032)
{
// check if the first edges are seam ones
list< TopoDS_Edge >::iterator revSeam1, revSeam2;
revSeam1 = std::find( ++edges1.begin(), edges1.end(), edges1.front().Reversed());
revSeam2 = edges2.end();
if ( revSeam1 != edges1.end() )
revSeam2 = std::find( ++edges2.begin(), edges2.end(), edges2.front().Reversed());
if ( revSeam2 != edges2.end() ) // two seams detected
{
bool reverse =
std::distance( edges1.begin(), revSeam1 ) != std::distance( edges2.begin(), revSeam2 );
if ( !reverse && isClosenessAssoc )
{
// compare orientations of a non-seam edges using 3D closeness;
// look for a non-seam edges
list< TopoDS_Edge >::iterator edge1 = ++edges1.begin();
list< TopoDS_Edge >::iterator edge2 = ++edges2.begin();
for ( ; edge1 != edges1.end(); ++edge1, ++edge2 )
{
if (( edge1 == revSeam1 ) ||
( SMESH_Algo::isDegenerated( *edge1 )) ||
( std::find( ++edges1.begin(), edges1.end(), edge1->Reversed()) != edges1.end() ))
continue;
gp_Pnt p1 = BRep_Tool::Pnt( VV1[0] );
gp_Pnt p2 = BRep_Tool::Pnt( VV2[0] );
gp_Vec vec2to1( p2, p1 );
gp_Pnt pp1[2], pp2[2];
const double r = 0.2345;
double f,l;
Handle(Geom_Curve) C = BRep_Tool::Curve( *edge1, f,l );
pp1[0] = C->Value( f * r + l * ( 1. - r ));
pp1[1] = C->Value( l * r + f * ( 1. - r ));
if ( edge1->Orientation() == TopAbs_REVERSED )
std::swap( pp1[0], pp1[1] );
C = BRep_Tool::Curve( *edge2, f,l );
if ( C.IsNull() ) return 0;
pp2[0] = C->Value( f * r + l * ( 1. - r )).Translated( vec2to1 );
pp2[1] = C->Value( l * r + f * ( 1. - r )).Translated( vec2to1 );
if ( edge2->Orientation() == TopAbs_REVERSED )
std::swap( pp2[0], pp2[1] );
double dist00 = pp1[0].SquareDistance( pp2[0] );
double dist01 = pp1[0].SquareDistance( pp2[1] );
reverse = ( dist00 > dist01 );
break;
}
}
if ( reverse ) // make a seam counterpart be the first
{
list< TopoDS_Edge >::iterator outWireEnd = edges2.begin();
std::advance( outWireEnd, nbEInW2.front() );
edges2.splice( outWireEnd, edges2, edges2.begin(), ++revSeam2 );
reverseEdges( edges2 , nbEInW2.front());
}
}
}
// Try to orient all (if !OK) or only internal wires (issue 0020996) by UV similarity
@ -1418,13 +1517,23 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
// Check that Vec(VV1[0],VV1[1]) in 2D on face1 is the same
// as Vec(VV2[0],VV2[1]) on face2
double vTol = BRep_Tool::Tolerance( VV1[0] );
BRepAdaptor_Surface surface1( face1, false );
BRepAdaptor_Surface surface1( face1, true );
BRepAdaptor_Surface surface2( face2, true );
// TODO: use TrsfFinder2D to superpose the faces
gp_Pnt2d v0f1UV( surface1.FirstUParameter(), surface1.FirstVParameter() );
gp_Pnt2d v0f2UV( surface2.FirstUParameter(), surface2.FirstVParameter() );
gp_Pnt2d v1f1UV( surface1.LastUParameter(), surface1.LastVParameter() );
gp_Pnt2d v1f2UV( surface2.LastUParameter(), surface2.LastVParameter() );
double vTolUV =
surface1.UResolution( vTol ) + surface1.VResolution( vTol ); // let's be tolerant
gp_Pnt2d v0f1UV = BRep_Tool::Parameters( VV1[0], face1 );
gp_Pnt2d v0f2UV = BRep_Tool::Parameters( VV2[0], face2 );
gp_Pnt2d v1f1UV = BRep_Tool::Parameters( VV1[1], face1 );
gp_Pnt2d v1f2UV = BRep_Tool::Parameters( VV2[1], face2 );
// VV1[0] = TopExp::FirstVertex( edges1.front(), true ); // ori is important if face is closed
// VV1[1] = TopExp::LastVertex ( edges1.front(), true );
// VV2[0] = TopExp::FirstVertex( edges2.front(), true );
// VV2[1] = TopExp::LastVertex ( edges2.front(), true );
// gp_Pnt2d v0f1UV = BRep_Tool::Parameters( VV1[0], face1 );
// gp_Pnt2d v0f2UV = BRep_Tool::Parameters( VV2[0], face2 );
// gp_Pnt2d v1f1UV = BRep_Tool::Parameters( VV1[1], face1 );
// gp_Pnt2d v1f2UV = BRep_Tool::Parameters( VV2[1], face2 );
gp_Vec2d v01f1Vec( v0f1UV, v1f1UV );
gp_Vec2d v01f2Vec( v0f2UV, v1f2UV );
if ( Abs( v01f1Vec.X()-v01f2Vec.X()) < vTolUV &&
@ -1443,7 +1552,6 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
list< int >::iterator nbE2, nbE1 = nbEInW1.begin();
list< TopoDS_Edge >::iterator edge2Beg, edge1Beg = edges1.begin();
if ( OK ) std::advance( edge1Beg, *nbE1++ );
// reach an end of edges of a current wire1
list< TopoDS_Edge >::iterator edge2End, edge1End;
//
// find corresponding wires of face2
@ -1473,12 +1581,12 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
{
// rotate edge2 untill coincidence with edge1 in 2D
int i = *nbE2;
while ( i-- > 0 && !sameVertexUV( *edge2Beg, face2, 0, v0f1UV, vTolUV ))
bool sameUV = false;
while ( !( sameUV = sameVertexUV( *edge2Beg, face2, 0, v0f1UV, vTolUV )) && --i > 0 )
// move edge2Beg to place before edge2End
edges2.splice( edge2End, edges2, edge2Beg++ );
if ( edge2Beg != edges2.end() &&
sameVertexUV( *edge2Beg, face2, 0, v0f1UV, vTolUV ))
if ( sameUV )
{
if ( iW1 == 0 ) OK = true; // OK is for the first wire
@ -1495,8 +1603,9 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
if ( edge2Beg->Orientation() == TopAbs_REVERSED )
std::swap( f,l );
gp_Pnt2d uv2 = c2->Value( f * 0.8 + l * 0.2 );
gp_Pnt2d uv3 = c2->Value( l * 0.8 + f * 0.2 );
if ( uv1.Distance( uv2 ) > vTolUV )
if ( uv1.SquareDistance( uv2 ) > uv1.SquareDistance( uv3 ))
edge2Beg->Reverse();
}
else

24
src/StdMeshers/StdMeshers_ProjectionUtils.hxx
View File

@ -59,6 +59,10 @@ struct StdMeshers_ShapeShapeBiDirectionMap
{
TopTools_DataMapOfShapeShape _map1to2, _map2to1;
enum EAssocType {
UNDEF, INIT_VERTEX, PROPAGATION, PARTNER, CLOSE_VERTEX, COMMON_VERTEX, FEW_EF };
EAssocType _assocType;
// convention: s1 - target, s2 - source
bool Bind( const TopoDS_Shape& s1, const TopoDS_Shape& s2 )
{ _map1to2.Bind( s1, s2 ); return _map2to1.Bind( s2, s1 ); }
@ -72,6 +76,8 @@ struct StdMeshers_ShapeShapeBiDirectionMap
// passes incorrect isShape2
return (isShape2 ? _map2to1 : _map1to2)( s );
}
StdMeshers_ShapeShapeBiDirectionMap() : _assocType( UNDEF ) {}
void SetAssocType( EAssocType type ) { if ( _assocType == UNDEF ) _assocType = type; }
};
/*!
@ -148,20 +154,22 @@ namespace StdMeshers_ProjectionUtils
/*!
* \brief Find association of edges of faces
* \param face1 - face 1
* \param VV1 - vertices of face 1
* \param face2 - face 2
* \param VV2 - vertices of face 2 associated with oned of face 1
* \param edges1 - out list of edges of face 1
* \param edges2 - out list of edges of face 2
* \retval int - nb of edges in an outer wire in a success case, else zero
* \param face1 - face 1
* \param VV1 - vertices of face 1
* \param face2 - face 2
* \param VV2 - vertices of face 2 associated with oned of face 1
* \param edges1 - out list of edges of face 1
* \param edges2 - out list of edges of face 2
* \param isClosenessAssoc - is association starting by VERTEX closeness
* \retval int - nb of edges in an outer wire in a success case, else zero
*/
int FindFaceAssociation(const TopoDS_Face& face1,
TopoDS_Vertex VV1[2],
const TopoDS_Face& face2,
TopoDS_Vertex VV2[2],
std::list< TopoDS_Edge > & edges1,
std::list< TopoDS_Edge > & edges2);
std::list< TopoDS_Edge > & edges2,
const bool isClosenessAssoc=false);
/*!
* \brief Insert vertex association defined by a hypothesis into a map

63
src/StdMeshers/StdMeshers_Projection_2D.cxx
View File

@ -1088,20 +1088,22 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
// Check if node projection to a face is needed
Bnd_B2d uvBox;
SMDS_ElemIteratorPtr faceIt = srcSubMesh->GetSubMeshDS()->GetElements();
int nbFaceNodes = 0;
for ( ; nbFaceNodes < 3 && faceIt->more(); ) {
set< const SMDS_MeshNode* > faceNodes;
for ( ; faceNodes.size() < 3 && faceIt->more(); ) {
const SMDS_MeshElement* face = faceIt->next();
SMDS_ElemIteratorPtr nodeIt = face->nodesIterator();
while ( nodeIt->more() ) {
const SMDS_MeshNode* node = static_cast<const SMDS_MeshNode*>( nodeIt->next() );
if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE ) {
nbFaceNodes++;
if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE &&
faceNodes.insert( node ).second )
uvBox.Add( helper.GetNodeUV( srcFace, node ));
}
}
}
const bool toProjectNodes =
( nbFaceNodes > 0 && ( uvBox.IsVoid() || uvBox.SquareExtent() < DBL_MIN ));
bool toProjectNodes = false;
if ( faceNodes.size() == 1 )
toProjectNodes = ( uvBox.IsVoid() || uvBox.CornerMin().IsEqual( gp_XY(0,0), 1e-12 ));
else if ( faceNodes.size() > 1 )
toProjectNodes = ( uvBox.IsVoid() || uvBox.SquareExtent() < DBL_MIN );
// Find the corresponding source and target vertex
// and <theReverse> flag needed to call mapper.Apply()
@ -1109,13 +1111,10 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
TopoDS_Vertex srcV1, tgtV1;
bool reverse = false;
if ( _sourceHypo->HasVertexAssociation() ) {
srcV1 = _sourceHypo->GetSourceVertex(1);
tgtV1 = _sourceHypo->GetTargetVertex(1);
} else {
srcV1 = TopoDS::Vertex( TopExp_Explorer( srcFace, TopAbs_VERTEX ).Current() );
tgtV1 = TopoDS::Vertex( shape2ShapeMap( srcV1, /*isSrc=*/true ));
}
TopExp_Explorer vSrcExp( srcFace, TopAbs_VERTEX );
srcV1 = TopoDS::Vertex( vSrcExp.Current() );
tgtV1 = TopoDS::Vertex( shape2ShapeMap( srcV1, /*isSrc=*/true ));
list< TopoDS_Edge > tgtEdges, srcEdges;
list< int > nbEdgesInWires;
SMESH_Block::GetOrderedEdges( tgtFace, tgtEdges, nbEdgesInWires, tgtV1 );
@ -1127,7 +1126,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
TopoDS_Shape srcE1bis = shape2ShapeMap( tgtE1 );
reverse = ( ! srcE1.IsSame( srcE1bis ));
if ( reverse &&
_sourceHypo->HasVertexAssociation() &&
//_sourceHypo->HasVertexAssociation() &&
nbEdgesInWires.front() > 2 &&
helper.IsRealSeam( tgtEdges.front() ))
{
@ -1136,11 +1135,30 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
// we can't use only theReverse flag to correctly associate source
// and target faces in the mapper. Thus we select srcV1 so that
// GetOrderedEdges() to return EDGEs in a needed order
list< TopoDS_Edge >::iterator edge = srcEdges.begin();
for ( ; edge != srcEdges.end(); ++edge ) {
if ( srcE1bis.IsSame( *edge )) {
srcV1 = helper.IthVertex( 0, *edge );
break;
TopoDS_Face tgtFaceBis = tgtFace;
for ( vSrcExp.Next(); vSrcExp.More(); )
{
tgtFaceBis.Reverse();
tgtEdges.clear();
SMESH_Block::GetOrderedEdges( tgtFaceBis, tgtEdges, nbEdgesInWires, tgtV1 );
bool ok = true;
list< TopoDS_Edge >::iterator edgeS = srcEdges.begin(), edgeT = tgtEdges.begin();
for ( ; edgeS != srcEdges.end() && ok ; ++edgeS, ++edgeT )
ok = edgeS->IsSame( shape2ShapeMap( *edgeT ));
if ( ok )
break; // FOUND!
reverse = !reverse;
if ( reverse )
{
vSrcExp.Next();
}
else
{
srcV1 = TopoDS::Vertex( vSrcExp.Current() );
tgtV1 = TopoDS::Vertex( shape2ShapeMap( srcV1, /*isSrc=*/true ));
srcEdges.clear();
SMESH_Block::GetOrderedEdges( srcFace, srcEdges, nbEdgesInWires, srcV1 );
}
}
}
@ -1168,8 +1186,11 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
// Compute mesh on a target face
mapper.Apply( tgtFace, tgtV1, reverse );
if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK )
if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) {
// std::ofstream file("/tmp/Pattern.smp" );
// mapper.Save( file );
return error("Can't apply source mesh pattern to the face");
}
// Create the mesh