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 'master' branch into 'V9_dev' branch.
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.hxx
diff --git
a/src/SMESH/SMESH_Gen.hxx
b/src/SMESH/SMESH_Gen.hxx
index d011050354f065381884f99f8ffb016f5c77c67d..d4c70292274dc1ff6767a401cc08744492b05189 100644
(file)
--- a/
src/SMESH/SMESH_Gen.hxx
+++ b/
src/SMESH/SMESH_Gen.hxx
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementa
t
ion of SMESH idl descriptions
// File : SMESH_Gen.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// File : SMESH_Gen.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
@@
-66,7
+66,7
@@
public:
SMESH_Gen();
~SMESH_Gen();
SMESH_Gen();
~SMESH_Gen();
- SMESH_Mesh* CreateMesh(
int theStudyId,
bool theIsEmbeddedMode)
+ SMESH_Mesh* CreateMesh(bool theIsEmbeddedMode)
throw(SALOME_Exception);
enum ComputeFlags
throw(SALOME_Exception);
enum ComputeFlags
@@
-147,7
+147,7
@@
public:
// if Compute() would fail because of some algo bad state
// theErrors list contains problems description
// if Compute() would fail because of some algo bad state
// theErrors list contains problems description
- StudyContextStruct *GetStudyContext(
int studyId
);
+ StudyContextStruct *GetStudyContext();
static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType);
static int GetShapeDim(const TopoDS_Shape & aShape)
static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType);
static int GetShapeDim(const TopoDS_Shape & aShape)
@@
-165,7
+165,7
@@
public:
private:
int _localId; // unique Id of created objects, within SMESH_Gen entity
private:
int _localId; // unique Id of created objects, within SMESH_Gen entity
-
std::map < int, StudyContextStruct * >_mapS
tudyContext;
+
StudyContextStruct* _s
tudyContext;
// hypotheses managing
int _hypId;
// hypotheses managing
int _hypId;