Merge branch 'master' of ssh://git.salome-platform.org/modules/gui

[modules/gui.git] / src / SALOME_PYQT / SalomePyQt / SalomePyQt.sip

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
index 78af0cd11662ec53fc161925252912e1f177f196..6344657816e1e62c498d642b6204e8e49eaaaf68 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
@@ -68,11 +68,11 @@ enum MenuName {
 
 enum WindowType {
   WT_ObjectBrowser,
+  WT_PyConsole,
+  WT_LogWindow,
 %If (ENABLE_CORBA)
   WT_NoteBook,
 %End
-  WT_PyConsole,
-  WT_LogWindow,
   WT_User
 };
 
@@ -366,7 +366,7 @@ public:
 
   static int               defaultMenuGroup() /ReleaseGIL/ ;
 
-  static int               createTool( const QString& ) /ReleaseGIL/ ;
+  static int               createTool( const QString&, const QString& = QString() ) /ReleaseGIL/ ;
   static int               createTool( const int,  const int,      const int = -1 ) /ReleaseGIL/ ;
   static int               createTool( const int,  const QString&, const int = -1 ) /ReleaseGIL/ ;
   static int               createTool( QAction*,   const int,      const int = -1, const int = -1 ) /ReleaseGIL/ ;
@@ -464,4 +464,10 @@ public:
   static QList<double>     getPlot2dFitRangeByCurves(const int) /ReleaseGIL/ ;
   static QList<double>     getPlot2dFitRangeCurrent(const int) /ReleaseGIL/ ;
   static void              setPlot2dFitRange(const int, const double XMin, const double XMax, const double YMin, const double YMax ) /ReleaseGIL/ ;
+
+  static void              processEvents();
+  
+
+  static void              startPyLog(const QString&) /ReleaseGIL/ ;
+  static void              stopPyLog() /ReleaseGIL/ ;
 };