Fixes #1656

Author: dcwhite

src/Interface/Application/NetworkEditor.h

@@ -269,6 +269,17 @@ namespace Gui {
     using ConnectorFunc = std::function<void(NetworkEditor*)>;
     static void setConnectorFunc(ConnectorFunc func) { connectorFunc_ = func; }
 
+    struct InEditingContext
+    {
+      explicit InEditingContext(NetworkEditor* ed)
+      {
+        inEditingContext_ = ed;
+      }
+      ~InEditingContext()
+      {
+        inEditingContext_ = nullptr;
+      }
+    };
   protected:
     void dropEvent(QDropEvent* event) override;
     void dragEnterEvent(QDragEnterEvent* event) override;
@@ -438,17 +449,7 @@ namespace Gui {
     }
 
     static NetworkEditor* inEditingContext_;
-    struct InEditingContext
-    {
-      explicit InEditingContext(NetworkEditor* ed)
-      {
-        inEditingContext_ = ed;
-      }
-      ~InEditingContext()
-      {
-        inEditingContext_ = nullptr;
-      }
-    };
+    
     static ConnectorFunc connectorFunc_;
     static std::function<QPointF(const QRectF&)> topSubnetPortHolderPositioner_;
     static std::function<QPointF(const QRectF&)> bottomSubnetPortHolderPositioner_;

src/Interface/Application/PythonConsoleWidget.cc

@@ -39,6 +39,7 @@
 
 #include <Core/Python/PythonInterpreter.h>
 #include <Interface/Application/PythonConsoleWidget.h>
+#include <Interface/Application/NetworkEditor.h>
 
 using namespace SCIRun::Core;
 using namespace SCIRun::Gui;
@@ -49,7 +50,7 @@ typedef QPointer< PythonConsoleEdit > PythonConsoleEditQWeakPointer;
 class PythonConsoleEdit : public QTextEdit
 {
 public:
-  explicit PythonConsoleEdit(PythonConsoleWidget* parent);
+  PythonConsoleEdit(NetworkEditor* rootNetworkEditor, PythonConsoleWidget* parent);
 
   virtual void keyPressEvent(QKeyEvent* e);
   //virtual void focusOutEvent( QFocusEvent* e );
@@ -71,6 +72,8 @@ class PythonConsoleEdit : public QTextEdit
   void print_errorImpl(const QString& text);
   void print_commandImpl(const QString& text);
 
+  NetworkEditor* rootNetworkEditor_;
+
 public:
   // The beginning of the area of interactive input, outside which
   // changes can't be made to the text edit contents.
@@ -87,8 +90,8 @@ class PythonConsoleEdit : public QTextEdit
   //	static void PrintCommand( PythonConsoleEditQWeakPointer edit, const std::string& text );
 };
 
-PythonConsoleEdit::PythonConsoleEdit(PythonConsoleWidget* parent) :
-QTextEdit(parent)
+PythonConsoleEdit::PythonConsoleEdit(NetworkEditor* rootNetworkEditor, PythonConsoleWidget* parent) :
+QTextEdit(parent), rootNetworkEditor_(rootNetworkEditor)
 {
   this->interactive_position_ = this->document_end();
   this->setTabChangesFocus(false);
@@ -303,6 +306,7 @@ void PythonConsoleEdit::issue_command()
 
   this->interactive_position_ = this->document_end();
 
+  NetworkEditor::InEditingContext iec(rootNetworkEditor_);
   auto lines = command.split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
   for (const auto& line : lines)
   {
@@ -390,14 +394,14 @@ class PythonConsoleWidgetPrivate
   PythonConsoleEdit* console_edit_;
 };
 
-PythonConsoleWidget::PythonConsoleWidget(QWidget* parent) :
+PythonConsoleWidget::PythonConsoleWidget(NetworkEditor* rootNetworkEditor, QWidget* parent) :
 QDockWidget(parent),
 private_(new PythonConsoleWidgetPrivate)
 {
-  this->private_->console_edit_ = new PythonConsoleEdit(this);
-  setWidget(this->private_->console_edit_);
+  private_->console_edit_ = new PythonConsoleEdit(rootNetworkEditor, this);
+  setWidget(private_->console_edit_);
 
-  this->setMinimumSize(500, 500);
+  setMinimumSize(500, 500);
 
   setWindowTitle("Python console");
 

src/Interface/Application/PythonConsoleWidget.h

@@ -46,7 +46,7 @@ class PythonConsoleWidget : public QDockWidget
 	Q_OBJECT
 
 public:
-	PythonConsoleWidget( QWidget* parent = 0 );
+  explicit PythonConsoleWidget(class NetworkEditor* rootNetworkEditor, QWidget* parent = nullptr);
 	virtual ~PythonConsoleWidget();
 
 public Q_SLOTS:

src/Interface/Application/SCIRunMainWindow.cc

@@ -1045,7 +1045,7 @@ void SCIRunMainWindow::setupPreferencesWindow()
 void SCIRunMainWindow::setupPythonConsole()
 {
 #ifdef BUILD_WITH_PYTHON
-  pythonConsole_ = new PythonConsoleWidget(this);
+  pythonConsole_ = new PythonConsoleWidget(networkEditor_, this);
   connect(actionPythonConsole_, SIGNAL(toggled(bool)), pythonConsole_, SLOT(setVisible(bool)));
   actionPythonConsole_->setIcon(QPixmap(":/general/Resources/terminal.png"));
   connect(pythonConsole_, SIGNAL(visibilityChanged(bool)), actionPythonConsole_, SLOT(setChecked(bool)));