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
0023313: [CEA 1917] bug_1194_start_log regression
[modules/gui.git]
/
tools
/
PyConsole
/
src
/
PyConsole_Editor.cxx
diff --git
a/tools/PyConsole/src/PyConsole_Editor.cxx
b/tools/PyConsole/src/PyConsole_Editor.cxx
index 7d540f62f298efc5c2e6cc8d418e9b1a42e7a06b..e177a03ef3589936ecbae07ea77665c7453fff40 100644
(file)
--- a/
tools/PyConsole/src/PyConsole_Editor.cxx
+++ b/
tools/PyConsole/src/PyConsole_Editor.cxx
@@
-128,18
+128,20
@@
namespace
static QString READY_PROMPT = ">>> ";
static QString DOTS_PROMPT = "... ";
static QString READY_PROMPT = ">>> ";
static QString DOTS_PROMPT = "... ";
-void
static
CallbackStdout( void* data, char* c )
+void
PyConsole_
CallbackStdout( void* data, char* c )
{
if(!((PyConsole_Editor*)data)->isSuppressOutput()) {
PyConsole_Editor* e = (PyConsole_Editor*)data;
{
if(!((PyConsole_Editor*)data)->isSuppressOutput()) {
PyConsole_Editor* e = (PyConsole_Editor*)data;
+ e->putLog( fromUtf8(c) );
QApplication::postEvent( e, new PyConsole_PrintEvent( fromUtf8(c), false ) );
}
}
QApplication::postEvent( e, new PyConsole_PrintEvent( fromUtf8(c), false ) );
}
}
-void
static
CallbackStderr( void* data, char* c )
+void
PyConsole_
CallbackStderr( void* data, char* c )
{
if(!((PyConsole_Editor*)data)->isSuppressOutput()) {
PyConsole_Editor* e = (PyConsole_Editor*)data;
{
if(!((PyConsole_Editor*)data)->isSuppressOutput()) {
PyConsole_Editor* e = (PyConsole_Editor*)data;
+ e->putLog( fromUtf8(c) );
QApplication::postEvent( e, new PyConsole_PrintEvent( fromUtf8(c), true ) );
}
}
QApplication::postEvent( e, new PyConsole_PrintEvent( fromUtf8(c), true ) );
}
}
@@
-174,8
+176,8
@@
PyConsole_Editor::PyConsole_Editor( PyConsole_Interp* theInterp,
setAcceptRichText( false );
// set callbacks to interpeter
setAcceptRichText( false );
// set callbacks to interpeter
- myInterp->setvoutcb(
static
CallbackStdout, this );
- myInterp->setverrcb(
static
CallbackStderr, this );
+ myInterp->setvoutcb(
PyConsole_
CallbackStdout, this );
+ myInterp->setverrcb(
PyConsole_
CallbackStderr, this );
// print banner
if ( isShowBanner() )
addText( banner() );
// print banner
if ( isShowBanner() )
addText( banner() );
@@
-1157,7
+1159,6
@@
void PyConsole_Editor::customEvent( QEvent* event )
case PyConsole_PrintEvent::EVENT_ID:
{
PyConsole_PrintEvent* pe = (PyConsole_PrintEvent*)event;
case PyConsole_PrintEvent::EVENT_ID:
{
PyConsole_PrintEvent* pe = (PyConsole_PrintEvent*)event;
- putLog( pe->text());
addText( pe->text(), false, pe->isError() );
return;
}
addText( pe->text(), false, pe->isError() );
return;
}