X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI.h;h=2f8dfdc0f7375d5e39f133aa707f65e1bfe8a05d;hp=6f5237ce3adbdec3627dfbeff7e797b754037cbc;hb=251f8c052dd12dd29922210dc901b295fe999a0e;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6 diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h index 6f5237ce3..2f8dfdc0f 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-2015 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 @@ -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 ); @@ -142,6 +143,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); @@ -200,9 +202,10 @@ protected: private: void OnEditDelete(); - int addVtkFontPref( const QString& label, - const int pId, - const QString& param ); + int addVtkFontPref( const QString&, + const int, + const QString&, + const bool = false); void connectView( const SUIT_ViewWindow* ); @@ -220,7 +223,7 @@ private : SMESHGUI_ClippingPlaneInfoMap myClippingPlaneInfoMap; vtkSmartPointer myEventCallbackCommand; - vtkFloatingPointType myPriority; + double myPriority; }; #endif // SMESHGUI_H