Bring back command echoing

nyalldawson · Oct 16, 2022 · b5f8f97 · b5f8f97
1 parent e686222
commit b5f8f97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/app/rstats/qgsrstatsconsole.cpp b/src/app/rstats/qgsrstatsconsole.cpp
@@ -61,17 +61,11 @@ QgsRStatsConsole::QgsRStatsConsole( QWidget *parent, QgsRStatsRunner *runner )
 
   vl->addWidget( splitter );
 
-#if 0
-  connect( mInputEdit, &QgsInteractiveRWidget::execCommand, this, [ = ]( const QString & command )
+  connect( mRunner, &QgsRStatsRunner::commandStarted, this, [ = ]( const QString & command )
   {
-    if ( mRunner->busy() )
-      return;
-
     mOutput->append( ( mOutput->text().isEmpty() ? QString() : QString( '\n' ) ) + QStringLiteral( "> " ) + command );
     mOutput->moveCursorToEnd();
-    mRunner->execCommand( command );
   } );
-#endif
 
   connect( mRunner, &QgsRStatsRunner::errorOccurred, this, [ = ]( const QString & error )
   {

diff --git a/src/app/rstats/qgsrstatsrunner.cpp b/src/app/rstats/qgsrstatsrunner.cpp
@@ -930,6 +930,8 @@ QgsRStatsRunner::~QgsRStatsRunner()
 
 int QgsRStatsRunner::execCommandImpl( const QString &command )
 {
+  emit commandStarted( command );
+
   // todo result handling...
   QMetaObject::invokeMethod( mSession.get(), "execCommand", Qt::QueuedConnection,
                              Q_ARG( QString, command ) );

diff --git a/src/app/rstats/qgsrstatsrunner.h b/src/app/rstats/qgsrstatsrunner.h
@@ -113,6 +113,7 @@ class QgsRStatsRunner: public QObject, public QgsCodeInterpreter
     void showMessage( const QString &message );
     void errorOccurred( const QString &error );
     void busyChanged( bool busy );
+    void commandStarted( const QString &command );
     void commandFinished( const QVariant &result );
 
   protected: