ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-19 04:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity
1,350 Commits 381 Branches 499 Tags 104 MiB
d566947c69
Commit Graph

1159 Commits

Author SHA1 Message Date
eap
ce5494a2c1 Suppress some doxygen warnings 2011-06-28 13:01:22 +00:00
eap
d8c160ee27 Create StdMeshers_QuadrangleParams hyp instead of "Quadrangle 
preference" and "Triangle preference" obsolete hypotheses
 2011-06-28 13:00:19 +00:00
eap
c58c3faf74 Remove "Quadrangle preference" and "Triangle preference" obsolete hypotheses 2011-06-28 12:58:21 +00:00
eap
eec523867a IPAL22173 TC6.2.0: "Netgen1D-2D" algorithm doesn't work on "flight_solid.brep" 
Treate a case where a valid mesh is computed anyhow while the algo reports errors
 2011-06-28 11:55:57 +00:00
eap
0650af74ab IPAL22173 TC6.2.0: "Netgen1D-2D" algorithm doesn't work on "flight_solid.brep" 
1) Treate a case where a valid mesh is computed anyhow while the algo reports errors
    2) Remove unused
-  bool ApplyToCollection (SMESH_Algo*         theAlgo,
-                          const TopoDS_Shape& theCollection);
 2011-06-28 11:54:43 +00:00
eap
3eefc085d8 IPAL22173 TC6.2.0: "Netgen1D-2D" algorithm doesn't work on "flight_solid.brep" 
Treate a case where a valid mesh is computed anyhow while the algo reports errors

+  enum EMeshError { MEr_OK = 0, MEr_HOLES, MEr_BAD_ORI, MEr_EMPTY };
+
+  /*!
+   * \brief Finds topological errors of a sub-mesh
+   */
+  static EMeshError GetMeshError(SMESH_subMesh* subMesh);
 2011-06-28 11:53:37 +00:00
eap
454d871477 IPAL22173 TC6.2.0: "Netgen1D-2D" algorithm doesn't work on "flight_solid.brep" 
Treate a case where a valid mesh is computed anyhow while the algo reports errors

+  COMPERR_WARNING        = -10  //!< algo reports error but sub-mesh is computed anyway

+  bool IsKO()     { return myName != COMPERR_OK && myName != COMPERR_WARNING; }
 2011-06-28 11:52:56 +00:00
eap
c5438eec06 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
fix bug of editing a not standalone group
 2011-06-27 07:57:51 +00:00
eap
a6fa2d8561 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
icon for SMESH_GroupOnFilter
 2011-06-24 08:36:34 +00:00
eap
ca0e6f7ceb 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
icon for SMESH_GroupOnFilter
 2011-06-24 06:53:07 +00:00
eap
066bcc3471 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
To create/edit SMESH_GroupOnFilter
 2011-06-23 12:39:01 +00:00
eap
d0b3f328a8 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
+    def GetFilterFromCriteria(self,criteria):
+    def GroupOnFilter(self, typ, name, filter):
 2011-06-23 12:38:38 +00:00
eap
00d6e38575 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
Make groupType() return "SMESH_GroupOnFilter"
 2011-06-23 12:37:17 +00:00
eap
74a4f1012d 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
1) make 'Mesh' be a default 'Source'
2)
+  SMESH::Filter_var         GetFilter() const;
+  void                      SetFilter(SMESH::Filter_var filter, int type);
 2011-06-23 12:36:03 +00:00
eap
03ccec76c7 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
+  SMESH::Filter_var         GetFilter() const;
+  void                      SetFilter(SMESH::Filter_var filter, int type);
 2011-06-23 12:34:55 +00:00
eap
cb376aa1de 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
To edit SMESH_GroupOnFilter
 2011-06-23 12:34:17 +00:00
eap
bd284fc142 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
+  SMESH::SMESH_GroupOnFilter_ptr CreateGroupFromFilter()
 2011-06-23 12:30:17 +00:00
eap
fa0176f072 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
+class SMESH_GroupOnFilter_i:
 2011-06-23 12:29:23 +00:00
eap
41ea31ca86 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
Save and Load SMESH_GroupOnFilter
 2011-06-23 12:26:04 +00:00
eap
a39a0e1f84 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
1) fix dump of Filter_i::SetCriteria()
2)
+    void Filter_i::AddWaiter( TPredicateChangeWaiter* waiter );
+    void Filter_i::RemoveWaiter( TPredicateChangeWaiter* waiter );
3)
+  const char*        SMESH::FunctorTypeToString(SMESH::FunctorType ft);
+  SMESH::FunctorType SMESH::StringToFunctorType(const char*       str);
 2011-06-23 12:25:04 +00:00
eap
fe2d0f0f5c 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
class Filter_i
   {
+    struct TPredicateChangeWaiter
+    {
+      virtual void PredicateChanged() = 0;
+    };
+    void AddWaiter( TPredicateChangeWaiter* waiter );
+    void RemoveWaiter( TPredicateChangeWaiter* waiter );

+    std::list<TPredicateChangeWaiter*> myWaiters;


+  const char*        FunctorTypeToString(SMESH::FunctorType ft);
+  SMESH::FunctorType StringToFunctorType(const char*       str);
 2011-06-23 12:23:49 +00:00
eap
56793b53d1 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
Fix dump of SMESH_IDSource which is Filter
 2011-06-23 12:20:30 +00:00
eap
b3cba8f4fd 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
1) convert SMESH.Filter.Criterion() to GetCriterion()
2)
+_pyGroup::Process()
+_pyFilter::Process()
 2011-06-23 12:19:06 +00:00
eap
c31705d887 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
+class _pyGroup
+class _pyFilter
 2011-06-23 12:15:16 +00:00
eap
00b26b695f 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
To remove sub-filters if necessary

-  SMESH_LogicalFilter( const QList<SUIT_SelectionFilter*>&, const int );
+  SMESH_LogicalFilter( const QList<SUIT_SelectionFilter*>&, const int, bool takeOwnership=false );

 private:
+  void                          deleteFilters();
 2011-06-23 12:14:05 +00:00
eap
b21414354c 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
SMESH_Group* AddGroup (const SMDSAbs_ElementType theType,
                          const char*               theName,
                          int&                      theId,
                          const TopoDS_Shape&       theShape=TopoDS_Shape(),
+                         const SMESH_PredicatePtr& thePredicate=SMESH_PredicatePtr());
 2011-06-23 12:12:22 +00:00
eap
f1c62974f6 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
SMESH_Group (int                       theID,
               const SMESH_Mesh*         theMesh,
               const SMDSAbs_ElementType theType,
               const char*               theName,
               const TopoDS_Shape&       theShape = TopoDS_Shape(),
+              const SMESH_PredicatePtr& thePredicate = SMESH_PredicatePtr());
 2011-06-23 12:11:40 +00:00
eap
d73cacdd51 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
Move definition of abstract classes Functor and Predicate from
   SMESH_ControlsDef.hxx to SMESH_Controls.hxx
 2011-06-23 12:10:32 +00:00
eap
ec36250a0d 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
+	SMESHDS_GroupOnFilter.cxx
 2011-06-23 12:06:37 +00:00
eap
ac5729075f 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
+	SMESHDS_GroupOnFilter.cxx

+	-I$(srcdir)/../Controls
 2011-06-23 12:06:12 +00:00
eap
77d9e5ae72 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
-  int GetID (const int theIndex);
+  virtual int GetID (const int theIndex);
 2011-06-23 12:05:43 +00:00
eap
e92088a576 0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups 
-  unsigned long GetMTime();
+  unsigned long GetMTime() const;
 2011-06-23 12:04:34 +00:00
eap
70aa7fe704 0020743: EDF 1271 SMESH : Create a mesh from a group / export, FindElementByPoint() on groups 2011-06-14 14:10:39 +00:00
eap
d502285de5 0020743: EDF 1271 SMESH : Create a mesh from a group / FindElementByPoint() on groups 2011-06-14 14:10:15 +00:00
eap
105bb4233f 0020743: EDF 1271 SMESH : Create a mesh from a group / export() on groups 2011-06-14 14:10:01 +00:00
eap
89c40c21f3 0020743: EDF 1271 SMESH : Create a mesh from a group / export() on groups 
+  virtual int             dim( int ) const;
 2011-06-14 14:08:45 +00:00
eap
a18ad2978f 0020743: EDF 1271 SMESH : Create a mesh from a group 
export, FindElementByPoint() on groups
 2011-06-14 13:58:29 +00:00
eap
d8c39ff840 0020743: EDF 1271 SMESH : Create a mesh from a group / export,FindElementByPoint() groups 
1) convert
+  { // ExportPartTo*(part, ...) -> Export*(..., part)

+  // FindAmongElementsByPoint(meshPart, x, y, z, elementType) ->
+  // FindElementsByPoint(x, y, z, elementType, meshPart)

  2) make _pyCommand::GetArg() work with any compex arg like list, tuple etc
 2011-06-14 13:57:24 +00:00
eap
4fcec244fd + case ELEM0D:myStream<<"ELEM0D";break; 2011-06-14 13:54:50 +00:00
eap
7d0549090a 0020743: EDF 1271 SMESH : Create a mesh from a group / FindElementByPoint() groups 
+  /*!
+   * Searching among the given elements, return elements of given type
+   * where the given point is IN or ON.
+   * 'ALL' type means elements of any type excluding nodes
+   */
+  SMESH::long_array* FindAmongElementsByPoint(SMESH::SMESH_IDSource_ptr elements,
+                                              CORBA::Double             x,
+                                              CORBA::Double             y,
+                                              CORBA::Double             z,
+                                              SMESH::ElementType        type);
 2011-06-14 13:54:32 +00:00
eap
9012a64442 0020743: EDF 1271 SMESH : Create a mesh from a group / export groups 
+  void ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
+                       const char*               file,
+                       CORBA::Boolean            auto_groups,
+                       SMESH::MED_VERSION        version,
+                       CORBA::Boolean            overwrite) throw (SALOME::SALOME_Exception);
+  void ExportPartToDAT(SMESH::SMESH_IDSource_ptr meshPart,
+                       const char*               file) throw (SALOME::SALOME_Exception);
+  void ExportPartToUNV(SMESH::SMESH_IDSource_ptr meshPart,
+                       const char*               file) throw (SALOME::SALOME_Exception);
+  void ExportPartToSTL(SMESH::SMESH_IDSource_ptr meshPart,
+                       const char*               file,
+                       CORBA::Boolean            isascii) throw (SALOME::SALOME_Exception);
 2011-06-14 13:53:16 +00:00
eap
eb57bc9623 improve comments 2011-06-14 13:51:55 +00:00
eap
00fdc117cd 0020743: EDF 1271 SMESH : Create a mesh from a group / export groups 
void ExportMED(const char *file,
                  const char* theMeshName = NULL,
                  bool theAutoGroups = true,
-                 int theVersion = 0)
+                 int theVersion = 0,
+                 const SMESHDS_Mesh* meshPart = 0)
 2011-06-14 13:51:27 +00:00
eap
77b26c3006 0020743: EDF 1271 SMESH : Create a mesh from a group / export groups 
+protected:
+  inline void addWithPoly(const SMDS_MeshElement* el);
 2011-06-14 13:50:26 +00:00
eap
c9ccfc74e0 0020743: EDF 1271 SMESH : Create a mesh from a group / FindElementByPoint() on groups 
+        int Tic() const { return myTic; }
+        int                                     myTic; // to track changes
 2011-06-14 13:49:51 +00:00
eap
6a77e2f847 0020743: EDF 1271 SMESH : Create a mesh from a group / export groups 
make virtual methods returning iterators on elements
 2011-06-14 13:49:08 +00:00
vsr
2c607013a2 Merge from V6_3_BR 06/06/2011 2011-06-06 08:15:39 +00:00
gdd
7191b0d735 Replace oe by ? 2011-05-11 20:41:37 +00:00
ouv
eaefb3fa06 Minor changes (untabify). 2011-04-18 09:59:35 +00:00
ouv
344fb98e28 Note 0010812 from the issue 0020999: EDF 1575 SMESH: Filters and precision preferences 2011-04-18 09:09:24 +00:00
eap
944af78798 Restore support of med-2.1 in MEDWrapper 2011-04-15 09:31:45 +00:00
gdd
3206fe9668 Small update for French translation 2011-04-14 12:42:52 +00:00
gdd
a66401aeb6 rnc : correction from Anthony Geay for a problem with medfiles when containing 0D elements 2011-04-14 12:08:29 +00:00
rnv
e079b751f3 RNV: Fix bug of the editing "Source Faces" hypo: Groups list is empty when editing hypothesis. 2011-04-13 08:03:11 +00:00
prascle
b05c8c76a5 PR: mistake 2011-04-12 17:09:41 +00:00
rnv
2290c49819 1) Fix for the issue "21220: EDF SMESH: Split into tetra from group does not work" 
2) Change mechanism of the adding items in the QListWidget.
 2011-04-12 12:28:40 +00:00
prascle
b9db0238dc PR: add an independant exe that cuts a tetra mesh by a plane. MeshCut is adpated from EDF project XMESHLAB and works with MED files. 2011-04-12 11:24:20 +00:00
rnv
022168f9e6 Fix for the "21222: SMESH EDF: Impossible to set a threshold value in the filter dialog" issue. 2011-04-11 12:42:27 +00:00
gdd
2d50f1341e rnc : gived some details about ExtrusionSweepObjectXD in documentation 2011-04-11 09:06:11 +00:00
eap
33459aac4f med-2.1 file no longer supported 2011-04-11 07:50:58 +00:00
gdd
f335dddadb Update French Translations 2011-04-08 15:29:33 +00:00
eap
ecdd9a6194 - ExportToMEDX(file,auto_groups,SMESH::MED_V2_1,true); 
+  ExportToMEDX(file,auto_groups,SMESH::MED_V2_2,true);
 2011-04-08 08:43:48 +00:00
eap
513e407ce6 comment off not used 
static bool sameGroupType()
 2011-04-08 08:43:30 +00:00
vsr
790c5cfa90 Merge from PortingMED3 07Apr11 2011-04-07 11:53:43 +00:00
eap
ffc4f7e618 0021218: EDF 1832 SMESH: Regression when computing a mesh 
fix FindFaceAssociation() using UV
 2011-04-06 11:06:53 +00:00
rnv
52a2be7aea Implementation "21042: EDF 1600 ALL: Rename objects in the OB" issue. 2011-04-05 09:25:26 +00:00
prascle
ecea4040f1 PR: create flat elements on face groups (ASTER calculations) 2011-03-30 15:48:07 +00:00
ouv
5f35b29326 Issue 0013373: EDF PAL 273 : Option Single/Multi file dump 2011-03-29 07:37:38 +00:00
prascle
4ac8d07584 PR: DoubleNodesOnGroupBoundaries in progress 2011-03-28 14:46:16 +00:00
eap
9e3ba593d5 0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh 
fix a bug found by Renaud (note 0010641)
 2011-03-28 12:22:53 +00:00
gdd
c09e9f7015 rnc: Added a missing translation 2011-03-28 11:54:53 +00:00
ouv
36afbbe8e3 Issue 0021055: EDF 1602 STUDY: Object browser reactualisation when creating an object 2011-03-25 15:25:16 +00:00
barate
7a6a25502e Fixed compilation without .la files from other modules 2011-03-25 14:33:52 +00:00
vsr
14c60ac03b Merge from BR_WIN_INDUS_514 branch 21/03/2011 (Windows industrialization) 2011-03-21 15:23:28 +00:00
vsr
a593ecab98 Fix compilation error on gcc 4.2 2011-03-21 15:12:11 +00:00
rnv
77270c3d82 Small correction for the "21056: EDF 1608 SMESH: Dialog Box "Create Sub Mesh": focus should automatically switch to geometry" issue. 2011-03-21 13:02:22 +00:00
eap
cb561f9569 Fix idSourceToNodeSet() for the case of mesh with free nodes 2011-03-21 10:19:55 +00:00
rnv
81dcf37720 Implementation of the "21056: EDF 1608 SMESH: Dialog Box "Create Sub Mesh": focus should automatically switch to geometry" issue. 2011-03-21 08:17:32 +00:00
adam
0f635a43a3 EA: Fix compilation with gcc-4.5.2 2011-03-19 22:21:45 +00:00
prascle
9f36bbc95a PR: double nodes and flat elements for ASTER calculations in progress 2011-03-19 06:55:48 +00:00
adam
c4bd4ff43b Implement Cancel Compute (end) 2011-03-17 09:53:14 +00:00
adam
911977bc89 Implement Cancel Compute (begin) 2011-03-17 08:53:25 +00:00
adam
5142df035d Implement Cancel Compute (begin) 2011-03-17 08:40:57 +00:00
eap
d992d85973 0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh 2011-03-16 15:41:27 +00:00
eap
cfcd4f3b74 0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh 
+    def ConvertToQuadratic(self, theForce3d, theSubMesh=None):
+    def ConvertFromQuadratic(self, theSubMesh=None):
 2011-03-16 15:39:18 +00:00
eap
8b06eac8bd 0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh 
class SMESH_MeshEditor_i
{
+  void ConvertToQuadraticObject(CORBA::Boolean            theForce3d,
+                                SMESH::SMESH_IDSource_ptr theObject)
+  void ConvertFromQuadraticObject(SMESH::SMESH_IDSource_ptr theObject)
 2011-03-16 15:38:32 +00:00
eap
77e2a3970b 0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh 
+  void AddTLinks(const SMDS_MeshEdge*   edge);
+  void AddTLinks(const SMDS_MeshFace*   face);
+  void AddTLinks(const SMDS_MeshVolume* vol);
 2011-03-16 15:36:40 +00:00
eap
59fe802c13 0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh 
+  void ConvertToQuadratic(const bool theForce3d, TIDSortedElemSet& theElements);
+  void ConvertFromQuadratic(TIDSortedElemSet& theElements);
 2011-03-16 15:36:15 +00:00
eap
098d6b0723 0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh 
fix the problem with adding elements (elements are not added) after
  {elems removal + addition of elements with specified IDs}:
  1) add elems with IDs 1,2,3
  2) remove elem 1 (1 stored in the pool )
  3) add elem with id 1 (1 remains in the pool)
  4) add elem with no id specified -> not added as GetFreeID() returns
     1 which is already occupied

+  virtual int GetFreeID();
 2011-03-16 15:35:00 +00:00
prascle
fcae5eda64 PR: double nodes and flat elements for ASTER calculations in progress 2011-03-16 10:51:52 +00:00
gdd
396e119df0 rnc: unset minimum size of generic hypothesis window in SMESH_GUI hypothesis, so that the minimum sizes set independently in each hypothesis window are now taken into account 2011-03-16 10:36:43 +00:00
prascle
f2dd0cac12 PR: double nodes and flat elements for ASTER calculations in progress 2011-03-15 08:29:06 +00:00
prascle
527af438cd PR: double nodes and flat elements for ASTER calculations in progress 2011-03-14 17:01:56 +00:00
eap
c7177e7a38 in createGroup(), make a unique name if no name is provided 2011-03-14 10:28:54 +00:00
eap
8fd9904246 0021177: EDF 1563 SMESH: Preview of mesh during a modification 
fix layout: set "Generate groups" near "Copy Elements"
 2011-03-14 09:48:51 +00:00
eap
3ce08c8e48 0021177: EDF 1563 SMESH: Preview of mesh during a modification 
set scale near other similar transformations
 2011-03-14 09:47:15 +00:00
eap
a2db5e7c30 0021177: EDF 1563 SMESH: Preview of mesh during a modification 
to add adjacent elements to preview only when move nodes in this mesh
 2011-03-14 08:33:11 +00:00
prascle
bdfc51bda9 PR: double nodes and flat elements for ASTER calculations in progress 2011-03-12 15:07:47 +00:00
eap
7b0ac035d6 0021177: EDF 1563 SMESH: Preview of mesh during a modification 
add to preview elements sharing nodes moved by transformation
 2011-03-11 16:48:31 +00:00
eap
f27d39d23d 0021177: EDF 1563 SMESH: Preview of mesh during a modification 
update preview when action changes ( move <-> copy )
 2011-03-11 16:46:37 +00:00