Commit Graph

95 Commits

Author SHA1 Message Date
akl
b0a908c0d2 Update copyrights 2014. 2014-02-20 16:25:37 +04: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
bfcfbc1ba9 Prevent failure if a degenerated EDGE is not meshed 2013-11-15 10:20:33 +00:00
eap
48653b1aec -#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
-#endif
2013-10-10 10:29:42 +00:00
eap
c81123c27b 22170: [CEA 704] Redirect NETGEN outup in a log file
restore cout possibly redirected by algo
2013-09-10 13:52:57 +00:00
eap
3efca6d10c Progress bar. Increase difference between computeCost of EDGE and FACE 2013-09-03 15:48:57 +00:00
eap
3c53917e76 SALOME Forum bug: http://www.salome-platform.org/forum/forum_10/967838025
Don't use BRep_Tool::Degenerated() which sometimes gives a wrong answer,
use SMESH_Algo::isDegenerated() instead
2013-08-23 07:44:07 +00:00
eap
5f791c80a4 Optimize cleanSubMesh( SMESH_subMesh * subMesh ) a bit 2013-08-08 12:38:25 +00:00
eap
42d136bcdc Compute Progress bar
+  bool DependsOn( const SMESH_subMesh* other ) const;
+  int                   _realComputeCost; // _computeCost depending on presence of needed hypotheses
2013-07-09 11:59:18 +00:00
eap
e0f019ccf9 Compute Progress bar: ignore sub-meshes that are NOT_READY to compute 2013-07-08 11:27:16 +00:00
eap
8ead976689 Compute Progress bar
SMESH_subMeshIteratorPtr getDependsOnIterator(const bool includeSelf,
-                                                const bool complexShapeFirst) const;
+                                                const bool complexShapeFirst=false) const;

+  int GetComputeCost() const;

   TopoDS_Shape getCollection(SMESH_Gen * theGen,
                              SMESH_Algo* theAlgo,
                              bool &      theSubComputed,
                              bool &      theSubFailed,
+                             int  &      theComputeCost);

+  int                   _computeCost; // how costly is to compute this sub-mesh
2013-07-03 16:12:38 +00:00
eap
973402fcd3 avoid compilation warnings in release mode 2013-06-05 09:39:43 +00:00
eap
10a6101340 0022172: [CEA 790] create the groups corresponding to domains
1) Reset _algo = 0 if ( event == REMOVE_ALGO || event == REMOVE_FATHER_ALGO )

2) Avoid erasing _computeError holding a WARNING is algo->Compute() returns true

-          if ( !_computeError || ( !ret && _computeError->IsOK() ) )
+          if ( !_computeError || (/* !ret && */_computeError->IsOK() ) )
             _computeError = algo->GetComputeError();

3) Fix notifyListenersOnEvent():

-      if ( !isDeletable || !_eventListeners.count( li_da.first ))
+      if ( !isDeletable || _eventListeners.count( li_da.first ))
         li_da.first->myBusySM.erase( this ); // a listener is hopefully not dead
2013-05-24 11:46:27 +00:00
eap
89682777f7 0022202: EDF SMESH: Regression in a script meshing prisms and hexaedrons
Fix notifyListenersOnEvent() for the case of removing an EventListener (attempt No.2)
2013-04-29 14:18:32 +00:00
eap
36550205e6 0022202: EDF SMESH: Regression in a script meshing prisms and hexaedrons
Fix notifyListenersOnEvent() for the case of removing an EventListener
2013-04-29 12:00:40 +00:00
eap
55e345e578 Regression of SMESH_TEST/Grids/smesh/imps7/H6
Unreachable deep idea

           bool subComputed = false, subFailed = false;
           if (!algo->OnlyUnaryInput()) {
-            if ( event == COMPUTE &&
-                 ( algo->NeedDiscreteBoundary() || algo->SupportSubmeshes() ))
+            if ( event == COMPUTE /*&&
+                 ( algo->NeedDiscreteBoundary() || algo->SupportSubmeshes() )*/)
               shape = getCollection( gen, algo, subComputed, subFailed );
             else
               subComputed = SubMeshesComputed( & subFailed );
2013-04-26 15:53:34 +00:00
vsr
bd8f1aee7c Merge from V6_main 01/04/2013 2013-04-01 13:05:47 +00:00
vsr
31ca0b3e3b Merge from V6_main 15/03/2013 2013-03-15 14:59:29 +00:00
vsr
7aebb99e42 Merge from V6_main 06/03/2013 2013-03-06 13:57:01 +00:00
vsr
88b3dbe23b Merge from V6_main 28/02/2013 2013-02-28 15:07:35 +00:00
vsr
9a54694a0a Merge from V6_main 11/02/2013 2013-02-12 14:37:44 +00:00
vsr
1067ffa6e7 Merge from V6_main 13/12/2012 2012-12-13 11:41:29 +00:00
vsr
f5016d85b7 Merge from V6_main (04/10/2012) 2012-10-08 11:56:59 +00:00
vsr
bd4e115a78 Merge from V6_main_20120808 08Aug12 2012-08-09 10:03:55 +00:00
vsr
0635c9fc80 Merge from BR_V5_DEV 16Feb09 2009-02-17 05:27:49 +00:00
jfa
79b1ac2b6d Join modifications from BR_Dev_For_4_0 tag V4_1_1. 2008-03-07 07:47:05 +00:00
jfa
c63ee099ad Join modifications from branch BR_DEBUG_3_2_0b1 2006-06-01 11:39:17 +00:00
jfa
57b43b4d01 Join modifications from branch OCC_debug_for_3_2_0b1 2006-05-06 08:51:48 +00:00
jfa
4ff5bd6154 Join modifications from branch OCC_development_for_3_2_0a2 2006-03-13 15:29:49 +00:00
eap
96874fc4b6 PAL10953. Fix GetSubmeshComputed(): there may be elements but no nodes in a submesh 2005-12-26 10:36:57 +00:00
eap
493903908d fix PAL10974. Call CleanDependants() instead of
RemoveSubMeshElementsAndNodes() before algo->Compute()
2005-12-20 13:57:13 +00:00
eap
477d745d92 fix bug PAL10974: check if SubMeshesComputed() by presence of nodes in submesh.
Restore lost modifications fixing PAL8021.
2005-12-20 11:10:13 +00:00
smh
c38c10811a SMH: Preparation version 3.0.0 - merge (HEAD+POLYWORK) 2005-06-07 13:22:20 +00:00
msv
f4c7cebbd6 Comment out useless message output to speed up change hypothesis operation 2005-03-18 12:49:28 +00:00
eap
a9750358c9 PAL8021. In AlgpStateEngine(), clean existing sub-mesh only if hypothesis change. In CleanDependants(), do not go upper than SOLID. 2005-02-07 11:06:45 +00:00
eap
85b8384fb0 PAL7933. Add static IsApplicableHypothesis();
enable propagation of local hypotheses assigned to super-shapes;
Use SMESH_HypoFilter to retrieve assigned hypotheses
2005-02-04 10:39:49 +00:00
eap
d9ce7a48c1 Comment annoing trace 2005-01-21 14:03:54 +00:00
admin
ed456586bf Merge with OCC-V2_1_0_deb 2004-12-17 11:07:35 +00:00
admin
e4737e85f0 Merge with version on tag OCC-V2_1_0d 2004-12-01 10:48:31 +00:00
yfr
bc37f0b49f DCQ : Merge with Ecole_Ete_a6. 2004-06-18 08:55:35 +00:00
nadir
faa1c8f2bc updating or adding when merging in the main trunk with the version in the
branch nadir_1_2_2 !!
2003-12-08 15:43:20 +00:00
jrt
f7fbf1c622 Use nodes and elements pointer instead on IDs 2003-09-05 10:31:32 +00:00
jrt
bb2c60c2b6 Update to match the change of SMDS (new DS). 2003-09-04 09:21:41 +00:00
yfr
789d7f7415 yfr : Merge with v1.2 2003-07-10 10:13:42 +00:00
nri
0b959120c5 NRI : First integration. 2003-05-19 13:18:36 +00:00