From 3b2ddf07cc0db4ef2adbf96c23855ea516840289 Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 15 Nov 2010 11:51:29 +0000 Subject: [PATCH] 0020943: EDF 1463 SMESH: additional fonctionnality to the feature 20749 + class BareBorderVolume: public Predicate + class BareBorderFace: public Predicate --- .../SMESH/images/bare_border_faces_smpl.png | Bin 0 -> 9095 bytes .../SMESH/images/bare_border_volumes_smpl.png | Bin 0 -> 7555 bytes .../SMESH/input/about_quality_controls.doc | 2 + .../gui/SMESH/input/bare_border_face.doc | 15 ++++ .../gui/SMESH/input/bare_border_volumes.doc | 15 ++++ .../SMESH/input/selection_filter_library.doc | 8 +- .../gui/SMESH/input/tui_quality_controls.doc | 48 +++++++++++ idl/SMESH_Filter.idl | 20 ++++- resources/Makefile.am | 2 + resources/bare_border_face.png | Bin 0 -> 3168 bytes resources/bare_border_volume.png | Bin 0 -> 3369 bytes src/OBJECT/SMESH_Actor.cxx | 55 +++++++++++- src/OBJECT/SMESH_Actor.h | 2 +- src/OBJECT/SMESH_ActorDef.h | 1 + src/OBJECT/SMESH_DeviceActor.cxx | 13 ++- src/SMESHGUI/SMESHGUI.cxx | 50 ++++++++--- src/SMESHGUI/SMESHGUI_FilterDlg.cxx | 22 +++-- src/SMESHGUI/SMESH_images.ts | 8 ++ src/SMESHGUI/SMESH_msg_en.ts | 32 +++++++ src/StdMeshers/StdMeshers_Import_1D.cxx | 79 ++++++++++++++---- src/StdMeshers/StdMeshers_Import_1D2D.cxx | 25 +++++- 21 files changed, 348 insertions(+), 49 deletions(-) create mode 100644 doc/salome/gui/SMESH/images/bare_border_faces_smpl.png create mode 100644 doc/salome/gui/SMESH/images/bare_border_volumes_smpl.png create mode 100644 doc/salome/gui/SMESH/input/bare_border_face.doc create mode 100644 doc/salome/gui/SMESH/input/bare_border_volumes.doc create mode 100644 resources/bare_border_face.png create mode 100644 resources/bare_border_volume.png diff --git a/doc/salome/gui/SMESH/images/bare_border_faces_smpl.png b/doc/salome/gui/SMESH/images/bare_border_faces_smpl.png new file mode 100644 index 0000000000000000000000000000000000000000..6b7ead85ef02ab273a2decc40729602d0bf24254 GIT binary patch literal 9095 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/input/about_quality_controls.doc b/doc/salome/gui/SMESH/input/about_quality_controls.doc index 8f78c38c5..6eea80601 100644 --- a/doc/salome/gui/SMESH/input/about_quality_controls.doc +++ b/doc/salome/gui/SMESH/input/about_quality_controls.doc @@ -32,6 +32,7 @@ Edge quality controls: Face quality controls:
  • \subpage free_faces_page "Free faces"
    • +
  • \subpage bare_border_faces_page "Bare border faces"
  • \subpage length_2d_page "Length 2D"
  • \subpage borders_at_multi_connection_2d_page "Borders at multi-connection 2D"
  • \subpage area_page "Area"
    • @@ -48,6 +49,7 @@ Volume quality controls:
  • \subpage aspect_ratio_3d_page "Aspect ratio 3D"
  • \subpage volume_page "Volume"
  • \subpage max_element_length_3d_page "Max element length 3D"
    • +
  • \subpage bare_border_volumes_page "Bare border volumes"
*/ diff --git a/doc/salome/gui/SMESH/input/bare_border_face.doc b/doc/salome/gui/SMESH/input/bare_border_face.doc new file mode 100644 index 000000000..2115d3249 --- /dev/null +++ b/doc/salome/gui/SMESH/input/bare_border_face.doc @@ -0,0 +1,15 @@ +/*! + +\page bare_border_faces_page Bare border faces + +This mesh quality control highlights the faces having the border not +shared with other faces (free border) and missing an edge based on +nodes of the free border. The faces with bare border are shown with a +color different from the color of shared faces. + +\image html bare_border_faces_smpl.png + +\sa A sample TUI Script making a group of faces highlighted in the +picture is \ref tui_bare_border_faces "Bare border faces Control". + +*/ diff --git a/doc/salome/gui/SMESH/input/bare_border_volumes.doc b/doc/salome/gui/SMESH/input/bare_border_volumes.doc new file mode 100644 index 000000000..d0dd894ba --- /dev/null +++ b/doc/salome/gui/SMESH/input/bare_border_volumes.doc @@ -0,0 +1,15 @@ +/*! + +\page bare_border_volumes_page Bare border volumes + +This mesh quality control highlights the volumes having the border not +shared with other volumes (free border) and missing a face based on +nodes of the free border. The volumes with bare border are shown with a +color different from the color of shared volumes. + +\image html bare_border_volumes_smpl.png + +\sa A sample TUI Script making a group of volumes highlighted in the +picture is \ref tui_bare_border_volumes "Bare border volumes Control". + +*/ diff --git a/doc/salome/gui/SMESH/input/selection_filter_library.doc b/doc/salome/gui/SMESH/input/selection_filter_library.doc index ab88e0eda..29c740c65 100644 --- a/doc/salome/gui/SMESH/input/selection_filter_library.doc +++ b/doc/salome/gui/SMESH/input/selection_filter_library.doc @@ -144,7 +144,10 @@ Additional criteria to select mesh Faces are the following: one element of mesh only. See also a \ref free_edges_page "Free Edges quality control".
  • -Free faces selects 3D mesh elements wich belong to less than two volumes. +Free faces selects 2D mesh elements wich belong to less than two volumes. +
  • +Faces with bare border selects 2D mesh elements having a free border without an edge on it. +See also \ref bare_border_faces_page "Bare border faces quality control".
  • Borders at Multi-Connections 2D selects cells consisting of edges belonging to several elements of mesh. The number of mesh elements should be more, less or equal @@ -181,6 +184,9 @@ diagonals with a value of length, which is more, less or equal
  • Bad oriented volume selects mesh volumes, which are incorrectly oriented from the point of view of MED convention. +
  • +Volumes with bare border selects 3D mesh elements having a free border without a face on it. +See also \ref bare_border_volumes_page "Bare border volumes quality control".
    • diff --git a/doc/salome/gui/SMESH/input/tui_quality_controls.doc b/doc/salome/gui/SMESH/input/tui_quality_controls.doc index acbf89198..18370b7b5 100644 --- a/doc/salome/gui/SMESH/input/tui_quality_controls.doc +++ b/doc/salome/gui/SMESH/input/tui_quality_controls.doc @@ -309,6 +309,54 @@ aGroup.Add(aFaceIds) salome.sg.updateObjBrowser(1) \endcode +\section tui_bare_border_faces Bare border faces + +\code +from smesh import * +SetCurrentStudy(salome.myStudy) + +box = geompy.MakeBoxDXDYDZ(100, 100, 100) +geompy.addToStudy( box, "box" ) + +mesh = smesh.Mesh(box) +mesh.Segment().NumberOfSegments(3) +mesh.Quadrangle() +mesh.Compute() + +# remove 2 faces +allFaces = mesh.GetElementsByType(FACE) +mesh.RemoveElements( allFaces[0:2]) + +bareGroup = mesh.MakeGroup("bare faces", FACE, FT_BareBorderFace) +assert(bareGroup.Size() == 3) +\endcode + +\section tui_bare_border_volumes Bare border volumes + +\code +from smesh import * +SetCurrentStudy(salome.myStudy) + +box = geompy.MakeBoxDXDYDZ(100, 30, 10) +# the smallest face of the box +face = geompy.SubShapeAllSorted( box, geompy.ShapeType["FACE"])[0] + +geompy.addToStudy( box, "box" ) +geompy.addToStudyInFather( box, face, "face" ) + +mesh = Mesh(box) +mesh.AutomaticHexahedralization(); + +# remove half of mesh faces from the smallest face +faceFaces = mesh.GetSubMeshElementsId(face) +faceToRemove = faceFaces[: len(faceFaces)/2] +mesh.RemoveElements( faceToRemove ) + +# make a group of volumes missing the removed faces +bareGroup = mesh.MakeGroup("bare volumes", VOLUME, FT_BareBorderVolume) +assert(bareGroup.Size() == len( faceToRemove)) +\endcode + \section tui_length_2d Length 2D \code diff --git a/idl/SMESH_Filter.idl b/idl/SMESH_Filter.idl index 50526cf03..488356bd8 100644 --- a/idl/SMESH_Filter.idl +++ b/idl/SMESH_Filter.idl @@ -64,6 +64,8 @@ module SMESH FT_LyingOnGeom, FT_RangeOfIds, FT_BadOrientedVolume, + FT_BareBorderVolume, + FT_BareBorderFace, FT_LinearOrQuadratic, FT_GroupColor, FT_ElemGeomType, @@ -87,6 +89,7 @@ module SMESH }; typedef sequence Histogram; + /*! * Base interface for all functors ( i.e. numerical functors and predicates ) */ @@ -97,8 +100,6 @@ module SMESH ElementType GetElementType(); }; - - /*! * Numerical functors are intended for calculating value by Id of mesh entity */ @@ -149,6 +150,7 @@ module SMESH Values GetValues(); }; + /*! * Predicates are intended for verification of criteria, * must return bool value by mesh id @@ -165,6 +167,18 @@ module SMESH */ interface BadOrientedVolume: Predicate {}; + /*! + * Logical functor (predicate) "Volumes with bare border" and "Faces with bare border". + * Verify whether a mesh volume has a free facet without a mesh face on it + */ + interface BareBorderVolume: Predicate {}; + /*! + * Logical functor (predicate) "Faces with bare border". + * Verify whether a mesh face has a side not shared with another face + * and without a mesh edge on it + */ + interface BareBorderFace: Predicate {}; + /*! * Logical functor (predicate) "Belong To Geometry". * Verify whether mesh element or node belong to pointed Geom Object @@ -492,6 +506,8 @@ module SMESH RangeOfIds CreateRangeOfIds(); BadOrientedVolume CreateBadOrientedVolume(); + BareBorderVolume CreateBareBorderVolume(); + BareBorderFace CreateBareBorderFace(); LinearOrQuadratic CreateLinearOrQuadratic(); GroupColor CreateGroupColor(); diff --git a/resources/Makefile.am b/resources/Makefile.am index da21b6088..35964e3d3 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -102,6 +102,8 @@ dist_salomeres_DATA = \ mesh_vertex_n.png \ mesh_vertex.png \ mesh_volume_3d.png \ + bare_border_volume.png \ + bare_border_face.png \ mesh_wireframe.png \ mesh_points.png \ mesh_wrap.png \ diff --git a/resources/bare_border_face.png b/resources/bare_border_face.png new file mode 100644 index 0000000000000000000000000000000000000000..1993f2087f86b35ee09a9f1fdb7530e0785a0ae1 GIT binary patch literal 3168 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 literal 0 HcmV?d00001 diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index 4afc7f4ca..b8d11ee95 100644 --- a/src/OBJECT/SMESH_Actor.cxx +++ b/src/OBJECT/SMESH_Actor.cxx @@ -199,6 +199,25 @@ SMESH_ActorDef::SMESH_ActorDef() aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID); aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET); + my3DExtActor = SMESH_DeviceActor::New(); + my3DExtActor->SetUserMatrix(aMatrix); + my3DExtActor->PickableOff(); + my3DExtActor->SetProperty(my2DExtProp); + my3DExtActor->SetBackfaceProperty(my2DExtProp); + my3DExtActor->SetRepresentation(SMESH_DeviceActor::eSurface); + aFilter = my3DExtActor->GetExtractUnstructuredGrid(); + aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding); + aFilter->RegisterCellsWithType(VTK_TETRA); + aFilter->RegisterCellsWithType(VTK_VOXEL); + aFilter->RegisterCellsWithType(VTK_HEXAHEDRON); + aFilter->RegisterCellsWithType(VTK_WEDGE); + aFilter->RegisterCellsWithType(VTK_PYRAMID); + aFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA); + aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON); + aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE); + aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID); + aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET); + //Definition 1D device of the actor //--------------------------------- myEdgeProp = vtkProperty::New(); @@ -532,6 +551,7 @@ SMESH_ActorDef::~SMESH_ActorDef() my2DExtProp->Delete(); my2DExtActor->Delete(); my3DActor->Delete(); + my3DExtActor->Delete(); myNodeActor->Delete(); myBaseActor->Delete(); @@ -723,8 +743,8 @@ SetControlMode(eControl theMode, bool anIsScalarVisible = theMode > eNone; - if(anIsScalarVisible){ - switch(theMode){ + if(anIsScalarVisible) { + switch(theMode) { case eLength: { SMESH::Controls::Length* aControl = new SMESH::Controls::Length(); @@ -755,6 +775,10 @@ SetControlMode(eControl theMode, myFunctor.reset(new SMESH::Controls::FreeFaces()); myControlActor = my2DActor; break; + case eBareBorderFace: + myFunctor.reset(new SMESH::Controls::BareBorderFace()); + myControlActor = my2DActor; + break; case eMultiConnection: myFunctor.reset(new SMESH::Controls::MultiConnection()); myControlActor = my1DActor; @@ -819,6 +843,12 @@ SetControlMode(eControl theMode, myControlActor = my3DActor; break; } + case eBareBorderVolume: + { + myFunctor.reset(new SMESH::Controls::BareBorderVolume()); + myControlActor = my3DActor; + break; + } case eMinimumAngle: { SMESH::Controls::MinimumAngle* aControl = new SMESH::Controls::MinimumAngle(); @@ -862,6 +892,12 @@ SetControlMode(eControl theMode, case eFreeFaces: my2DExtActor->SetExtControlMode(myFunctor); break; + case eBareBorderFace: + my2DExtActor->SetExtControlMode(myFunctor); + break; + case eBareBorderVolume: + my3DExtActor->SetExtControlMode(myFunctor); + break; case eLength2D: case eMultiConnection2D: my1DExtActor->SetExtControlMode(myFunctor,myScalarBarActor,myLookupTable); @@ -911,6 +947,7 @@ void SMESH_ActorDef::AddToRender(vtkRenderer* theRenderer){ theRenderer->AddActor(myNodeExtActor); my3DActor->AddToRender(theRenderer); + my3DExtActor->AddToRender(theRenderer); my2DActor->AddToRender(theRenderer); my2DExtActor->AddToRender(theRenderer); @@ -954,6 +991,7 @@ void SMESH_ActorDef::RemoveFromRender(vtkRenderer* theRenderer){ my2DActor->RemoveFromRender(theRenderer); my2DExtActor->RemoveFromRender(theRenderer); my3DActor->RemoveFromRender(theRenderer); + my3DExtActor->RemoveFromRender(theRenderer); theRenderer->RemoveActor(myScalarBarActor); theRenderer->RemoveActor(myPointLabels); @@ -989,6 +1027,7 @@ bool SMESH_ActorDef::Init(TVisualObjPtr theVisualObj, my2DActor->Init(myVisualObj,myImplicitBoolean); my2DExtActor->Init(myVisualObj,myImplicitBoolean); my3DActor->Init(myVisualObj,myImplicitBoolean); + my3DExtActor->Init(myVisualObj,myImplicitBoolean); my0DActor->GetMapper()->SetLookupTable(myLookupTable); //my0DExtActor->GetMapper()->SetLookupTable(myLookupTable); @@ -999,6 +1038,7 @@ bool SMESH_ActorDef::Init(TVisualObjPtr theVisualObj, my2DActor->GetMapper()->SetLookupTable(myLookupTable); my2DExtActor->GetMapper()->SetLookupTable(myLookupTable); my3DActor->GetMapper()->SetLookupTable(myLookupTable); + my3DExtActor->GetMapper()->SetLookupTable(myLookupTable); vtkFloatingPointType aFactor, aUnits; my2DActor->GetPolygonOffsetParameters(aFactor,aUnits); @@ -1071,6 +1111,7 @@ void SMESH_ActorDef::SetTransform(VTKViewer_Transform* theTransform){ my2DActor->SetTransform(theTransform); my2DExtActor->SetTransform(theTransform); my3DActor->SetTransform(theTransform); + my3DExtActor->SetTransform(theTransform); Modified(); } @@ -1126,6 +1167,7 @@ void SMESH_ActorDef::SetShrinkFactor(vtkFloatingPointType theValue){ my2DActor->SetShrinkFactor(theValue); my2DExtActor->SetShrinkFactor(theValue); my3DActor->SetShrinkFactor(theValue); + my3DExtActor->SetShrinkFactor(theValue); Modified(); } @@ -1141,6 +1183,7 @@ void SMESH_ActorDef::SetShrink(){ my2DActor->SetShrink(); my2DExtActor->SetShrink(); my3DActor->SetShrink(); + my3DExtActor->SetShrink(); myIsShrunk = true; Modified(); @@ -1157,6 +1200,7 @@ void SMESH_ActorDef::UnShrink(){ my2DActor->UnShrink(); my2DExtActor->UnShrink(); my3DActor->UnShrink(); + my3DExtActor->UnShrink(); myIsShrunk = false; Modified(); @@ -1203,6 +1247,7 @@ void SMESH_ActorDef::SetVisibility(int theMode, bool theIsUpdateRepersentation){ my2DActor->VisibilityOff(); my2DExtActor->VisibilityOff(); my3DActor->VisibilityOff(); + my3DExtActor->VisibilityOff(); myScalarBarActor->VisibilityOff(); myPointLabels->VisibilityOff(); @@ -1222,8 +1267,12 @@ void SMESH_ActorDef::SetVisibility(int theMode, bool theIsUpdateRepersentation){ my1DExtActor->VisibilityOn(); break; case eFreeFaces: + case eBareBorderFace: my2DExtActor->VisibilityOn(); break; + case eBareBorderVolume: + my3DExtActor->VisibilityOn(); + break; case eLength2D: case eMultiConnection2D: my1DExtActor->VisibilityOn(); @@ -1456,6 +1505,7 @@ void SMESH_ActorDef::SetRepresentation (int theMode) //my0DExtActor->SetVisibility(false); my1DExtActor->SetVisibility(false); my2DExtActor->SetVisibility(false); + my3DExtActor->SetVisibility(false); // ??? //my0DActor->SetProperty(aProp); @@ -1786,6 +1836,7 @@ SMESH_ActorDef::SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed) my2DActor->SetImplicitFunctionUsed(theIsImplicitFunctionUsed); my2DExtActor->SetImplicitFunctionUsed(theIsImplicitFunctionUsed); my3DActor->SetImplicitFunctionUsed(theIsImplicitFunctionUsed); + my3DExtActor->SetImplicitFunctionUsed(theIsImplicitFunctionUsed); } vtkIdType diff --git a/src/OBJECT/SMESH_Actor.h b/src/OBJECT/SMESH_Actor.h index 24a57a00a..c44189e8b 100644 --- a/src/OBJECT/SMESH_Actor.h +++ b/src/OBJECT/SMESH_Actor.h @@ -123,7 +123,7 @@ class SMESHOBJECT_EXPORT SMESH_Actor: public SALOME_Actor enum eControl{eNone, eLength, eLength2D, eFreeBorders, eFreeEdges, eFreeNodes, eFreeFaces, eMultiConnection, eArea, eTaper, eAspectRatio, eMinimumAngle, eWarping, eSkew, eAspectRatio3D, eMultiConnection2D, eVolume3D, - eMaxElementLength2D, eMaxElementLength3D}; + eMaxElementLength2D, eMaxElementLength3D, eBareBorderFace, eBareBorderVolume}; virtual void SetControlMode(eControl theMode) = 0; virtual eControl GetControlMode() = 0; virtual SMESH::Controls::FunctorPtr GetFunctor() = 0; diff --git a/src/OBJECT/SMESH_ActorDef.h b/src/OBJECT/SMESH_ActorDef.h index 09b2232f0..c06d3281c 100644 --- a/src/OBJECT/SMESH_ActorDef.h +++ b/src/OBJECT/SMESH_ActorDef.h @@ -234,6 +234,7 @@ class SMESH_ActorDef : public SMESH_Actor SMESH_DeviceActor* my2DActor; SMESH_DeviceActor* my2DExtActor; SMESH_DeviceActor* my3DActor; + SMESH_DeviceActor* my3DExtActor; SMESH_DeviceActor* myControlActor; vtkProperty* myNodeExtProp; diff --git a/src/OBJECT/SMESH_DeviceActor.cxx b/src/OBJECT/SMESH_DeviceActor.cxx index 600a4987c..e0d754cf8 100644 --- a/src/OBJECT/SMESH_DeviceActor.cxx +++ b/src/OBJECT/SMESH_DeviceActor.cxx @@ -501,7 +501,10 @@ SMESH_DeviceActor using namespace SMESH::Controls; if ( dynamic_cast(theFunctor.get()) || - dynamic_cast(theFunctor.get()) ) { + dynamic_cast(theFunctor.get()) || + dynamic_cast(theFunctor.get())|| + dynamic_cast(theFunctor.get())) + { Predicate* aFreePredicate = dynamic_cast(theFunctor.get()); myExtractUnstructuredGrid->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding); vtkUnstructuredGrid* aGrid = myVisualObj->GetUnstructuredGrid(); @@ -514,7 +517,9 @@ SMESH_DeviceActor if(!myExtractUnstructuredGrid->IsCellsRegistered()) myExtractUnstructuredGrid->RegisterCell(-1); SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid()); - }else if(FreeEdges* aFreeEdges = dynamic_cast(theFunctor.get())){ + } + else if(FreeEdges* aFreeEdges = dynamic_cast(theFunctor.get())) + { SMESH::Controls::FreeEdges::TBorders aBorders; aFreeEdges->GetBoreders(aBorders); vtkUnstructuredGrid* aDataSet = vtkUnstructuredGrid::New(); @@ -561,7 +566,9 @@ SMESH_DeviceActor SetUnstructuredGrid(aDataSet); aDataSet->Delete(); - }else if(FreeNodes* aFreeNodes = dynamic_cast(theFunctor.get())){ + } + else if(FreeNodes* aFreeNodes = dynamic_cast(theFunctor.get())) + { myExtractUnstructuredGrid->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding); vtkIdType aNbNodes = myVisualObj->GetNbEntities(SMDSAbs_Node); for( vtkIdType i = 0; i < aNbNodes; i++ ){ diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 46876d3d7..aac1477f3 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -757,6 +757,10 @@ type = QObject::tr( "FREE_BORDERS" ); else if ( dynamic_cast< SMESH::Controls::FreeFaces* >( f.get() ) ) type = QObject::tr( "FREE_FACES" ); + else if ( dynamic_cast< SMESH::Controls::BareBorderVolume* >( f.get() ) ) + type = QObject::tr( "BARE_BORDER_VOLUME" ); + else if ( dynamic_cast< SMESH::Controls::BareBorderFace* >( f.get() ) ) + type = QObject::tr( "BARE_BORDER_FACE" ); return type; } @@ -1176,6 +1180,12 @@ case 6023: aControl = SMESH_Actor::eMaxElementLength3D; break; + case 6024: + aControl = SMESH_Actor::eBareBorderVolume; + break; + case 6025: + aControl = SMESH_Actor::eBareBorderFace; + break; } anActor->SetControlMode(aControl); anActor->GetScalarBarActor()->SetTitle( functorToString( anActor->GetFunctor() ).toLatin1().constData() ); @@ -2951,6 +2961,8 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 6021: case 6022: case 6023: + case 6024: + case 6025: if ( vtkwnd ) { LightApp_SelectionMgr* mgr = selectionMgr(); @@ -3192,6 +3204,8 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 6021, "FREE_FACES", "ICON_FREE_FACES", 0, true ); createSMESHAction( 6022, "MAX_ELEMENT_LENGTH_2D", "ICON_MAX_ELEMENT_LENGTH_2D", 0, true ); createSMESHAction( 6023, "MAX_ELEMENT_LENGTH_3D", "ICON_MAX_ELEMENT_LENGTH_3D", 0, true ); + createSMESHAction( 6024, "BARE_BORDER_VOLUME","ICON_BARE_BORDER_VOLUME", 0, true ); + createSMESHAction( 6025, "BARE_BORDER_FACE","ICON_BARE_BORDER_FACE", 0, true ); createSMESHAction( 6003, "FREE_BORDER", "ICON_FREE_EDGE_2D", 0, true ); createSMESHAction( 6004, "CONNECTION", "ICON_CONNECTION", 0, true ); createSMESHAction( 6005, "FREE_NODE", "ICON_FREE_NODE", 0, true ); @@ -3363,6 +3377,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createMenu( 6001, edgeId, -1 ); createMenu( 6004, edgeId, -1 ); createMenu( 6021, faceId, -1 ); + createMenu( 6025, faceId, -1 ); createMenu( 6018, faceId, -1 ); createMenu( 6019, faceId, -1 ); createMenu( 6011, faceId, -1 ); @@ -3375,6 +3390,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createMenu( 6017, volumeId, -1 ); createMenu( 6009, volumeId, -1 ); createMenu( 6023, volumeId, -1 ); + createMenu( 6024, volumeId, -1 ); createMenu( 4000, addId, -1 ); createMenu( 4009, addId, -1 ); @@ -3468,6 +3484,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createTool( 6004, ctrlTb ); createTool( separator(), ctrlTb ); createTool( 6021, ctrlTb ); + createTool( 6025, ctrlTb ); createTool( 6018, ctrlTb ); createTool( 6019, ctrlTb ); createTool( 6011, ctrlTb ); @@ -3481,6 +3498,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createTool( 6017, ctrlTb ); createTool( 6009, ctrlTb ); createTool( 6023, ctrlTb ); + createTool( 6024, ctrlTb ); createTool( separator(), ctrlTb ); createTool( 4000, addRemTb ); @@ -3783,50 +3801,54 @@ void SMESHGUI::initialize( CAM_Application* app ) aSubId = popupMgr()->insert( tr( "MEN_FACE_CTRL" ), anId, -1 ); // FACE CONTROLS - popupMgr()->insert( action( 6021 ), aSubId, -1 ); // FREE_FACE + popupMgr()->insert ( action( 6021 ), aSubId, -1 ); // FREE_FACE popupMgr()->setRule( action( 6021 ), aMeshInVtkHasFaces /*aMeshInVtkHasVolumes*/, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6021 ), "controlMode = 'eFreeFaces'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6018 ), aSubId, -1 ); // LENGTH_2D + popupMgr()->insert ( action( 6018 ), aSubId, -1 ); // LENGTH_2D popupMgr()->setRule( action( 6018 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6018 ), "controlMode = 'eLength2D'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6019 ), aSubId, -1 ); // CONNECTION_2D + popupMgr()->insert ( action( 6019 ), aSubId, -1 ); // CONNECTION_2D popupMgr()->setRule( action( 6019 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6019 ), "controlMode = 'eMultiConnection2D'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6011 ), aSubId, -1 ); // AREA + popupMgr()->insert ( action( 6011 ), aSubId, -1 ); // AREA popupMgr()->setRule( action( 6011 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6011 ), "controlMode = 'eArea'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6012 ), aSubId, -1 ); // TAPER + popupMgr()->insert ( action( 6012 ), aSubId, -1 ); // TAPER popupMgr()->setRule( action( 6012 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6012 ), "controlMode = 'eTaper'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6013 ), aSubId, -1 ); // ASPECT + popupMgr()->insert ( action( 6013 ), aSubId, -1 ); // ASPECT popupMgr()->setRule( action( 6013 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6013 ), "controlMode = 'eAspectRatio'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6014 ), aSubId, -1 ); // MIN_ANG + popupMgr()->insert ( action( 6014 ), aSubId, -1 ); // MIN_ANG popupMgr()->setRule( action( 6014 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6014 ), "controlMode = 'eMinimumAngle'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6015 ), aSubId, -1 ); // WARP + popupMgr()->insert ( action( 6015 ), aSubId, -1 ); // WARP popupMgr()->setRule( action( 6015 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6015 ), "controlMode = 'eWarping'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6016 ), aSubId, -1 ); // SKEW + popupMgr()->insert ( action( 6016 ), aSubId, -1 ); // SKEW popupMgr()->setRule( action( 6016 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6016 ), "controlMode = 'eSkew'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6022 ), aSubId, -1 ); // MAX_ELEMENT_LENGTH_2D + popupMgr()->insert ( action( 6022 ), aSubId, -1 ); // MAX_ELEMENT_LENGTH_2D popupMgr()->setRule( action( 6022 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6022 ), "controlMode = 'eMaxElementLength2D'", QtxPopupMgr::ToggleRule ); + popupMgr()->insert ( action( 6025 ), aSubId, -1 ); // BARE_BORDER_FACE + popupMgr()->setRule( action( 6025 ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); + popupMgr()->setRule( action( 6025 ), "controlMode = 'eBareBorderFace'", QtxPopupMgr::ToggleRule ); + aSubId = popupMgr()->insert( tr( "MEN_VOLUME_CTRL" ), anId, -1 ); // VOLUME CONTROLS - popupMgr()->insert( action( 6017 ), aSubId, -1 ); // ASPECT_3D + popupMgr()->insert ( action( 6017 ), aSubId, -1 ); // ASPECT_3D popupMgr()->setRule( action( 6017 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6017 ), "controlMode = 'eAspectRatio3D'", QtxPopupMgr::ToggleRule ); @@ -3834,10 +3856,14 @@ void SMESHGUI::initialize( CAM_Application* app ) popupMgr()->setRule( action( 6009 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6009 ), "controlMode = 'eVolume3D'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( 6023 ), aSubId, -1 ); // MAX_ELEMENT_LENGTH_3D + popupMgr()->insert ( action( 6023 ), aSubId, -1 ); // MAX_ELEMENT_LENGTH_3D popupMgr()->setRule( action( 6023 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( 6023 ), "controlMode = 'eMaxElementLength3D'", QtxPopupMgr::ToggleRule ); + popupMgr()->insert ( action( 6024 ), aSubId, -1 ); // BARE_BORDER_VOLUME + popupMgr()->setRule( action( 6024 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule ); + popupMgr()->setRule( action( 6024 ), "controlMode = 'eBareBorderVolume'", QtxPopupMgr::ToggleRule ); + popupMgr()->insert( separator(), anId, -1 ); popupMgr()->insert( action( 201 ), anId, -1 ); // SCALAR_BAR_PROP diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index bf1e387ea..7e5030f4a 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx @@ -1170,6 +1170,8 @@ void SMESHGUI_FilterTable::SetCriterion (const int theRow, theCriterion.Type != SMESH::FT_FreeNodes && theCriterion.Type != SMESH::FT_FreeFaces && theCriterion.Type != SMESH::FT_BadOrientedVolume && + theCriterion.Type != SMESH::FT_BareBorderFace && + theCriterion.Type != SMESH::FT_BareBorderVolume && theCriterion.Type != SMESH::FT_LinearOrQuadratic) aTable->item( theRow, 2 )->setText(QString("%1").arg(theCriterion.Threshold, 0, 'g', 15)); else @@ -1324,11 +1326,13 @@ void SMESHGUI_FilterTable::updateAdditionalWidget() ComboItem* anItem = ((ComboItem*)aTable->item(aRow, 0)); int aCriterion = GetCriterionType(aRow); - bool toEnable = ((ComboItem*)aTable->item(aRow, 1))->value() == SMESH::FT_EqualTo && - aCriterion != SMESH::FT_RangeOfIds && - aCriterion != SMESH::FT_FreeEdges && - aCriterion != SMESH::FT_FreeFaces && - aCriterion != SMESH::FT_BadOrientedVolume; + bool toEnable = (((ComboItem*)aTable->item(aRow, 1))->value() == SMESH::FT_EqualTo && + aCriterion != SMESH::FT_RangeOfIds && + aCriterion != SMESH::FT_FreeEdges && + aCriterion != SMESH::FT_FreeFaces && + aCriterion != SMESH::FT_BadOrientedVolume && + aCriterion != SMESH::FT_BareBorderFace && + aCriterion != SMESH::FT_BareBorderVolume); if (!myAddWidgets.contains(anItem)) { @@ -1504,9 +1508,11 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con if (aType == SMESH::NODE && aCriterionType == SMESH::FT_FreeNodes || aType == SMESH::EDGE && aCriterionType == SMESH::FT_FreeBorders || - aType == SMESH::FACE && (aCriterionType == SMESH::FT_FreeEdges || + aType == SMESH::FACE && (aCriterionType == SMESH::FT_BareBorderFace || + aCriterionType == SMESH::FT_FreeEdges || aCriterionType == SMESH::FT_FreeFaces) || - aType == SMESH::VOLUME && aCriterionType == SMESH::FT_BadOrientedVolume || + aType == SMESH::VOLUME && (aCriterionType == SMESH::FT_BadOrientedVolume || + aCriterionType == SMESH::FT_BareBorderVolume) || aCriterionType == SMESH::FT_LinearOrQuadratic || aCriterionType == SMESH::FT_GroupColor || aCriterionType == SMESH::FT_ElemGeomType) @@ -1789,6 +1795,7 @@ const QMap& SMESHGUI_FilterTable::getCriteria (const int theType) aCriteria[ SMESH::FT_Length2D ] = tr("LENGTH2D"); aCriteria[ SMESH::FT_MultiConnection2D ] = tr("MULTI2D_BORDERS"); aCriteria[ SMESH::FT_FreeFaces ] = tr("FREE_FACES"); + aCriteria[ SMESH::FT_BareBorderFace ] = tr("BARE_BORDER_FACE"); aCriteria[ SMESH::FT_LinearOrQuadratic ] = tr("LINEAR"); aCriteria[ SMESH::FT_GroupColor ] = tr("GROUP_COLOR"); aCriteria[ SMESH::FT_ElemGeomType ] = tr("GEOM_TYPE"); @@ -1805,6 +1812,7 @@ const QMap& SMESHGUI_FilterTable::getCriteria (const int theType) aCriteria[ SMESH::FT_BelongToGeom ] = tr("BELONG_TO_GEOM"); aCriteria[ SMESH::FT_LyingOnGeom ] = tr("LYING_ON_GEOM"); aCriteria[ SMESH::FT_BadOrientedVolume ] = tr("BAD_ORIENTED_VOLUME"); + aCriteria[ SMESH::FT_BareBorderVolume ] = tr("BARE_BORDER_VOLUME"); aCriteria[ SMESH::FT_Volume3D ] = tr("VOLUME_3D"); aCriteria[ SMESH::FT_MaxElementLength3D ] = tr("MAX_ELEMENT_LENGTH_3D"); aCriteria[ SMESH::FT_LinearOrQuadratic ] = tr("LINEAR"); diff --git a/src/SMESHGUI/SMESH_images.ts b/src/SMESHGUI/SMESH_images.ts index 856e88f32..d7373ad92 100644 --- a/src/SMESHGUI/SMESH_images.ts +++ b/src/SMESHGUI/SMESH_images.ts @@ -457,6 +457,14 @@ ICON_VOLUME_3D mesh_volume_3d.png + + ICON_BARE_BORDER_VOLUME + bare_border_volume.png + + + ICON_BARE_BORDER_FACE + bare_border_face.png + ICON_WARP mesh_wrap.png diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index 189c5c1b3..ce8bed27b 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -391,6 +391,14 @@ TOP_FIND_ELEM Find Element by Point + + MEN_BARE_BORDER_VOLUME + Volumes with bare border + + + MEN_BARE_BORDER_FACE + Faces with bare border + MEN_FREE_BORDER Free Borders @@ -2424,6 +2432,14 @@ Consider saving your work before application crash STB_FACES Faces + + STB_BARE_BORDER_VOLUME + Volumes with bare border + + + STB_BARE_BORDER_FACE + Faces with bare border + STB_FREE_BORDER Free Borders @@ -2960,6 +2976,14 @@ Consider saving your work before application crash TOP_FACES Faces + + TOP_BARE_BORDER_VOLUME + Volumes with bare border + + + TOP_BARE_BORDER_FACE + Faces with bare border + TOP_FREE_BORDER Free Borders @@ -4299,6 +4323,14 @@ Please check input data and try again BAD_ORIENTED_VOLUME Bad oriented volume + + BARE_BORDER_VOLUME + Volumes with bare border + + + BARE_BORDER_FACE + Faces with bare border + BELONG_TO_CYLINDER Belong to Cylinder diff --git a/src/StdMeshers/StdMeshers_Import_1D.cxx b/src/StdMeshers/StdMeshers_Import_1D.cxx index fe0f05476..29b428788 100644 --- a/src/StdMeshers/StdMeshers_Import_1D.cxx +++ b/src/StdMeshers/StdMeshers_Import_1D.cxx @@ -120,6 +120,7 @@ namespace // INTERNAL STUFF enum _ListenerDataType { WAIT_HYP_MODIF=1, // data indicating awaiting for valid parameters of src hyp + LISTEN_SRC_MESH, // data storing submesh depending on source mesh state SRC_HYP // data storing ImportSource hyp }; //================================================================================ @@ -130,10 +131,10 @@ namespace // INTERNAL STUFF struct _ListenerData : public SMESH_subMeshEventListenerData { const StdMeshers_ImportSource1D* _srcHyp; - _ListenerData(const StdMeshers_ImportSource1D* h): + _ListenerData(const StdMeshers_ImportSource1D* h, _ListenerDataType type=SRC_HYP): SMESH_subMeshEventListenerData(/*isDeletable=*/true), _srcHyp(h) { - myType = SRC_HYP; + myType = type; } }; //================================================================================ @@ -246,10 +247,9 @@ namespace // INTERNAL STUFF // set a listener to hear events of the source mesh SMESH_subMesh* smToNotify = importSub; SMESH_subMesh* smToListen = srcMesh->GetSubMeshContaining(1); - importSub->SetEventListener - ( new SMESH_subMeshEventListener(/*isDeletable=*/true), - SMESH_subMeshEventListenerData::MakeData( smToNotify ), - smToListen ); + SMESH_subMeshEventListenerData* data = new _ListenerData(srcHyp, LISTEN_SRC_MESH); + data->mySubMeshes.push_back( smToNotify ); + importSub->SetEventListener( get(), data, smToListen ); // remeber the submesh _ImportData* iData = _Listener::getImportData( srcMesh, importSub->GetFather()); @@ -320,6 +320,12 @@ namespace // INTERNAL STUFF bool copyMesh = !d->_copyMeshSubM.empty(); if ( copyMesh ) { + // remove imported mesh and groups + d->removeImportedMesh( sm->GetFather()->GetMeshDS() ); + + if ( data ) + d->removeGroups( sm, data->_srcHyp ); + // clear submeshes if ( !d->_computedSubM.empty() ) { @@ -335,11 +341,10 @@ namespace // INTERNAL STUFF subM->ComputeStateEngine( SMESH_subMesh::CLEAN ); } } - // remove imported mesh and groups - d->removeImportedMesh( sm->GetFather()->GetMeshDS() ); - - if ( data ) - d->removeGroups( sm, data->_srcHyp ); + } + else + { + sm->ComputeStateEngine( SMESH_subMesh::CLEAN ); } } if ( data ) @@ -360,6 +365,7 @@ namespace // INTERNAL STUFF { if ( data && data->myType == WAIT_HYP_MODIF ) { + // event of Import submesh if ( SMESH_subMesh::MODIF_HYP == event && SMESH_subMesh::ALGO_EVENT == eventType ) { @@ -368,13 +374,39 @@ namespace // INTERNAL STUFF algo->SetEventListener( subMesh ); } } - else + else if ( data && data->myType == LISTEN_SRC_MESH ) { - SMESH_Gen* gen = subMesh->GetFather()->GetGen(); - SMESH_Algo* algo = gen->GetAlgo(*subMesh->GetFather(),subMesh->GetSubShape() ); + // event of source mesh + if ( SMESH_subMesh::COMPUTE_EVENT == eventType ) + { + switch ( event ) { + case SMESH_subMesh::CLEAN: + clearSubmesh( data->mySubMeshes.front(), (_ListenerData*) data ); + break; + case SMESH_subMesh::COMPUTE: + if ( subMesh->GetComputeState() == SMESH_subMesh::COMPUTE_OK ) + data->mySubMeshes.front()->ComputeStateEngine( SMESH_subMesh::SUBMESH_COMPUTED ); + break; + default:; + } + } + } + else // event of Import submesh + { + bool removeImport = false; + if ( subMesh->GetAlgoState() != SMESH_subMesh::HYP_OK ) + { + removeImport = true; + } + else if ( SMESH_subMesh::REMOVE_ALGO == event || + SMESH_subMesh::REMOVE_FATHER_ALGO == event ) + { + SMESH_Gen* gen = subMesh->GetFather()->GetGen(); + SMESH_Algo* algo = gen->GetAlgo(*subMesh->GetFather(),subMesh->GetSubShape() ); + removeImport = ( strncmp( "Import", algo->GetName(), 6 ) != 0 ); + } - if ( subMesh->GetAlgoState() != SMESH_subMesh::HYP_OK || - strncmp( "Import", algo->GetName(), 6 ) != 0 ) + if ( removeImport ) { // treate removal of Import algo from subMesh removeSubmesh( subMesh, (_ListenerData*) data ); @@ -543,8 +575,8 @@ bool StdMeshers_Import_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & th subShapeIDs.insert( shapeID ); // get nodes on vertices - list < SMESH_MeshEditor::TNodeXYZ > vertexNodes; - list < SMESH_MeshEditor::TNodeXYZ >::iterator vNIt; + list < SMESH_MeshEditor::TNodeXYZ > vertexNodes; + list < SMESH_MeshEditor::TNodeXYZ >::iterator vNIt; TopExp_Explorer vExp( theShape, TopAbs_VERTEX ); for ( ; vExp.More(); vExp.Next() ) { @@ -797,6 +829,17 @@ void StdMeshers_Import_1D::importMesh(const SMESH_Mesh* srcMesh, n2n->clear(); e2e->clear(); + { + cout << "IMPORT SubMesh " << endl << " Elems:"; + SMDS_ElemIteratorPtr eIt = tgtSubMesh->GetElements(); + while ( eIt->more() ) + cout << " " << eIt->next()->GetID(); + cout << endl << " Nodes:"; + SMDS_NodeIteratorPtr nIt = tgtSubMesh->GetNodes(); + while ( nIt->more() ) + cout << " " << nIt->next()->GetID(); + cout << endl; + } // Remember created groups in order to remove them as soon as the srcHyp is // modified or something other similar happens. Store them in a hypothesis // as it stores its values anyway diff --git a/src/StdMeshers/StdMeshers_Import_1D2D.cxx b/src/StdMeshers/StdMeshers_Import_1D2D.cxx index 0062de31d..cca605bd4 100644 --- a/src/StdMeshers/StdMeshers_Import_1D2D.cxx +++ b/src/StdMeshers/StdMeshers_Import_1D2D.cxx @@ -153,8 +153,8 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & const bool toCheckOri = (helper.NbAncestors( geomFace, theMesh, TopAbs_SOLID ) == 1 ); Handle(Geom_Surface) surface = BRep_Tool::Surface( geomFace ); - if ( helper.GetSubShapeOri( tgtMesh->ShapeToMesh(), geomFace) == TopAbs_REVERSED ) - surface->UReverse(); + const bool reverse = + ( helper.GetSubShapeOri( tgtMesh->ShapeToMesh(), geomFace) == TopAbs_REVERSED ); gp_Pnt p; gp_Vec du, dv; set subShapeIDs; @@ -262,7 +262,7 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & { uv = helper.GetNodeUV( geomFace, newNodes[++iNode] ); surface->D1( uv.X(),uv.Y(), p, du,dv ); - geomNorm = du ^ dv; + geomNorm = reverse ? dv^du : du^dv; } while ( geomNorm.SquareMagnitude() < 1e-6 && iNode+1 < face->NbCornerNodes()); @@ -458,6 +458,25 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & for ( unsigned iE = 0; iE < edges.size(); ++iE ) theMesh.GetSubMesh( edges[iE] )->ComputeStateEngine(SMESH_subMesh::CHECK_COMPUTE_STATE); + SMESH_subMesh* sm = theMesh.GetSubMesh(theShape); + SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(true,false); + cout << endl << string(80,'=') << endl + << "Compute( face " << tgtMesh->ShapeToIndex(theShape) << endl; + while ( smIt->more() ) + { + sm = smIt->next(); + TopAbs::Print(sm->GetSubShape().ShapeType(), cout); + cout << " " << sm->GetId() << endl << " Elems:"; + SMDS_ElemIteratorPtr eIt = sm->GetSubMeshDS()->GetElements(); + while ( eIt->more() ) + cout << " " << eIt->next()->GetID(); + cout << endl << " Nodes:"; + SMDS_NodeIteratorPtr nIt = sm->GetSubMeshDS()->GetNodes(); + while ( nIt->more() ) + cout << " " << nIt->next()->GetID(); + cout << endl; + } + // ============ // Copy meshes // ============ -- 2.39.2