vsr
39f36db219
Merge from V6_3_BR 19/07/2011
2011-07-19 12:05:24 +00:00
eap
191bcced1c
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
2011-07-19 11:27:02 +00:00
eap
d3d686d410
- $(CORBA_CXXFLAGS) \
...
- $(CORBA_INCLUDES) \
2011-07-15 14:55:38 +00:00
vsr
91c92cb543
Merge from V6_3_BR 15/07/2011
2011-07-15 11:19:53 +00:00
eap
244cad68dd
typo
2011-07-12 11:25:45 +00:00
eap
34fc026192
0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
...
fix selection/visualization mode at changing the group type
2011-07-11 07:22:14 +00:00
eap
e6c056f8c0
- -I$(srcdir)/../SMESHImpl \
...
- ../SMESH_I/libSMESHEngine.la \
2011-07-07 15:27:29 +00:00
eap
41cf70d768
0021014: EDF 1583 SMESH: Improvement of the Python Dumpfor the creation of groups
...
improve comment of getFunctNames()
2011-07-07 14:23:09 +00:00
eap
6263d10065
0021014: EDF 1583 SMESH: Improvement of the Python Dumpfor the creation of groups
...
In FunctorTypeToString(), return "FT_Undefined" for an invalid input
2011-07-07 14:21:27 +00:00
eap
974453b6c1
0021271: [CEA 473] Implement min size in netgen plugin
...
::SMESH_Hypothesis::TDefaults dflts;
+ dflts._shape = &shape;
2011-07-05 12:07:17 +00:00
eap
fa4bd0dfc4
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
};
2011-07-05 12:06:17 +00:00
eap
2ef67f753e
restore "QuadranglePreference" hyp as it can be used by NETGEN 2D
...
together with "Max. Elemet Area" for example
2011-07-05 12:04:49 +00:00
eap
50c956e8c2
0021271: [CEA 473] Implement min size in netgen plugin
2011-07-05 08:51:16 +00:00
eap
b6fe67a04f
initialize the Curve Adaptor using range of the edge
2011-07-01 15:45:09 +00:00
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
49b0d94452
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
2011-06-28 11:55:32 +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
5e4bdb2eed
0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups
...
+ interface SMESH_GroupOnFilter : SMESH_GroupBase
2011-06-23 12:33:18 +00:00
eap
db6959b647
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 )
2011-06-23 12:32:53 +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
857d7aff3d
0020743: EDF 1271 SMESH : Create a mesh from a group / export, FindElementByPoint() on groups
2011-06-14 14:19:21 +00:00