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-tracking branch 'origin/master' into V8_5_BR
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI.h
diff --git
a/src/SMESHGUI/SMESHGUI.h
b/src/SMESHGUI/SMESHGUI.h
index 9055fd200c3516e140e106cdeee4871800dd9f28..92a51bf56bb073f03f6c8a6dec22384d713d0f44 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI.h
+++ b/
src/SMESHGUI/SMESHGUI.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-84,7
+84,7
@@
typedef std::map<SUIT_ViewManager*, SMESHGUI_ClippingPlaneInfoList> SMESHGUI_Cli
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI : public SalomeApp_Module
{
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI : public SalomeApp_Module
{
- Q_OBJECT
;
+ Q_OBJECT
public :
SMESHGUI();
public :
SMESHGUI();
@@
-115,6
+115,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 );
@@
-133,6
+134,8
@@
public :
void EmitSignalStudyFrameChanged();
void EmitSignalCloseAllDialogs();
void EmitSignalVisibilityChanged();
void EmitSignalStudyFrameChanged();
void EmitSignalCloseAllDialogs();
void EmitSignalVisibilityChanged();
+ void EmitSignalCloseView();
+ void EmitSignalActivatedViewManager();
virtual void contextMenuPopup( const QString&, QMenu*, QString& );
virtual void createPreferences();
virtual void contextMenuPopup( const QString&, QMenu*, QString& );
virtual void createPreferences();
@@
-169,12
+172,15
@@
private slots:
void onOperationCommited( SUIT_Operation* );
void onOperationAborted( SUIT_Operation* );
void onHypothesisEdit( int result );
void onOperationCommited( SUIT_Operation* );
void onOperationAborted( SUIT_Operation* );
void onHypothesisEdit( int result );
+ void onUpdateControlActions();
signals:
void SignalDeactivateActiveDialog();
void SignalStudyFrameChanged();
void SignalCloseAllDialogs();
void SignalVisibilityChanged();
signals:
void SignalDeactivateActiveDialog();
void SignalStudyFrameChanged();
void SignalCloseAllDialogs();
void SignalVisibilityChanged();
+ void SignalCloseView();
+ void SignalActivatedViewManager();
protected:
void createSMESHAction( const int,
protected:
void createSMESHAction( const int,