From e7f669eb81df21a390c40508018d59d8b88d50ba Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 22 Aug 2011 08:43:48 +0000 Subject: [PATCH] 021346: EDF 1938 SMESH: "Use existing elements" functionality In Load(), call hyp->UpdateAsMeshesRestored() before submesh->ComputeStateEngine(SUBMESH_RESTORED) --- src/SMESH_I/SMESH_Gen_i.cxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index 098944e74..cb00ff41a 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -4671,6 +4671,13 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, } } // loop on meshes + // update hyps needing full mesh data restored (issue 20918) + for ( hyp_data = hypDataList.begin(); hyp_data != hypDataList.end(); ++hyp_data ) + { + SMESH_Hypothesis_i* hyp = hyp_data->first; + hyp->UpdateAsMeshesRestored(); + } + // notify algos on completed restoration for ( meshi_group = meshGroupList.begin(); meshi_group != meshGroupList.end(); ++meshi_group ) { @@ -4687,12 +4694,6 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, ComputeStateEngine (SMESH_subMesh::SUBMESH_RESTORED); } - for ( hyp_data = hypDataList.begin(); hyp_data != hypDataList.end(); ++hyp_data ) - { - SMESH_Hypothesis_i* hyp = hyp_data->first; - hyp->UpdateAsMeshesRestored(); // for hyps needing full mesh data restored (issue 20918) - } - // close mesh group if(aTopGroup) aTopGroup->CloseOnDisk(); -- 2.39.2