Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agy/arch2_ic0'
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_PreMeshInfo.cxx
diff --git
a/src/SMESH_I/SMESH_PreMeshInfo.cxx
b/src/SMESH_I/SMESH_PreMeshInfo.cxx
index 886f4a6d1cfa34de335b7b94ead6c435fc20d77b..b3eaa31f3fe86f0f09b469645c4185f9342c9571 100644
(file)
--- a/
src/SMESH_I/SMESH_PreMeshInfo.cxx
+++ b/
src/SMESH_I/SMESH_PreMeshInfo.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-61,7
+61,7
@@
using namespace std;
namespace
{
namespace
{
- enum { GroupOnFilter_OutOfDate = -
1
};
+ enum { GroupOnFilter_OutOfDate = -
777
};
// count not yet loaded meshes
static int theMeshCounter = 0;
// count not yet loaded meshes
static int theMeshCounter = 0;
@@
-72,7
+72,7
@@
namespace
*/
//================================================================================
*/
//================================================================================
- void meshInfoLoaded( SMESH_Mesh_i*
mesh
)
+ void meshInfoLoaded( SMESH_Mesh_i*
/*mesh*/
)
{
theMeshCounter++;
}
{
theMeshCounter++;
}
@@
-82,7
+82,7
@@
namespace
*/
//================================================================================
*/
//================================================================================
- void filesNoMoreNeeded(SMESH_Mesh_i*
mesh
,
+ void filesNoMoreNeeded(SMESH_Mesh_i*
/*mesh*/
,
std::string medFile,
std::string hdfFile)
{
std::string medFile,
std::string hdfFile)
{
@@
-254,7
+254,7
@@
namespace
std::vector<int> data;
for ( size_t i = 0; i < meshInfo->length(); ++i )
std::vector<int> data;
for ( size_t i = 0; i < meshInfo->length(); ++i )
- if ( meshInfo[i] > 0 )
+ if ( meshInfo[i] > 0
|| meshInfo[i] == GroupOnFilter_OutOfDate
)
{
data.push_back( DriverMED::GetMedGeoType( SMDSAbs_EntityType( i ))); //medTypes[ i ] );
data.push_back( meshInfo[ i ] );
{
data.push_back( DriverMED::GetMedGeoType( SMDSAbs_EntityType( i ))); //medTypes[ i ] );
data.push_back( meshInfo[ i ] );
@@
-456,6
+456,7
@@
bool SMESH_PreMeshInfo::readPreInfoFromHDF()
mapOfNames );
}
}
mapOfNames );
}
}
+ infoHdfGroup->CloseOnDisk();
}
aFile->CloseOnDisk();
}
aFile->CloseOnDisk();
@@
-478,7
+479,7
@@
bool SMESH_PreMeshInfo::readMeshInfo()
MED::PMeshInfo medMeshInfo = aMed->CrMeshInfo(3,3,SMESH_Comment( _meshID ));
// read nb nodes
MED::PMeshInfo medMeshInfo = aMed->CrMeshInfo(3,3,SMESH_Comment( _meshID ));
// read nb nodes
- int nbNodes =
std::m
ax( 0, aMed->GetNbNodes( medMeshInfo ));
+ int nbNodes =
M
ax( 0, aMed->GetNbNodes( medMeshInfo ));
if ( nbNodes > 0 )
{
setNb( SMDSEntity_Node, nbNodes);
if ( nbNodes > 0 )
{
setNb( SMDSEntity_Node, nbNodes);
@@
-840,8
+841,9
@@
void SMESH_PreMeshInfo::FullLoadFromFile() const
meshDS->Modified();
// load dependent meshes referring/referred via hypotheses
meshDS->Modified();
// load dependent meshes referring/referred via hypotheses
- mesh.GetSubMesh( mesh.GetShapeToMesh() )->
- ComputeStateEngine (SMESH_subMesh::SUBMESH_LOADED);
+ SMESH_subMesh* mainSub = mesh.GetSubMesh( mesh.GetShapeToMesh() );
+ mainSub->ComputeStateEngine (SMESH_subMesh::SUBMESH_RESTORED); // #16648
+ mainSub->ComputeStateEngine (SMESH_subMesh::SUBMESH_LOADED);
MYDEBUGOUT( "END FullLoadFromFile()" );
}
MYDEBUGOUT( "END FullLoadFromFile()" );
}
@@
-1231,7
+1233,7
@@
void SMESH_PreMeshInfo::RemoveStudyFiles_TMP_METHOD(SALOMEDS::SComponent_ptr sme
{
if ( theMeshCounter > 0 )
{
{
if ( theMeshCounter > 0 )
{
- SALOMEDS::ChildIterator_wrap itBig = SMESH_Gen_i::getStudyServant()->NewChildIterator( smeshComp );
+ SALOMEDS::ChildIterator_wrap itBig = SMESH_Gen_i::
GetSMESHGen()->
getStudyServant()->NewChildIterator( smeshComp );
for ( ; itBig->More(); itBig->Next() ) {
SALOMEDS::SObject_wrap gotBranch = itBig->Value();
CORBA::Object_var anObject = SMESH_Gen_i::SObjectToObject( gotBranch );
for ( ; itBig->More(); itBig->Next() ) {
SALOMEDS::SObject_wrap gotBranch = itBig->Value();
CORBA::Object_var anObject = SMESH_Gen_i::SObjectToObject( gotBranch );