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
23514: EDF 16031 - SMESH freezes
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_PreMeshInfo.hxx
diff --git
a/src/SMESH_I/SMESH_PreMeshInfo.hxx
b/src/SMESH_I/SMESH_PreMeshInfo.hxx
index 38b15a24256b3a009ba473fb7a8e70648f6da10c..62492c7d455d3b0161e27bbf97270c00e33e05d4 100644
(file)
--- a/
src/SMESH_I/SMESH_PreMeshInfo.hxx
+++ b/
src/SMESH_I/SMESH_PreMeshInfo.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-33,6
+33,7
@@
#include CORBA_SERVER_HEADER(SALOMEDS)
#include <TopAbs_ShapeEnum.hxx>
#include CORBA_SERVER_HEADER(SALOMEDS)
#include <TopAbs_ShapeEnum.hxx>
+#include <TColStd_MapOfAsciiString.hxx>
class DriverMED_R_SMESHDS_Mesh;
class HDFfile;
class DriverMED_R_SMESHDS_Mesh;
class HDFfile;
@@
-52,7
+53,7
@@
class SMESH_Mesh_i;
class SMESH_PreMeshInfo : public SMDS_MeshInfo
{
public:
class SMESH_PreMeshInfo : public SMDS_MeshInfo
{
public:
- // fills SMESH_PreMeshInfo field of all objects of mesh
+ // fills SMESH_PreMeshInfo
*
field of all objects of mesh
static void LoadFromFile( SMESH_Mesh_i* mesh,
const int meshID,
const std::string& medFile,
static void LoadFromFile( SMESH_Mesh_i* mesh,
const int meshID,
const std::string& medFile,
@@
-64,6
+65,9
@@
public:
const int meshID,
HDFfile* hdfFile);
const int meshID,
HDFfile* hdfFile);
+ // remove all SMESH_PreMeshInfo fields from mesh and its child objects w/o data loading
+ static void ForgetAllData( SMESH_Mesh_i* mesh );
+
// reads all data and remove all SMESH_PreMeshInfo fields from objects
void FullLoadFromFile() const;
// reads all data and remove all SMESH_PreMeshInfo fields from objects
void FullLoadFromFile() const;
@@
-98,7
+102,9
@@
private:
// reading from the new study, for which SaveToFile() was called
bool readPreInfoFromHDF();
// reading from the new study, for which SaveToFile() was called
bool readPreInfoFromHDF();
- void hdf2meshInfo( const std::string& dataSetName, HDFgroup* infoHdfGroup );
+ void hdf2meshInfo( const std::string& dataSetName,
+ HDFgroup* infoHdfGroup,
+ const TColStd_MapOfAsciiString& allHdfNames);
// reading from the old study, for which SaveToFile() was not called
bool readMeshInfo();
// reading from the old study, for which SaveToFile() was not called
bool readMeshInfo();