X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI.h;h=1cf6e353b9102a2832d14363983e8cddf24d0820;hb=8408df59c58cdda76191f1edc7ee3811c9ab54c8;hp=bd4b1706a3bb1b579cbc74ae9996fc00524e7985;hpb=ae29d465091933df101dfac6ae99d3becf4efde7;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h index bd4b1706a..1cf6e353b 100644 --- a/src/SMESHGUI/SMESHGUI.h +++ b/src/SMESHGUI/SMESHGUI.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -84,7 +84,7 @@ typedef std::map SMESHGUI_Cli //================================================================================= class SMESHGUI_EXPORT SMESHGUI : public SalomeApp_Module { - Q_OBJECT; + Q_OBJECT public : SMESHGUI(); @@ -100,6 +100,7 @@ public : 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 ); @@ -132,6 +133,8 @@ public : void EmitSignalStudyFrameChanged(); void EmitSignalCloseAllDialogs(); void EmitSignalVisibilityChanged(); + void EmitSignalCloseView(); + void EmitSignalActivatedViewManager(); virtual void contextMenuPopup( const QString&, QMenu*, QString& ); virtual void createPreferences(); @@ -142,6 +145,7 @@ public : virtual void update( const int ); static SALOMEDS::Color getUniqueColor( const QList& ); + static SALOMEDS::Color getPredefinedUniqueColor(); virtual void storeVisualParameters (int savePoint); virtual void restoreVisualParameters(int savePoint); @@ -167,12 +171,15 @@ private slots: void onOperationCommited( SUIT_Operation* ); void onOperationAborted( SUIT_Operation* ); void onHypothesisEdit( int result ); + void onUpdateControlActions(); signals: void SignalDeactivateActiveDialog(); void SignalStudyFrameChanged(); void SignalCloseAllDialogs(); void SignalVisibilityChanged(); + void SignalCloseView(); + void SignalActivatedViewManager(); protected: void createSMESHAction( const int, @@ -203,7 +210,7 @@ private: int addVtkFontPref( const QString&, const int, const QString&, - const bool = false); + const bool = false); void connectView( const SUIT_ViewWindow* );