Commit Graph

895 Commits

Author SHA1 Message Date
prascle
8fa039a796 merge from branch BR_SMDS_MEMIMP 29 nov 2010 2010-11-29 13:20:53 +00:00
vsr
dd21629a81 Merge from V5_1_main 26/11/2010 2010-11-26 15:48:22 +00:00
vsr
d8f644ca3d Merge from V5_1_main branch 24/11/2010 2010-11-25 12:44:43 +00:00
vsr
dd7baabfa1 0021063: [CEA 434] Compilation using gnu compiler v4.5 2010-11-11 13:02:20 +00:00
vsr
bd9123f5c8 Merge from V6_1_BR 07/09/2010 2010-09-07 14:19:57 +00:00
vsr
3a40107689 Merge from V5_1_main 10/06/2010 2010-06-10 09:43:07 +00:00
vsr
9357f5c870 Merge from V5_1_main 14/05/2010 2010-05-14 15:32:37 +00:00
eap
da57c65070 fix pb with GetName() in case of meshing imported 2D skin 2010-02-19 08:43:22 +00:00
dmv
7ca0689d93 0020701: Additional fix concerned to the GetName Method changes. 2010-02-18 11:28:58 +00:00
eap
a710674f83 020697: EDF 1248 SMESH: Sub-mesh on group of face not taken into account
* Correct adding geom groups into map of ansestors
2010-02-18 08:29:00 +00:00
eap
b3a24eca49 0020680: EDF 1252 SMESH: Bad cell created by Radial prism in center of torus
1) Try to build nodes using transformation before using block approach
2) workaround for wrong surface.Value(u,v) for UV near boundary of BSline surface
2010-02-17 14:59:19 +00:00
eap
0719fe6424 0020680: EDF 1252 SMESH: Bad cell created by Radial prism in center of torus
+  /*!
+   * \brief Return transformations to get coordinates of nodes of each internal layer
+   *        by nodes of the bottom. Layer is a set of nodes at a certain step
+   *        from bottom to top.
+   */
+  bool GetLayersTransformation(std::vector<gp_Trsf> & trsf) const;
2010-02-17 14:56:40 +00:00
eap
db9b76d342 1)
+    ## Defines "QuadrangleParams" hypothesis
+    #  @param vertex: vertex of a trilateral geometrical face, around which triangles
+    #                 will be created while other elements will be quadrangles.
+    #                 Vertex can be either a GEOM_Object or a vertex ID within the
+    #                 shape to mesh
+    #
+    def TriangleVertex(self, vertex, UseExisting=0):

2) in FixedPoints1D(), convert geom reversed edges into IDs
2010-02-17 14:54:30 +00:00
skl
e096680dda Changes for bug 0020681. 2010-02-16 11:07:53 +00:00
eap
ae8e36cc4a fix Save() and Load() 2010-02-16 09:32:14 +00:00
vsr
97a2f52e50 0020702: [CEA] Problem with Segment function of SMESH module
0020701: EDF SMESH : GetName Method of smeshDC.py
Additional fix
2010-02-16 09:20:56 +00:00
skl
68b6c38588 Changes for bug 0020681. 2010-02-16 09:19:59 +00:00
dmv
4bb95af61f 0020702: [CEA] Problem with Segment function of SMESH module 2010-02-15 09:35:36 +00:00
eap
3d1a536674 protect IndexToShape() from Standard_OutOfRange exception 2010-02-15 07:11:44 +00:00
eap
8d6ad56522 report error reasons in case of trilateral face 2010-02-12 14:27:33 +00:00
vsr
2029d91e2f Issue 20509: EDF 1065 OTHER : Add the Salome version in the header of the dump 2010-02-12 08:37:10 +00:00
eap
2cd3dfdd08 fix case of 2 edges 2010-02-12 08:15:06 +00:00
maintenance team
d7d3916c31 Fix compilation problem on Debian Sarge 2010-02-12 08:03:53 +00:00
eap
4e29225bc5 precise error message 2010-02-12 07:41:39 +00:00
vsr
8321c7460e Issue 0020701: EDF SMESH : GetName Method of smeshDC.py 2010-02-12 06:07:26 +00:00
eap
84dcc4efcf 0020693: EDF 1288 SMESH: Problem to recompute a mesh with a sub-mesh and a conversion linear-quadratic
* Add CheckNodeU()
* Compute parameters of created medium nodes even in force3d mode
* Leave doxygen-style comments of functions only in the header
2010-02-11 13:16:51 +00:00
dmv
9e7387ef24 0020631: EDF 1195 SMESH : Merge Node : Optional display of the nodes of the mesh 2010-02-11 12:08:34 +00:00
eap
13623edbcc 0020676: EDF 1212 GEOM: Partition operation creates vertices which causes mesh computation to fail with netgen
* Fix for internal edges
2010-02-11 08:26:40 +00:00
eap
7be9f329c4 0020676: EDF 1212 GEOM: Partition operation creates vertices which causes mesh computation to fail with netgen
* Fix GetOrderedEdges(): workaroud for BRepTools_WireExplorer, which return no edges if they are internal
2010-02-11 08:25:06 +00:00
eap
04efa6b9dc clear auxiliary data after Compute() 2010-02-10 07:36:45 +00:00
eap
2169f74278 0020682: EDF 1222 SMESH: 3D mesh from a skin mesh and with volumic cells
* Redesign in order to bind two pyramids to one base quadrangle.
 * Check presence of 3D elements sharing the base quadrangle.
2010-02-09 11:17:06 +00:00
eap
2536cb0c1b Make TNodeXYZ public, which together with SMDS_StdIterator allows getting coordinates of all nodes of mesh element in a couple of lines of code:
typedef SMDS_StdIterator< SMESH_MeshEditor::TNodeXYZ, SMDS_ElemIteratorPtr > TXyzIterator;
  vector<gp_Pnt> coords( TXyzIterator( elem->nodesIterator()), TXyzIterator() );



class SMESH_EXPORT SMESH_MeshEditor
{
public:
+  //------------------------------------------
+  /*!
+   * \brief SMDS_MeshNode -> gp_XYZ convertor
+   */
+  //------------------------------------------
+  struct TNodeXYZ : public gp_XYZ
2010-02-09 11:13:23 +00:00
eap
c8050ec0d5 + // std-like iteration on nodes
+  typedef SMDS_StdIterator< const SMDS_MeshNode*, SMDS_ElemIteratorPtr > iterator;
+  iterator begin_nodes() const { return iterator( nodesIterator() ); }
+  iterator end_nodes()   const { return iterator(); }
2010-02-09 11:03:51 +00:00
eap
1088385e70 const SMDS_MeshElement* next()
{
+    if ( !more() ) return 0;
2010-02-09 11:03:15 +00:00
eap
48378761b2 Add iterator, wrapper over SMDS_Iterator, adding std-like operators *, ++ etc
+	SMDS_StdIterator.hxx
2010-02-09 11:02:53 +00:00
eap
1fd762e26c - SMDS_MeshElement * MeshElement(int ID);
+  SMDS_MeshElement * MeshElement(int ID) const;
2010-02-09 07:02:21 +00:00
eap
b90c9d785d Write nodes in the order of increasing ids
-      SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator();
+      SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(/*idInceasingOrder=*/true);
2010-02-08 14:39:14 +00:00
eap
509187908d Add an utility to iterate on nodes in the order of increasing ids
-  SMDS_NodeIteratorPtr nodesIterator() const;
+  SMDS_NodeIteratorPtr nodesIterator(bool idInceasingOrder=false) const;
2010-02-08 14:38:03 +00:00
vsr
d06764f347 0020691: EDF SMESH : Export STL always in binary 2010-02-08 11:22:48 +00:00
maintenance team
8abff026bc import salome 2010-02-08 10:28:23 +00:00
eap
172b75f1d3 follow modif for IPAL21558 (In Group creation dialog, selection of sub-shapes in OB, viewer and dialog is not well syncronized)
-  virtual void            processOwner( const LightApp_DataOwner* );
+  virtual bool            processOwner( const LightApp_DataOwner* );
2010-02-08 07:14:33 +00:00
eap
a3b1bac8a0 020674: EDF 870 SMESH: Mesh generated by Netgen not usable by GHS3D
* Rename HasDegenenaratedEdges() -> HasDegeneratedEdges()
2010-02-01 14:26:09 +00:00
eap
696fa5df7f 020674: EDF 870 SMESH: Mesh generated by Netgen not usable by GHS3D
+   * \brief Check if the shape set through IsQuadraticSubMesh() or SetSubShape()
+   *        has a degenerated edges
+    * \retval bool - true if it has
+   */
+  bool HasDegenenaratedEdges() const { return !myDegenShapeIds.empty(); }
2010-02-01 14:19:06 +00:00
eap
2998fad1e1 minor change 2010-02-01 13:30:15 +00:00
eap
8d2789db83 020674: EDF 870 SMESH: Mesh generated by Netgen not usable by GHS3D
avoid creating degenetrated faces
2010-02-01 13:29:23 +00:00
eap
d7c779851c fix comment 2010-02-01 13:28:11 +00:00
eap
0cadad987c 0019296: EDF 681 SMESH - Pre-evaluation of the number of elements before mesh
* Evaluate():
  ** do not read from out of vector range
  ** report error if algo->Evaluate() returns negative number
2010-02-01 11:12:17 +00:00
eap
8d99b0dffe 0019296: EDF 681 SMESH - Pre-evaluation of the number of elements before mesh
* Evaluate(): do not call algo->Evaluate() if needed submeshes failed to evaluate
2010-02-01 11:09:38 +00:00
nge
cbc21f731e Revert last modification 2010-01-27 14:22:19 +00:00
nge
a2f5fa75bd Add missing import StdMeshers 2010-01-27 13:43:29 +00:00
nge
a63ab6b7e1 import salome missing on some scripts 2010-01-27 11:08:25 +00:00
eap
8726d7811f 0019296: EDF 681 SMESH - Pre-evaluation of the number of elements before mesh
Assure that this submesh is evaluated once
2010-01-27 10:09:15 +00:00
gdd
f3ede5f066 Small correction 2010-01-23 09:00:59 +00:00
eap
4104f26589 0020431: EDF 1020 SMESH : Radial Mesh of a cylinder
* Algorith behavior has changed - default hyps have appeared
2010-01-22 11:38:25 +00:00
eap
fd1dc99bb5 shorten code 2010-01-22 11:37:48 +00:00
eap
188c7b742c unused variables 2010-01-22 11:36:53 +00:00
eap
9a6c1bd34d 0020431: EDF 1020 SMESH : Radial Mesh of a cylinder
* Learn Quadrangle() create Mesh_RadialQuadrangle1D2D algo

+QUARDANGLE = 0
+RADIAL_QUAD = 1
2010-01-22 11:36:02 +00:00
eap
035f2b519d - if ( theNbSegments )
+  if ( theNbSegments > 0 )
     myGen.SetDefaultNbSegments( int(theNbSegments) );
   else
     THROW_SALOME_CORBA_EXCEPTION( "non-positive number of segments", SALOME::BAD_PARAM );
2010-01-22 11:34:11 +00:00
eap
890d47aa59 0020431: EDF 1020 SMESH : Radial Mesh of a cylinder
* Fix conversion of LayerDistribution hypothesis
2010-01-22 11:33:35 +00:00
eap
c6fb8166df - <translation>Geomerty mismatches algorithm's expectation</translation>
+            <translation>Geomerty mismatches algorithm's expectation\nCheck algorithm documentation for supported geometry</translation>
2010-01-22 11:31:20 +00:00
eap
982b910458 0020431: EDF 1020 SMESH : Radial Mesh of a cylinder
+  virtual bool operator==(const SMESHDS_Hypothesis& other) const;
+  bool operator!=(const SMESHDS_Hypothesis& other) const { return !(*this==other); }
2010-01-22 11:30:28 +00:00
eap
6462277df0 shorten code 2010-01-22 11:29:51 +00:00
maintenance team
909e9e40a7 *** empty log message *** 2010-01-21 09:18:32 +00:00
ouv
084d5228ee Issue 0020657: EDF 1244 SMESH: Bad display of tetras 2010-01-20 15:24:23 +00:00
eap
0862b12810 1) + // RadialQuadrangle_1D2D ----------
2) fix _pyLayerDistributionHypo: move some code from Process() to Flush()
2010-01-20 11:03:16 +00:00
eap
9f57d8b5e9 initialize _nbSegments 2010-01-20 08:31:14 +00:00
dmv
7a8e3a50af Unstable warning in release mode, on creating radialQuadrangle1D2D meshes. 2010-01-12 15:34:12 +00:00
dmv
06f0c4f62f correct debug messages 2010-01-12 15:32:37 +00:00
eap
65197a8515 - myHelpFileName = "mesh_through_point_page.html";
+  myHelpFileName = "find_element_by_point_page.html";
2010-01-12 13:18:05 +00:00
dmv
85d94c3b51 0020635: EDF 1223 SMESH: Error message of RadialQuadrangle algorithm not precise 2010-01-12 08:07:50 +00:00
dmv
d316b3a623 0020635: EDF 1223 SMESH: Error message of RadialQuadrangle algorithm not precise 2010-01-11 15:14:52 +00:00
ouv
3334ebae06 Issue 0020638: EDF 1225 SMESH: Missing options in Color/Size menu 2010-01-11 13:30:06 +00:00
ouv
6c4be33671 Issue 0020514: EDF 1110 SMESH : Export many meshes in one Med File 2010-01-11 07:17:11 +00:00
ouv
238796e3d8 Additional fix for issue 0020614: EDF 1133 SMESH : Put new added elements and nodes to group 2009-12-29 11:09:37 +00:00
ouv
4863327169 Fix of issue 0020614: EDF 1133 SMESH : Put new added elements and nodes to group 2009-12-28 16:23:43 +00:00
eap
163dc9b8fd 0020028: EDF 842 SMESH : Can't export to med a mesh with same names
for one group of nodes and one group of faces

avoid duplicated group names within one type of elements only
2009-12-25 11:22:10 +00:00
skl
72982ad122 Changes for bug 18911 from Mantis. 2009-12-22 10:04:35 +00:00
dmv
313bdfc1c7 0020623: EDF 1209 SMESH: Load script/execfile add the objects in the wrong study 2009-12-21 14:26:43 +00:00
eap
0c1e7c3900 0020623: EDF 1209 SMESH: Load script/execfile add the objects in the wrong study
set current study to SMESH_Gen
2009-12-21 08:24:08 +00:00
dmv
31873e6e23 in frame of 0020622: EDF 1194 SMESH: Merge nodes or elements 2009-12-18 13:14:54 +00:00
eap
e6e7b52bbf 0020618: EDF 1208 SMESH: problems with DoubleNodeElemGroup*InRegion
1) fix finding element center in isInside()
    2) add classifying on TopoDS_FAce
2009-12-18 10:36:52 +00:00
eap
4bbc67fbbe def DoubleNodeElemGroupInRegion(self, theElems, theNodesNot, theShape):
0020617: EDF 1207 SMESH: DoubleNode*: impossible to duplicate edges in a 3D mesh

     def DoubleNodeElemGroupInRegion(self, theElems, theNodesNot, theShape):
-        return self.editor.DoubleNodeElemGroup(theElems, theNodesNot, theShape)
+        return self.editor.DoubleNodeElemGroupInRegion(theElems, theNodesNot, theShape)
2009-12-17 10:28:57 +00:00
eap
370232fd98 0020139: EDF 944 SMESH : Get 2D/3D element with X, Y, Z coordinates
-            <translation>Find element by point</translation>
+            <translation>Find Element by Point</translation>

+        <message>
+            <source>TOP_FIND_ELEM</source>
+            <translation>Find Element by Point</translation>
+        </message>
2009-12-16 08:29:08 +00:00
eap
339e2f0051 0020139: EDF 944 SMESH : Get 2D/3D element with X, Y, Z coordinates
fix isOut()
2009-12-16 08:27:50 +00:00
dmv
e0589e63e6 0020615: EDF 1206 SMESH: Smesh group edition and object browser highlight 2009-12-15 08:57:13 +00:00
nge
5052f7f43b Remove unwanted space in the documentation comment of DoubleNodes method which prevented the documentation to be generated correctly. 2009-12-14 16:35:09 +00:00
eap
bcb8d2c754 cosmetic changes 2009-12-14 09:26:16 +00:00
eap
e7952c1e1e 0020427: EDF 868 SMESH : Be able to define the submeshing order
fix SortByMeshOrder(), forgot to increment iterator
2009-12-14 09:23:56 +00:00
vsr
bf9d590cda Integrate patch from G.David (for vtk 5.2 and newer) 2009-12-11 16:29:49 +00:00
eap
f1bc3e4413 0020605: EDF 1190 SMESH: Display performance. 80 seconds for 52000 cells.
set IsEmbeddedMode() in costructor
2009-12-11 10:43:31 +00:00
dmv
45d6a73f64 Bug IPAL21396 Quadrangle parameters Hypothesis Construction. 2009-12-11 07:14:33 +00:00
eap
5e7f07d3da untabify 2009-12-10 14:52:59 +00:00
eap
f2c45dcff7 0020427: EDF 868 SMESH : Be able to define the submeshing order
fix SortByMeshOrder(), which replaces a submesh of lower priority
  by one of higher priority even if the last one is not in
  theListToSort
2009-12-10 09:55:48 +00:00
vsr
b03a1e6001 Merge from BR_phase16 branch (09/12/09) 2009-12-09 15:46:26 +00:00
vsr
2daa321efa Merge from V5_1_3_BR branch (07/12/09) 2009-12-08 13:11:42 +00:00
dmv
2ed875d56d IPAL21493 Incorrect behaviour of Computation, Evaluation succeed dialog boxes in consecutive operations. 2009-12-03 12:31:27 +00:00
vsr
7ee78f2e75 Move GeomSelectionTools from BLSURF module to SMESH 2009-11-23 14:46:21 +00:00
eap
37d36cd6fc 0020139: EDF 944 SMESH : Get 2D/3D element with X, Y, Z coordinates
+	SMESHGUI_FindElemByPointDlg.cxx \
2009-11-11 15:10:07 +00:00
eap
388cb7d58d 0020139: EDF 944 SMESH : Get 2D/3D element with X, Y, Z coordinates
fix isOut()
2009-11-11 14:58:39 +00:00
dmv
f314777950 correct previous integration (Porting to Python 2.6) 2009-10-12 13:47:12 +00:00