Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into abn/paravis_rearch
[modules/gui.git]
/
src
/
PyConsole
/
PyConsole_Editor.h
diff --git
a/src/PyConsole/PyConsole_Editor.h
b/src/PyConsole/PyConsole_Editor.h
index 2e1c80630a427efaee43996ca34930c93f0d61b6..c939ef1b7da3e9fd78f947738427b11222426a42 100644
(file)
--- a/
src/PyConsole/PyConsole_Editor.h
+++ b/
src/PyConsole/PyConsole_Editor.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-58,6
+58,8
@@
public:
bool isShowBanner() const;
void setIsShowBanner( const bool );
bool isShowBanner() const;
void setIsShowBanner( const bool );
+ bool isLogging() const;
+
virtual QSize sizeHint() const;
public slots:
virtual QSize sizeHint() const;
public slots:
@@
-67,6
+69,10
@@
public slots:
void handleReturn();
void onPyInterpChanged( PyConsole_Interp* );
void dump();
void handleReturn();
void onPyInterpChanged( PyConsole_Interp* );
void dump();
+ bool startLog( const QString& );
+ void startLog();
+ void stopLog();
+ void putLog( const QString& );
protected:
virtual void dropEvent( QDropEvent* event );
protected:
virtual void dropEvent( QDropEvent* event );
@@
-85,6
+91,7
@@
protected:
QString myCurrentCommand; //!< currently being printed command
QString myPrompt; //!< current command line prompt
int myCmdInHistory; //!< current history command index
QString myCurrentCommand; //!< currently being printed command
QString myPrompt; //!< current command line prompt
int myCmdInHistory; //!< current history command index
+ QString myLogFile; //!< current output log
QStringList myHistory; //!< commands history buffer
QEventLoop* myEventLoop; //!< internal event loop
QString myBanner; //!< current banner
QStringList myHistory; //!< commands history buffer
QEventLoop* myEventLoop; //!< internal event loop
QString myBanner; //!< current banner