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 remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshOp.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshOp.h
b/src/SMESHGUI/SMESHGUI_MeshOp.h
index 206f4504e97784ff74d3f3a85b681b7d1b72172d..8ba4f8c40b81bbe152d7a6fc51de9d4286904124 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
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
@@
-128,7
+128,7
@@
private:
bool isSelectedHyp( int, int, int ) const;
int nbDlgHypTypes( const int ) const;
bool isAccessibleDim( const int ) const;
bool isSelectedHyp( int, int, int ) const;
int nbDlgHypTypes( const int ) const;
bool isAccessibleDim( const int ) const;
- void setCurrentHyp( const int, const int, const int
);
+ void setCurrentHyp( const int, const int, const int
, const bool=false
);
void setDefaultName( const QString& prefix="" ) const;
SMESH::SMESH_Hypothesis_var getAlgo( const int );
void readMesh();
void setDefaultName( const QString& prefix="" ) const;
SMESH::SMESH_Hypothesis_var getAlgo( const int );
void readMesh();
@@
-157,15
+157,15
@@
private:
bool myHasConcurrentSubBefore;
TDim2Type2HypList myExistingHyps; //!< all hypothesis of SMESH module
bool myHasConcurrentSubBefore;
TDim2Type2HypList myExistingHyps; //!< all hypothesis of SMESH module
- TDim2Type2HypList myObjHyps; //!< hypothesis assigned to the current
+ TDim2Type2HypList myObjHyps; //!< hypothesis assigned to the current
// edited mesh/sub-mesh
// hypdata corresponding to hypotheses present in myDlg
THypDataList myAvailableHypData[4][NbHypTypes];
QString myLastGeomToSelect;
THypLabelIsAppMap myHypMapIsApplicable;
bool myIgnoreAlgoSelection;
// edited mesh/sub-mesh
// hypdata corresponding to hypotheses present in myDlg
THypDataList myAvailableHypData[4][NbHypTypes];
QString myLastGeomToSelect;
THypLabelIsAppMap myHypMapIsApplicable;
bool myIgnoreAlgoSelection;
- HypothesesSet* myHypoSet;
- int myDim, myType, myMaxShapeDim;
+ HypothesesSet*
myHypoSet;
+ int
myDim, myType, myMaxShapeDim;
QString myObjectToSelect;
};
QString myObjectToSelect;
};