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
PR: merged from V5_1_4rc1
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI.h
diff --git
a/src/SMESHGUI/SMESHGUI.h
b/src/SMESHGUI/SMESHGUI.h
index f6960a481de9ab267d1e82ae6464e7fd9b63091b..503740c61039b9c4ff6b3639745d9654869c6466 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI.h
+++ b/
src/SMESHGUI/SMESHGUI.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,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 SMESHGUI : GUI for SMESH component
// File : SMESHGUI.h
// Author : Nicolas REJNERI, Open CASCADE S.A.S.
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI.h
// Author : Nicolas REJNERI, Open CASCADE S.A.S.
@@
-31,6
+32,7
@@
// SALOME GUI includes
#include <SalomeApp_Module.h>
// SALOME GUI includes
#include <SalomeApp_Module.h>
+#include <VTKViewer_MarkerDef.h>
#include <SALOME_InteractiveObject.hxx>
// IDL includes
#include <SALOME_InteractiveObject.hxx>
// IDL includes
@@
-52,6
+54,8
@@
class LightApp_SelectionMgr;
class SMESHGUI_FilterLibraryDlg;
class SMESHGUI_FilterLibraryDlg;
+typedef std::map<int, VTK::MarkerMap> SMESHGUI_StudyId2MarkerMap;
+
//=================================================================================
// class : SMESHGUI
// purpose :
//=================================================================================
// class : SMESHGUI
// purpose :
@@
-150,6
+154,8
@@
protected:
virtual bool isSelectionCompatible();
virtual bool isSelectionCompatible();
+ virtual bool reusableOperation( const int id );
+
private:
void OnEditDelete();
int addVtkFontPref( const QString& label,
private:
void OnEditDelete();
int addVtkFontPref( const QString& label,
@@
-164,6
+170,8
@@
private :
LightApp_Displayer* myDisplayer;
SMESHGUI_FilterLibraryDlg* myFilterLibraryDlg;
LightApp_Displayer* myDisplayer;
SMESHGUI_FilterLibraryDlg* myFilterLibraryDlg;
+
+ SMESHGUI_StudyId2MarkerMap myMarkerMap;
};
#endif // SMESHGUI_H
};
#endif // SMESHGUI_H