Merge from V6_main (04/10/2012)

[modules/geom.git] / src / GEOMToolsGUI / GEOMToolsGUI.h

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h
index 4241124f648abd30e3f49fff5f52faafd68123fc..8b6c32c78f1f8f3aa9e2270bf2675c1f3f6d4b89 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.h
@@ -30,12 +30,16 @@
 #include "GEOM_ToolsGUI.hxx"
 
 #include <GEOMGUI.h>
-
 #include <SALOMEDSClient.hxx>
 
 class GEOM_Displayer;
 class SALOME_View;
 class SALOME_ListIO;
+class SalomeApp_Study;
+class SVTK_View;
+class QColor;
+class Handle_SALOME_InteractiveObject;
+class Handle_AIS_InteractiveContext;
 
 #include <QList>
 
@@ -54,6 +58,8 @@ public:
 
   enum ActionType { SHOWDLG, INCR, DECR };
 
+  static void  SetColor( const QString&, const QColor&, bool );
+
 private:
   // Import and export topology methods
   bool         Import();
@@ -71,7 +77,7 @@ private:
   void         OnNbIsos( ActionType actionType = SHOWDLG );
   void         OnDeflection();
   void         OnSelectOnly(int mode);
-  void         OnShowHideChildren( bool );
+  void         OnDiscloseConcealChildren( bool );
   void         OnUnpublishObject();
   void         OnPublishObject() ;
   void         OnPointMarker();
@@ -89,6 +95,18 @@ private:
                                          _PTR(Study),
                                          QList<SALOME_View*>,
                                          GEOM_Displayer* );
+
+  static void setVtkColor( SalomeApp_Study* study,
+                          int mgrId,
+                          SVTK_View* view,
+                          const Handle_SALOME_InteractiveObject& IO,
+                          const QColor& color );
+
+  static void setOccColor( SalomeApp_Study* study,
+                          int mgrId,
+                          const Handle_AIS_InteractiveContext& ic,
+                          const Handle_SALOME_InteractiveObject& IO,
+                          const QColor& color );
 };
 
 #endif // GEOMTOOLSGUI_H