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 'master' into pre/medCompatibility
[modules/smesh.git]
/
src
/
DriverMED
/
DriverMED_W_SMESHDS_Mesh.h
diff --git
a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
index 30d1f475fe006667a83d8fdf73621b1cd6648581..2b04c05f9fa3326aea7bbf91a6a9b355d5eaf7e4 100644
(file)
--- a/
src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
+++ b/
src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
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
@@
-35,10
+35,12
@@
#include <string>
#include <list>
#include <map>
#include <string>
#include <list>
#include <map>
+#include <vector>
class SMESHDS_Mesh;
class SMESHDS_GroupBase;
class SMESHDS_SubMesh;
class SMESHDS_Mesh;
class SMESHDS_GroupBase;
class SMESHDS_SubMesh;
+class SMDS_MeshElement;
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
{
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
{
@@
-46,25
+48,28
@@
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
DriverMED_W_SMESHDS_Mesh();
DriverMED_W_SMESHDS_Mesh();
- virtual void SetFile(const std::string& theFileName);
- void SetFile(const std::string& theFileName, MED::EVersion theId);
+ void SetFile(const std::string& theFileName, int theVersion=-1);
void SetAutoDimension(bool toFindOutDimension) { myAutoDimension = toFindOutDimension; }
void SetAutoDimension(bool toFindOutDimension) { myAutoDimension = toFindOutDimension; }
- static std::string GetVersionString(const MED::EVersion theVersion, int theNbDigits=2);
- /*! sets file name; only for usage with Add(), not Write()
- */
+ static std::string GetVersionString(int theMinor, int theNbDigits=2);
+
void AddGroupOfNodes();
void AddGroupOfEdges();
void AddGroupOfFaces();
void AddGroupOfVolumes();
void AddGroupOf0DElems();
void AddGroupOfBalls();
void AddGroupOfNodes();
void AddGroupOfEdges();
void AddGroupOfFaces();
void AddGroupOfVolumes();
void AddGroupOf0DElems();
void AddGroupOfBalls();
+ void AddAllToGroup();
/*! functions to prepare adding one mesh
*/
void AddGroup(SMESHDS_GroupBase * theGroup);
void AddAllSubMeshes();
void AddSubMesh(SMESHDS_SubMesh* theSubMesh, int theID);
/*! functions to prepare adding one mesh
*/
void AddGroup(SMESHDS_GroupBase * theGroup);
void AddAllSubMeshes();
void AddSubMesh(SMESHDS_SubMesh* theSubMesh, int theID);
+ void AddODOnVertices(bool toAdd) { myAddODOnVertices = toAdd; }
+
+ static bool getNodesOfMissing0DOnVert(SMESHDS_Mesh* mesh,
+ std::vector<const SMDS_MeshElement*>& nodes);
/*! add one mesh
*/
/*! add one mesh
*/
@@
-72,10
+77,9
@@
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
private:
private:
- MED::EVersion myMedVersion;
std::list<SMESHDS_GroupBase*> myGroups;
bool myAllSubMeshes;
std::list<SMESHDS_GroupBase*> myGroups;
bool myAllSubMeshes;
- std::
map<int,
SMESHDS_SubMesh*> mySubMeshes;
+ std::
vector<
SMESHDS_SubMesh*> mySubMeshes;
bool myDoGroupOfNodes;
bool myDoGroupOfEdges;
bool myDoGroupOfFaces;
bool myDoGroupOfNodes;
bool myDoGroupOfEdges;
bool myDoGroupOfFaces;
@@
-83,6
+87,9
@@
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
bool myDoGroupOf0DElems;
bool myDoGroupOfBalls;
bool myAutoDimension;
bool myDoGroupOf0DElems;
bool myDoGroupOfBalls;
bool myAutoDimension;
+ bool myAddODOnVertices;
+ bool myDoAllInGroups;
+ int myVersion;
};
#endif
};
#endif