Fix for SbmGui_PythonOp to prevent blocking of PyConsole after PyOperation fail.

diff --git a/src/PyConsole/PyConsole_Console.cxx b/src/PyConsole/PyConsole_Console.cxx
index 91feadfeed16d834a9aeed553c6fcea303f71e16..56e9944603959dad8d544a58e7f743e697d5e4ee 100644 (file)
--- a/src/PyConsole/PyConsole_Console.cxx
+++ b/src/PyConsole/PyConsole_Console.cxx
@@ -134,6 +134,27 @@ void PyConsole_Console::setIsSync( const bool on )
   myEditor->setIsSync( on );
 }
 
+/*!
+  \brief Get read only flag value.
+  
+  \sa setIsReadOnly()
+  \return True if python console output is in Read-only state.
+*/
+bool PyConsole_Console::isReadOnly() const
+{
+  return myEditor->isReadOnly();
+}
+
+/*!
+  \brief Set read only flag value.
+
+  \param on read only mode flag
+*/
+void PyConsole_Console::setIsReadOnly( const bool on )
+{
+  myEditor->setReadOnly( on );
+}
+
 /*!
   \brief Get suppress output flag value.
   

diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h
index a127cc8e66c6e8f501f7958d2dbaf2b6e885a0af..e588907920948112ce2e282da0d98ed2c1334d0a 100644 (file)
--- a/src/PyConsole/PyConsole_Console.h
+++ b/src/PyConsole/PyConsole_Console.h
@@ -63,6 +63,9 @@ public:
   bool                isSync() const;
   void                setIsSync( const bool );
 
+  bool                isReadOnly() const;
+  void                setIsReadOnly( const bool );
+
   bool                isSuppressOutput() const;
   void                setIsSuppressOutput( const bool );
 

diff --git a/src/PyConsole/PyConsole_Editor.cxx b/src/PyConsole/PyConsole_Editor.cxx
index 1eb8d51ff4b53580d2c90b31a214f1a2b30398a3..3c8d7073a2d13c7182e60806345d2def922cd7d3 100644 (file)
--- a/src/PyConsole/PyConsole_Editor.cxx
+++ b/src/PyConsole/PyConsole_Editor.cxx
@@ -403,7 +403,7 @@ void PyConsole_Editor::exec( const QString& command, const bool shouldPrint )
   myCmdInHistory = -1;
   // print command line by line
   QString cmd = command;
-  if ( !cmd.endsWith( "\n" ) ) cmd += "\n";
+  if ( shouldPrint && !cmd.endsWith( "\n" ) ) cmd += "\n";
   QStringList lines = command.split( "\n" );
   for ( int i = 0; i < lines.size(); i++ ) {
     if ( !lines[i].trimmed().isEmpty() )