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 'OCCT780'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI.h
diff --git
a/src/SMESHGUI/SMESHGUI.h
b/src/SMESHGUI/SMESHGUI.h
index 1cf6e353b9102a2832d14363983e8cddf24d0820..08ecbdf51e117f3ac57a4803e5453334c7294960 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI.h
+++ b/
src/SMESHGUI/SMESHGUI.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-63,8
+63,6
@@
class LightApp_SelectionMgr;
class SMESH_Actor;
class SMESHGUI_FilterLibraryDlg;
class SMESH_Actor;
class SMESHGUI_FilterLibraryDlg;
-typedef std::map<int, VTK::MarkerMap> SMESHGUI_StudyId2MarkerMap;
-
namespace SMESH
{
class OrientedPlane;
namespace SMESH
{
class OrientedPlane;
@@
-96,14
+94,14
@@
public :
static SUIT_ResourceMgr* resourceMgr();
static SUIT_Desktop* desktop();
static SalomeApp_Study* activeStudy();
static SUIT_ResourceMgr* resourceMgr();
static SUIT_Desktop* desktop();
static SalomeApp_Study* activeStudy();
-
- bool isActiveStudyLocked();
static bool automaticUpdate(unsigned int requestedSize = 0, bool* limitExceeded = 0);
static bool automaticUpdate( SMESH::SMESH_IDSource_ptr, int*, bool*, int*, long* );
static void Modified( bool = true );
static bool automaticUpdate(unsigned int requestedSize = 0, bool* limitExceeded = 0);
static bool automaticUpdate( SMESH::SMESH_IDSource_ptr, int*, bool*, int*, long* );
static void Modified( bool = true );
+ static bool isStudyLocked( bool = true );
+
virtual LightApp_Displayer* displayer();
virtual QString engineIOR() const;
virtual void initialize( CAM_Application* );
virtual LightApp_Displayer* displayer();
virtual QString engineIOR() const;
virtual void initialize( CAM_Application* );
@@
-115,6
+113,7
@@
public :
void ResetState();
void SetState( int );
void ResetState();
void SetState( int );
+ int GetState() const { return myState; }
bool DefineDlgPosition( QWidget*, int&, int& );
void switchToOperation( int );
bool DefineDlgPosition( QWidget*, int&, int& );
void switchToOperation( int );
@@
-213,6
+212,7
@@
private:
const bool = false);
void connectView( const SUIT_ViewWindow* );
const bool = false);
void connectView( const SUIT_ViewWindow* );
+ void logSmeshGUIEvent(int theCommandID);
private :
private :
@@
-224,7
+224,7
@@
private :
SMESHGUI_FilterLibraryDlg* myFilterLibraryDlg;
SMESHGUI_FilterLibraryDlg* myFilterLibraryDlg;
-
SMESHGUI_StudyId2MarkerMap
myMarkerMap;
+
VTK::MarkerMap
myMarkerMap;
SMESHGUI_ClippingPlaneInfoMap myClippingPlaneInfoMap;
vtkSmartPointer<vtkCallbackCommand> myEventCallbackCommand;
SMESHGUI_ClippingPlaneInfoMap myClippingPlaneInfoMap;
vtkSmartPointer<vtkCallbackCommand> myEventCallbackCommand;