Commit Graph

1072 Commits

Author SHA1 Message Date
eap
f34590a67f 22364: EDF SMESH: Create Mesh dialog box improvement: hide inapplicable algorithms/hypotheses
1) Some optimization
2) Implement StdMeshers_Prism_3D::IsApplicable()
2014-02-25 18:54:34 +04:00
eap
e8f98d7a50 22364: EDF SMESH: Create Mesh dialog box improvement: hide inapplicable algorithms/hypotheses
+  /*!
+   * \brief Auto pointer
+   */
+  template <typename TOBJ> struct Deleter
2014-02-25 18:50:48 +04:00
mgn
e2cd4bc297 Additional fix for the "0021793: [CEA 625] Clipping : from coordinates
or from bounding box"
2014-02-24 15:36:54 +04:00
imn
6aea23b893 0022364: EDF SMESH: Create Mesh dialog box improvement: hide inapplicable algorithms/hypotheses
0022365: EDF SMESH: Create Mesh dialog box improvement: hide algorithms depending on a mesh type
2014-02-21 12:25:11 +04:00
akl
b0a908c0d2 Update copyrights 2014. 2014-02-20 16:25:37 +04:00
eap
4581091214 In Create Mesh dlg, add "objects" to a number of selected GEOM objects 2014-02-20 14:05:45 +04:00
eap
398091c671 Excess quote 2014-02-20 13:38:40 +04:00
eap
790cad1c40 0022360: EDF SMESH: Body Fitting algorithm: incorporate edges
Treat tangent transition at the 1st link node
2014-02-20 12:58:43 +04:00
eap
004510cb7d Make meshes with different names if several GEOM objects selected 2014-02-20 12:55:58 +04:00
eap
a30b3a5fbf Fix strange string like "1 , 1 , 1 " instead of nb of selected geom objects at mesh creation 2014-02-19 17:15:16 +04:00
rnv
6e68fcd497 Fix problems with the OpenGL clipping planes. 2014-02-19 16:43:32 +04:00
eap
fad37730ee Fix error description passed via exception 2014-02-18 13:56:25 +04:00
eap
7a732fc9d1 do not catch CORBA exceptions thrown by SMESH_Mesh_i 2014-02-17 17:10:11 +04:00
eap
bf7367a22f fix AddFrom() for an undefined filter as argument 2014-02-17 17:08:46 +04:00
eap
dcc7add229 Forum: Quadrangle meshing of surface with 3 edges
There can be degenerated EDGEs in non-closed and non-periodic FACEs
2014-02-17 13:55:35 +04:00
eap
8585067de8 0022360: EDF SMESH: Body Fitting algorithm: incorporate edges 2014-02-14 19:31:40 +04:00
eap
5b8d7b95e3 0022488: EDF 2781 SMESH: Faces of an internal submesh can't be selected with the viscous layer 2014-02-14 16:10:27 +04:00
eap
86aa8ad014 22359: Body Fitting algorithm: grid orientation 2014-02-14 16:09:40 +04:00
eap
53fcb605c1 0022367: EDF SMESH: Notification on concurrent algorithms/hypotheses 2014-02-14 16:05:31 +04:00
eap
8b7d977779 0022362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vortices
Create GUI
2014-02-14 16:03:53 +04:00
eap
3216bba91f 0022364, 0022363: EDF SMESH: Create Mesh dialog box improvement 2014-02-14 16:03:10 +04:00
eap
d9b7053864 0022362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vortices
Create GUI
2014-02-14 15:53:14 +04:00
ctn
b212155cea 0022481: EDF 2559 SMESH: Is GetGroups list sorted?
=> update of the doc
2014-02-05 12:03:58 +00:00
gdd
74d992bdaf Update French translation file 2014-02-05 11:03:39 +00:00
eap
60a4f927ca 22359: Body Fitting algorithm: grid orientation
Make axes w/o geometry larger than the trihedron
2014-02-05 09:14:42 +00:00
eap
74a891c6f3 22359: Body Fitting algorithm: grid orientation
Fix a crash in the release mode

+  // Creation of this class disables vtkMatplotlibMathTextUtilities
+  struct MPLMathText_Disabler : protected vtkMatplotlibMathTextUtilities
2014-02-05 09:13:00 +00:00
eap
5c9a9bf940 22359: Body Fitting algorithm: grid orientation
Fix the destructor
2014-02-05 08:20:55 +00:00
eap
fce720f2d2 22465: [CEA] sometimes isinstance(m, Mesh) returns False for Mesh objects // PPGP pb
class MeshMeta(type):
    def __instancecheck__(cls, inst):
        """Implement isinstance(inst, cls)."""
        return any(cls.__subclasscheck__(c)
                   for c in {type(inst), inst.__class__})

    def __subclasscheck__(cls, sub):
        """Implement issubclass(sub, cls)."""
        return type.__subclasscheck__(cls, sub) or (cls.__name__ == sub.__name__ and cls.__module__ == sub.__module__)

...

class Mesh:
    __metaclass__ = MeshMeta

...
2014-02-05 08:08:10 +00:00
eap
cc9e7d5442 22358: EDF SMESH: Body Fitting algorithm: origin point of grid defined by spacing 2014-02-04 15:51:49 +00:00
eap
b416ea5c24 22359: Body Fitting algorithm: grid orientation
+  ${GEOM_INCLUDE_DIRS}

+  ${GEOM_GEOMUtils}
2014-02-04 13:06:41 +00:00
eap
494cae9236 22359: Body Fitting algorithm: grid orientation
Add labels to arrows
2014-02-04 13:06:14 +00:00
eap
a62ca0b865 22359: Body Fitting algorithm: grid orientation
Move global methods needed for NCollection_DataMap< TopoDS_Shape, * >
to class SMESHDS_Hasher in order not to clash with the same global definitions

-  typedef NCollection_DataMap< TopoDS_Shape, THypList > ShapeToHypothesis;
+  typedef NCollection_DataMap< TopoDS_Shape, THypList, SMESHDS_Hasher > ShapeToHypothesis;
2014-02-04 13:05:33 +00:00
eap
cd3ffac3fa 22359: Body Fitting algorithm: grid orientation
22358: Body Fitting algorithm: origin point of grid defined by spacing
2014-02-04 13:02:26 +00:00
eap
fee6909125 22473: EDF 2825 SMESH: Memory allocation problem with ViscousLayer2D
1) enable recursive calls from StdMeshers_ViscousLayers2D::Compute( aMesh, F );
2) fix computeQuadDominant() for a case of triangles on 2 sides
3) do not use triaVertex for a quadrangle FACE
2014-01-31 13:43:11 +00:00
eap
ae475d83da 22473: EDF 2825 SMESH: Memory allocation problem with ViscousLayer2D
Use _noShrinkVert
2014-01-31 13:40:41 +00:00
rnv
b737ae98e6 Additional fix for the "0022460: [CEA 1042] Copy Mesh: impossible mesh selection in the object browser if selection in 3D view is disabled" issue. 2014-01-24 11:16:50 +00:00
rnv
6a9d0d6ae6 Fix for the "0022460: [CEA 1042] Copy Mesh: impossible mesh selection in the object browser if selection in 3D view is disabled" 2014-01-24 08:37:57 +00:00
eap
f202478154 22362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vertices
fix for a case of http://www.salome-platform.org/forum/forum_10/863809970#478269857
2014-01-23 12:46:37 +00:00
eap
c94d606fe3 22316: EDF 2719 SMESH: Split hexas into prisms
Make Python API be equal to IDL API
2014-01-21 16:37:16 +00:00
eap
3f7c707fd9 22316: EDF 2719 SMESH: Split hexas into prisms
disable dialog if a mesh includes no hexahedra
2014-01-21 09:24:53 +00:00
eap
67dba15dfd 22244: [CEA] Method to compute the normal to a mesh face
-    double_array GetFaceNormal(in long faceId);
+    double_array GetFaceNormal(in long faceId, in boolean normalized);
2014-01-20 17:42:20 +00:00
eap
e12cb3f8c3 22362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vertices
fix recursive case of computeQuadPref()
2014-01-20 16:39:00 +00:00
eap
f55c997d2e fix indentation 2014-01-20 10:45:36 +00:00
eap
d2c62e114d 22316: EDF 2719 SMESH: Split hexas into prisms
+  double GetDistance( const SMDS_MeshElement* elem, const gp_Pnt& point );
+  double GetDistance( const SMDS_MeshEdge* edge, const gp_Pnt& point );
+  double GetDistance( const SMDS_MeshVolume* volume, const gp_Pnt& point );
2014-01-20 10:35:19 +00:00
eap
0eac807ec1 22316: EDF 2719 SMESH: Split hexas into prisms
+  void                 SetArrowShapeAndNb( int    nbArrows,
+                                           double headLength,
+                                           double headRadius,
+                                           double start=0.);
+  void                 SetArrows( const gp_Ax1* axes,
+                                  double        length);

+  vtkUnstructuredGrid* GetGrid() const;
2014-01-20 10:34:46 +00:00
eap
74b03c9f40 22316: EDF 2719 SMESH: Split hexas into prisms
namespace SMESH
 {
   enum SMESHGUI_FilterType {
     QuadFilter              =  5,
     TriaFilter              =  6,
+    FirstGeometryTypeFilter,
+    FirstEntityTypeFilter   = FirstGeometryTypeFilter + SMDSGeom_NONE,
+    LastFilter              = FirstEntityTypeFilter   + SMDSEntity_Last
   };
 };

+class SMESHGUI_VolumeShapeFilter : public SMESHGUI_Filter
+{
2014-01-20 10:34:21 +00:00
eap
b9b3af112d 22316: EDF 2719 SMESH: Split hexas into prisms
+  static int GetOppFaceIndexOfHex( int faceIndex );
2014-01-20 10:32:49 +00:00
eap
80d5c05fce 22316: EDF 2719 SMESH: Split hexas into prisms
+  virtual SMDSAbs_GeometryType GetGeomType()  const { return SMDSGeom_POLYGON; }
2014-01-20 10:32:30 +00:00
eap
ffa5254282 22316: EDF 2719 SMESH: Split hexas into prisms
+    GeometryType GetElementShape( in long id )
+      raises (SALOME::SALOME_Exception);
2014-01-20 10:32:14 +00:00
eap
f500e5a8b6 22316: EDF 2719 SMESH: Split hexas into prisms 2014-01-20 10:31:23 +00:00
eap
a406fd6793 22362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vertices
fix for recursive call of computeQuadPref()
2014-01-15 10:27:00 +00:00
vsr
f7aba4830d Merge from BR_imps_2013 14/01/2014 2014-01-15 09:41:17 +00:00
eap
b117205bfd 22455: Error "No mesh elements assigned to a face" is raised instead of a simple warning
1) Fix finding a shape in a study
2) Append study entry to a name of published failed sub-shape
2014-01-10 08:01:57 +00:00
eap
dda95cb5b7 22455: Error "No mesh elements assigned to a face" is raised instead of a simple warning
Append study entry to a failed sub-shape name,
else it's hard to find a sub-shape in the study
2014-01-09 15:08:07 +00:00
vsr
072a73120b Merge from V7_3_BR (09/01/2014) 2014-01-09 14:20:44 +00:00
vsr
2cd148d066 Merge from V7_3_BR branch 18/12/2013 2013-12-18 15:08:18 +00:00
fahed
8fcd118698 Small fix for windows 2013-11-28 08:41:47 +00:00
mpa
046b185660 CMake:
- add files to remove using command "make clean"
2013-11-27 11:00:50 +00:00
eap
d9d385cc06 22419: EDF SMESH Regression: 3D Extrusion fails
FaceQuadStruct::Ptr CheckNbEdges(SMESH_Mesh&         aMesh,
                                    const TopoDS_Shape& aShape,
+                                   const bool          considerMesh=false);
2013-11-27 10:00:34 +00:00
imn
c8c04435db Integrated in V7_main: 0022366: EDF SMESH: Create Mesh dialog box improvement: create empty mesh without geometry in GUI 2013-11-27 07:30:42 +00:00
eap
cf325767f5 more orthography 2013-11-26 13:41:02 +00:00
eap
521479f0ef Fix indentation 2013-11-26 13:37:39 +00:00
eap
5cdfcba279 More safety
-        if ( l_d->first->IsDeletable() )
+        if ( l_d->first != listener && l_d->first->IsDeletable() )
2013-11-26 13:33:52 +00:00
eap
06236fdb5a 22362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vertices
+   * \brief Create a side from an UVPtStructVec
+   */
+  StdMeshers_FaceSide(UVPtStructVec& theSideNodes);
2013-11-26 13:30:21 +00:00
eap
eeb8567ff9 Fix CheckNbEdges() for a FACE with a closed EDGE 2013-11-26 13:29:36 +00:00
eap
d0bcfa9ea1 Fix access to NULL quad 2013-11-26 12:26:45 +00:00
eap
5f7b45e582 http://www.salome-platform.org/forum/forum_11/173031193
Fix associating FACEs having degenerated EDGEs
2013-11-26 12:16:47 +00:00
imn
33d8a195b4 Integrated to V7_main: 0022366: EDF SMESH: Create Mesh dialog box improvement: create empty mesh without geometry in GUI 2013-11-26 10:15:18 +00:00
imn
608b1a194b Integrated to V7_main: 0022366: EDF SMESH: Create Mesh dialog box improvement: create empty mesh without geometry in GUI 2013-11-26 10:11:53 +00:00
eap
b2f41043c8 Fix SIGSEGV at closing a study 2013-11-25 10:39:28 +00:00
eap
a004160516 0022414: [CEA 1010] Regressio on tests 01_composite.py
Fix for a vertex w/o a node
2013-11-25 09:14:33 +00:00
eap
1faf00f679 0022414: [CEA 1010] Regressio on tests bug_763_netgen_1d_2d.py
+        from salome.smesh.smeshBuilder import Mesh
2013-11-25 09:13:09 +00:00
eap
850941885d synchronize with SMESH_msg_en.ts 2013-11-22 13:55:23 +00:00
eap
d5b3009987 - static bool isStraight( const TopoDS_Edge & E, const bool degenResult=false );
+  static bool IsStraight( const TopoDS_Edge & E, const bool degenResult=false );
2013-11-22 13:17:22 +00:00
eap
620c78e582 + bool findUVByHalfDivision( const gp_Pnt& thePoint, const gp_XY& theUV,
+                             const TFace& tface, gp_XYZ& theParams);
+  bool findUVAround( const gp_Pnt& thePoint, const gp_XY& theUV,
+                     const TFace& tface, gp_XYZ& theParams, int nbGetWorstLimit );
2013-11-22 13:17:00 +00:00
eap
ffa6ef36b3 http://www.salome-platform.org/forum/forum_10/409159356
Fox testcube2a.py
2013-11-22 13:16:34 +00:00
eap
8093357296 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
-  StdMeshers_FaceSide(const SMDS_MeshNode*       theNode,
-                      const gp_Pnt2d             thePnt2d,
-                      const StdMeshers_FaceSide* theSide);
+  StdMeshers_FaceSide(const StdMeshers_FaceSide*  theSide,
+                      const SMDS_MeshNode*        theNode,
+                      const gp_Pnt2d*             thePnt2d1,
+                      const gp_Pnt2d*             thePnt2d2=NULL,
+                      const Handle(Geom2d_Curve)& theC2d=NULL,
+                      const double                theUFirst=0.,
+                      const double                theULast=1.);
2013-11-22 13:14:08 +00:00
eap
dacd5b29c7 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
+  int GetCorners(const TopoDS_Face&          theFace,
+                 SMESH_Mesh &                theMesh,
+                 std::list<TopoDS_Edge>&     theWire,
+                 std::vector<TopoDS_Vertex>& theVertices,
+                 int &                       theNbDegenEdges);
2013-11-22 12:40:36 +00:00
eap
73df78c0c4 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
-  StdMeshers_FaceSide(const SMDS_MeshNode*       theNode,
-                      const gp_Pnt2d             thePnt2d,
-                      const StdMeshers_FaceSide* theSide);
+  StdMeshers_FaceSide(const StdMeshers_FaceSide*  theSide,
+                      const SMDS_MeshNode*        theNode,
+                      const gp_Pnt2d*             thePnt2d1,
+                      const gp_Pnt2d*             thePnt2d2=NULL,
+                      const Handle(Geom2d_Curve)& theC2d=NULL,
+                      const double                theUFirst=0.,
+                      const double                theULast=1.);
2013-11-22 12:37:31 +00:00
eap
127524b9c2 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
do not import from smeshBuilder to avoid pb with cyclic import
2013-11-22 12:36:27 +00:00
eap
89eaa44e08 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
+  COMPERR_BAD_PARMETERS    = -13, //!< incorrect hypotheses parameters
2013-11-22 12:35:35 +00:00
eap
60f3b24591 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
+        <source>COMPERR_BAD_PARMETERS</source>
+        <translation>Invalid input parameters</translation>
2013-11-22 12:35:17 +00:00
eap
a007ecaef9 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
+      CASE2TEXT( COMPERR_BAD_PARMETERS    );
2013-11-22 12:34:58 +00:00
eap
0280d2e6a7 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
Fix "int WrapIndex(const int ind, const int nbNodes)" for ind=-4 and nbNodes=4
2013-11-22 12:34:45 +00:00
eap
ea1c9b37c7 -from salome.StdMeshers import StdMeshersBuilder
+import StdMeshers
2013-11-20 11:31:08 +00:00
kga
7e624b26fa 22314: EDF 2594 SMESH: Preview "Union of triangles" result 2013-11-20 09:12:48 +00:00
eap
4e198a53df 22412: [CEA 1005] Impossible to have a logarithmic scalar bar when values <1e-07
Enable Logarithmic check box for small values
2013-11-20 08:13:41 +00:00
mpa
e2a638a026 - Modifing Geometry and Mesh Python scripts from SALOME 6 and before 2013-11-19 12:41:57 +00:00
mpa
98eacab61c - Modifing Geometry and Mesh Python scripts from SALOME 6 and before 2013-11-19 12:29:02 +00:00
mpa
9dcd09c6f5 - Modifing Geometry and Mesh Python scripts from SALOME 6 and before 2013-11-19 12:08:40 +00:00
mpa
47bdf12d63 - Modifing Geometry and Mesh Python scripts from SALOME 6 and before 2013-11-19 12:03:24 +00:00
eap
01fd947027 avoid FPE 2013-11-19 11:54:02 +00:00
eap
e57d64d391 Regression of SALOME_TESTS/Grids/smesh/bugs_03/D6
Improve the EventListener to clean all EDGEs of a complex side if one EDGE is cleaned
2013-11-18 16:51:16 +00:00
eap
a60773c9b3 In SetParametersByDefaults(), make myMinSize and myDeflection greater 2013-11-18 16:50:05 +00:00
eap
142df328f7 Regression SALOME_TESTS/Grids/smesh/3D_mesh_HEXA3D_00/C2
Fix isConcave()
2013-11-18 14:59:23 +00:00
eap
45b939fb48 Regression SALOME_TESTS/Grids/smesh/3D_mesh_HEXA3D_00/C2
Fix GetAngle() to take Orientation() of input edges as is and not
using GetSubShapeOri() which is wrong for the seam edge
2013-11-18 14:55:27 +00:00
eap
c789cfecef fix SIGFPE on too short EDGEs 2013-11-18 13:21:17 +00:00
eap
10e12cc117 fix SIGFPE on too short EDGEs 2013-11-18 12:35:16 +00:00
eap
68cf640188 do not add a reference to useCaseBuilder twice 2013-11-18 10:53:13 +00:00
eap
fc83dc7660 synchronize myBadMeshBtn and myBadMeshToGroupBtn 2013-11-18 10:27:22 +00:00