]>
SALOME platform Git repositories - modules/smesh.git/log
vsr [Fri, 12 Aug 2011 15:16:02 +0000 (15:16 +0000)]
Merge from V6_3_BR 12/08/2011
jfa [Fri, 12 Aug 2011 13:12:13 +0000 (13:12 +0000)]
Porting to OCCT6.5.1
rnv [Fri, 12 Aug 2011 11:22:08 +0000 (11:22 +0000)]
Win32 compilation.
rnv [Fri, 12 Aug 2011 08:21:18 +0000 (08:21 +0000)]
Win32 compilation.
rnv [Fri, 12 Aug 2011 08:18:03 +0000 (08:18 +0000)]
Fix for the bug "IPAL22690 time stamp popup is wrong after work in Mesh".
jfa [Thu, 11 Aug 2011 13:54:07 +0000 (13:54 +0000)]
Porting to OCCT6.5.1
eap [Thu, 11 Aug 2011 11:38:37 +0000 (11:38 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
make CGNS library an optional prerequisite
eap [Wed, 10 Aug 2011 12:49:49 +0000 (12:49 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
Fix ExportCGNS()
eap [Wed, 10 Aug 2011 12:49:26 +0000 (12:49 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
eap [Wed, 10 Aug 2011 10:33:38 +0000 (10:33 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
eap [Wed, 10 Aug 2011 10:29:41 +0000 (10:29 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ -I$(srcdir)/../SMESHDS \
eap [Wed, 10 Aug 2011 10:28:52 +0000 (10:28 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ SMESH::mesh_array* CreateMeshesFromCGNS( const char* theFileName,
+ SMESH::DriverMED_ReadStatus& theStatus )
eap [Wed, 10 Aug 2011 10:27:45 +0000 (10:27 +0000)]
In StringToFunctorType(), return FT_Undefined for an invalid input
eap [Wed, 10 Aug 2011 10:22:48 +0000 (10:22 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ -I$(srcdir)/../DriverCGNS \
+ -I$(srcdir)/../SMESHUtils \
eap [Wed, 10 Aug 2011 10:21:21 +0000 (10:21 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ -I$(srcdir)/../SMESHUtils \
eap [Wed, 10 Aug 2011 10:21:05 +0000 (10:21 +0000)]
strip trailing white spaces of the object name
eap [Wed, 10 Aug 2011 10:18:40 +0000 (10:18 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
Move general utils independent of SMESH data structures to SMESHUtils
eap [Wed, 10 Aug 2011 10:18:09 +0000 (10:18 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ SMESHUtils \
+ DriverCGNS \
eap [Wed, 10 Aug 2011 10:17:44 +0000 (10:17 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ SMESH_Group (SMESHDS_GroupBase* groupDS);
eap [Wed, 10 Aug 2011 10:17:29 +0000 (10:17 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
eap [Wed, 10 Aug 2011 10:14:20 +0000 (10:14 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
Remove stub files
- DriverUNV_R_SMESHDS_Mesh.cxx \
- DriverUNV_R_SMESHDS_Document.cxx \
- DriverUNV_W_SMESHDS_Document.cxx \
- DriverUNV_W_SMESHDS_Mesh.cxx \
eap [Wed, 10 Aug 2011 10:13:50 +0000 (10:13 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ -I$(srcdir)/../SMESHUtils \
eap [Wed, 10 Aug 2011 10:13:23 +0000 (10:13 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
Remove stub files
- DriverMED_R_SMDS_Mesh.cxx \
- DriverMED_R_SMESHDS_Document.cxx \
- DriverMED_W_SMDS_Mesh.cxx \
- DriverMED_W_SMESHDS_Document.cxx \
eap [Wed, 10 Aug 2011 10:12:00 +0000 (10:12 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
Remove stub files
- DriverDAT_R_SMESHDS_Mesh.cxx \
- DriverDAT_R_SMESHDS_Document.cxx \
- DriverDAT_W_SMDS_Mesh.cxx \
- DriverDAT_W_SMESHDS_Mesh.cxx \
- DriverDAT_W_SMESHDS_Document.cxx
eap [Wed, 10 Aug 2011 10:10:26 +0000 (10:10 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
eap [Wed, 10 Aug 2011 10:10:03 +0000 (10:10 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
Move SMESH_Controls.hxx from src/Controls to avoid mutual
dependency between SMESHDS and Controls
eap [Wed, 10 Aug 2011 10:09:22 +0000 (10:09 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ virtual void SetMeshName(const std::string& theMeshName);
+ virtual std::string GetMeshName() const;
+ Status addMessage(const std::string& msg, const bool isFatal=false);
eap [Wed, 10 Aug 2011 10:05:12 +0000 (10:05 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
more comments
eap [Wed, 10 Aug 2011 10:04:47 +0000 (10:04 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ // Groups. SMESHDS_Mesh is not an owner of groups
eap [Wed, 10 Aug 2011 10:04:00 +0000 (10:04 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
- virtual int Extent();
+ virtual int Extent() const;
eap [Wed, 10 Aug 2011 09:58:51 +0000 (09:58 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
Move SMESH_Controls.hxx from src/Controls to avoid mutual
dependency between SMESHDS and Controls
eap [Wed, 10 Aug 2011 09:56:47 +0000 (09:56 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
Fix setFace(): correctly take into account IsFaceExternal() for the polyhedron
eap [Wed, 10 Aug 2011 09:54:13 +0000 (09:54 +0000)]
0020511 : EDF 1101 SMESH : Add CGNS to Mesh Format Supported
+ inline SMDS_MeshInfo& operator=(const SMDS_MeshInfo& other);
eap [Wed, 10 Aug 2011 09:52:47 +0000 (09:52 +0000)]
use the hint when inserting into the std::set
eap [Wed, 10 Aug 2011 09:51:58 +0000 (09:51 +0000)]
typo
vsr [Tue, 9 Aug 2011 08:39:43 +0000 (08:39 +0000)]
0021343 : EDF 1930 SMESH: Huge memory occupation when assigning an hypothesis to a big model
vsr [Tue, 9 Aug 2011 07:46:44 +0000 (07:46 +0000)]
0021343 : EDF 1930 SMESH: Huge memory occupation when assigning an hypothesis to a big model
eap [Tue, 2 Aug 2011 09:35:37 +0000 (09:35 +0000)]
0021330 ]: EDF 1919 SMESH: Convert to quadratic gives wrong elements
if ( surface->IsUPeriodic() || surface->IsVPeriodic() ||
+ surface->IsUClosed() || surface->IsVClosed() )
gdd [Thu, 28 Jul 2011 16:50:48 +0000 (16:50 +0000)]
Add wrapper to .mesh export from BLSURFPLUGIN
eap [Thu, 28 Jul 2011 12:41:24 +0000 (12:41 +0000)]
0021337 : EDF 1924 NETGENPLUGIN: Mesh optimization
Restore "Optimize" parameter of 2D hyps removed by mistake
gdd [Wed, 27 Jul 2011 14:49:42 +0000 (14:49 +0000)]
Fix errors in Ghs3d example script
gdd [Tue, 26 Jul 2011 17:48:10 +0000 (17:48 +0000)]
Add PreCAD wrappers
gdd [Tue, 26 Jul 2011 17:18:04 +0000 (17:18 +0000)]
Add PreCAD
Update doc
Update smeshDC.py
gdd [Tue, 26 Jul 2011 09:02:17 +0000 (09:02 +0000)]
Check return value of Parameters() before setting values (BlSurf, GHS3D, GHS3DPRL)
vsr [Wed, 20 Jul 2011 10:16:19 +0000 (10:16 +0000)]
Fix problem with doxygen (using default font leads to the dot errors) - switch default dot font explicitly to Arial.
eap [Tue, 19 Jul 2011 12:57:51 +0000 (12:57 +0000)]
0021327 : EDF 1915 SMESH: impossible to select a group to copy mesh
trim white spaces at end of object name, else the object seems not selected
vsr [Tue, 19 Jul 2011 12:05:24 +0000 (12:05 +0000)]
Merge from V6_3_BR 19/07/2011
eap [Tue, 19 Jul 2011 11:27:02 +0000 (11:27 +0000)]
0021327 : EDF 1915 SMESH: impossible to select a group to copy mesh
trim white spaces at end of object name, else the object seems not selected
eap [Fri, 15 Jul 2011 14:55:38 +0000 (14:55 +0000)]
- $(CORBA_CXXFLAGS) \
- $(CORBA_INCLUDES) \
vsr [Fri, 15 Jul 2011 11:19:53 +0000 (11:19 +0000)]
Merge from V6_3_BR 15/07/2011
eap [Tue, 12 Jul 2011 11:25:45 +0000 (11:25 +0000)]
typo
eap [Mon, 11 Jul 2011 07:22:14 +0000 (07:22 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
fix selection/visualization mode at changing the group type
eap [Thu, 7 Jul 2011 15:27:29 +0000 (15:27 +0000)]
- -I$(srcdir)/../SMESHImpl \
- ../SMESH_I/libSMESHEngine.la \
eap [Thu, 7 Jul 2011 14:23:09 +0000 (14:23 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dumpfor the creation of groups
improve comment of getFunctNames()
eap [Thu, 7 Jul 2011 14:21:27 +0000 (14:21 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dumpfor the creation of groups
In FunctorTypeToString(), return "FT_Undefined" for an invalid input
eap [Tue, 5 Jul 2011 12:07:17 +0000 (12:07 +0000)]
0021271 : [CEA 473] Implement min size in netgen plugin
::SMESH_Hypothesis::TDefaults dflts;
+ dflts._shape = &shape;
eap [Tue, 5 Jul 2011 12:06:17 +0000 (12:06 +0000)]
0021271 : [CEA 473] Implement min size in netgen plugin
struct TDefaults
{
double _elemLength;
int _nbSegments;
+ TopoDS_Shape* _shape; // future shape of the mesh being created
};
eap [Tue, 5 Jul 2011 12:04:49 +0000 (12:04 +0000)]
restore "QuadranglePreference" hyp as it can be used by NETGEN 2D
together with "Max. Elemet Area" for example
eap [Tue, 5 Jul 2011 08:51:16 +0000 (08:51 +0000)]
0021271 : [CEA 473] Implement min size in netgen plugin
eap [Fri, 1 Jul 2011 15:45:09 +0000 (15:45 +0000)]
initialize the Curve Adaptor using range of the edge
eap [Tue, 28 Jun 2011 13:01:22 +0000 (13:01 +0000)]
Suppress some doxygen warnings
eap [Tue, 28 Jun 2011 13:00:19 +0000 (13:00 +0000)]
Create StdMeshers_QuadrangleParams hyp instead of "Quadrangle
preference" and "Triangle preference" obsolete hypotheses
eap [Tue, 28 Jun 2011 12:58:21 +0000 (12:58 +0000)]
Remove "Quadrangle preference" and "Triangle preference" obsolete hypotheses
eap [Tue, 28 Jun 2011 11:55:57 +0000 (11:55 +0000)]
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
eap [Tue, 28 Jun 2011 11:55:32 +0000 (11:55 +0000)]
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 //!< algo reports error but sub-mesh is computed anyway
eap [Tue, 28 Jun 2011 11:54:43 +0000 (11:54 +0000)]
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);
eap [Tue, 28 Jun 2011 11:53:37 +0000 (11:53 +0000)]
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);
eap [Tue, 28 Jun 2011 11:52:56 +0000 (11:52 +0000)]
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; }
eap [Mon, 27 Jun 2011 07:57:51 +0000 (07:57 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
fix bug of editing a not standalone group
eap [Fri, 24 Jun 2011 08:36:34 +0000 (08:36 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
icon for SMESH_GroupOnFilter
eap [Fri, 24 Jun 2011 06:53:07 +0000 (06:53 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
icon for SMESH_GroupOnFilter
eap [Thu, 23 Jun 2011 12:39:01 +0000 (12:39 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
To create/edit SMESH_GroupOnFilter
eap [Thu, 23 Jun 2011 12:38:38 +0000 (12:38 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
+ def GetFilterFromCriteria(self,criteria):
+ def GroupOnFilter(self, typ, name, filter):
eap [Thu, 23 Jun 2011 12:37:17 +0000 (12:37 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
Make groupType() return "SMESH_GroupOnFilter"
eap [Thu, 23 Jun 2011 12:36:03 +0000 (12:36 +0000)]
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);
eap [Thu, 23 Jun 2011 12:34:55 +0000 (12:34 +0000)]
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);
eap [Thu, 23 Jun 2011 12:34:17 +0000 (12:34 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
To edit SMESH_GroupOnFilter
eap [Thu, 23 Jun 2011 12:33:18 +0000 (12:33 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
+ interface SMESH_GroupOnFilter : SMESH_GroupBase
eap [Thu, 23 Jun 2011 12:32:53 +0000 (12:32 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
+ SMESH_GroupOnFilter CreateGroupFromFilter( in ElementType elemType,
+ in string name,
+ in SMESH::Filter filter )
eap [Thu, 23 Jun 2011 12:30:17 +0000 (12:30 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
+ SMESH::SMESH_GroupOnFilter_ptr CreateGroupFromFilter()
eap [Thu, 23 Jun 2011 12:29:23 +0000 (12:29 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
+class SMESH_GroupOnFilter_i:
eap [Thu, 23 Jun 2011 12:26:04 +0000 (12:26 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
Save and Load SMESH_GroupOnFilter
eap [Thu, 23 Jun 2011 12:25:04 +0000 (12:25 +0000)]
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);
eap [Thu, 23 Jun 2011 12:23:49 +0000 (12:23 +0000)]
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);
eap [Thu, 23 Jun 2011 12:20:30 +0000 (12:20 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
Fix dump of SMESH_IDSource which is Filter
eap [Thu, 23 Jun 2011 12:19:06 +0000 (12:19 +0000)]
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()
eap [Thu, 23 Jun 2011 12:15:16 +0000 (12:15 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
+class _pyGroup
+class _pyFilter
eap [Thu, 23 Jun 2011 12:14:05 +0000 (12:14 +0000)]
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();
eap [Thu, 23 Jun 2011 12:12:22 +0000 (12:12 +0000)]
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());
eap [Thu, 23 Jun 2011 12:11:40 +0000 (12:11 +0000)]
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());
eap [Thu, 23 Jun 2011 12:10:32 +0000 (12:10 +0000)]
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
eap [Thu, 23 Jun 2011 12:06:37 +0000 (12:06 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
+ SMESHDS_GroupOnFilter.cxx
eap [Thu, 23 Jun 2011 12:06:12 +0000 (12:06 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
+ SMESHDS_GroupOnFilter.cxx
+ -I$(srcdir)/../Controls
eap [Thu, 23 Jun 2011 12:05:43 +0000 (12:05 +0000)]
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);
eap [Thu, 23 Jun 2011 12:04:34 +0000 (12:04 +0000)]
0021014 : EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
- unsigned long GetMTime();
+ unsigned long GetMTime() const;
eap [Tue, 14 Jun 2011 14:19:21 +0000 (14:19 +0000)]
0020743 : EDF 1271 SMESH : Create a mesh from a group / export, FindElementByPoint() on groups
eap [Tue, 14 Jun 2011 14:10:39 +0000 (14:10 +0000)]
0020743 : EDF 1271 SMESH : Create a mesh from a group / export, FindElementByPoint() on groups
eap [Tue, 14 Jun 2011 14:10:15 +0000 (14:10 +0000)]
0020743 : EDF 1271 SMESH : Create a mesh from a group / FindElementByPoint() on groups
eap [Tue, 14 Jun 2011 14:10:01 +0000 (14:10 +0000)]
0020743 : EDF 1271 SMESH : Create a mesh from a group / export() on groups
eap [Tue, 14 Jun 2011 14:08:45 +0000 (14:08 +0000)]
0020743 : EDF 1271 SMESH : Create a mesh from a group / export() on groups
+ virtual int dim( int ) const;