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' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshOp.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshOp.h
b/src/SMESHGUI/SMESHGUI_MeshOp.h
index 6d26686b4db3d25eddb60864ca91893f69afa15a..9f35b7fbad4b40f3e38adc71c4203a1accf256da 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshOp.h
+++ b/
src/SMESHGUI/SMESHGUI_MeshOp.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-153,8
+153,11
@@
private:
SMESHGUI_ShapeByMeshOp* myShapeByMeshOp;
bool myToCreate;
bool myIsMesh;
SMESHGUI_ShapeByMeshOp* myShapeByMeshOp;
bool myToCreate;
bool myIsMesh;
- bool myIsOnGeometry; //!< TRUE if edited mesh
accotiated with geometrical object
+ bool myIsOnGeometry; //!< TRUE if edited mesh
is based on geometry
bool myHasConcurrentSubBefore;
bool myHasConcurrentSubBefore;
+ bool myIsInvalidSubMesh; //!< "invalid sub-mesh" is edited
+ // The geometry of "invalid sub-mesh" is not a sub-shape of the main shape;
+ // it is created for the case where a valid sub-shape not found by CopyMeshWithGeom()
TDim2Type2HypList myExistingHyps; //!< all hypothesis of SMESH module
TDim2Type2HypList myObjHyps; //!< hypothesis assigned to the current
TDim2Type2HypList myExistingHyps; //!< all hypothesis of SMESH module
TDim2Type2HypList myObjHyps; //!< hypothesis assigned to the current