Start on error message display

Author: dcwhite

src/Interface/Application/ModuleLogWindow.cc

@@ -30,15 +30,17 @@
 #include <iostream>
 #include <Interface/Application/ModuleLogWindow.h>
 #include <Interface/Application/SCIRunMainWindow.h>
+#include <Interface/Application/NetworkEditor.h>
 #include <Interface/Application/DialogErrorControl.h>
 #include <Core/Logging/Log.h>
 
 using namespace SCIRun::Gui;
 using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Core::Logging;
 
-ModuleLogWindow::ModuleLogWindow(const QString& moduleName, boost::shared_ptr<SCIRun::Gui::DialogErrorControl> dialogErrorControl, QWidget* parent) : QDialog(parent), moduleName_(moduleName),
-		dialogErrorControl_(dialogErrorControl)
+ModuleLogWindow::ModuleLogWindow(const QString& moduleName, ModuleErrorDisplayer* displayer, boost::shared_ptr<SCIRun::Gui::DialogErrorControl> dialogErrorControl, QWidget* parent) : QDialog(parent), moduleName_(moduleName),
+  displayer_(displayer),
+	dialogErrorControl_(dialogErrorControl)
 {
 	setupUi(this);
 	setModal(false);
@@ -67,6 +69,7 @@ void ModuleLogWindow::appendMessage(const QString& message, const QColor& color
 void ModuleLogWindow::popupMessageBox(const QString& message)
 {
   dialogErrorControl_->increaseCounter();
+  auto errorText = "Error in " + moduleName_ + "\n" + message;
   if (dialogErrorControl_->showDialog())
   {
     QMessageBox* msgBox = new QMessageBox(parentWidget());
@@ -76,10 +79,13 @@ void ModuleLogWindow::popupMessageBox(const QString& message)
     auto showButton = msgBox->addButton("Show Module", QMessageBox::ApplyRole);
     connect(showButton, SIGNAL(clicked()), this, SIGNAL(requestModuleVisible()));
     msgBox->setWindowTitle(windowTitle());
-    msgBox->setText("Error in " + moduleName_ + "\n" + message);
+    msgBox->setText(errorText);
     msgBox->setModal(false);
     msgBox->show();
   }
+
+  //TODO: need another limit on these?
+  displayer_->displayError(errorText);
 }
 
 ModuleLogger::ModuleLogger(ModuleLogWindow* window) : moduleName_(window->name().toStdString())

src/Interface/Application/ModuleLogWindow.h

@@ -39,13 +39,14 @@ namespace SCIRun {
 namespace Gui {
 
 class DialogErrorControl; 
+class ModuleErrorDisplayer;
 
 class ModuleLogWindow : public QDialog, public Ui::ModuleLogWindow
 {
 	Q_OBJECT
 
 public:
-  explicit ModuleLogWindow(const QString& moduleName, boost::shared_ptr<DialogErrorControl> dialogErrorControl, QWidget* parent = 0);
+  explicit ModuleLogWindow(const QString& moduleName, ModuleErrorDisplayer* displayer, boost::shared_ptr<DialogErrorControl> dialogErrorControl, QWidget* parent = 0);
   QString name() const { return moduleName_; }
 public Q_SLOTS:
   void appendMessage(const QString& message, const QColor& color = Qt::black);
@@ -57,6 +58,7 @@ public Q_SLOTS:
 
 private:
   QString moduleName_;
+  ModuleErrorDisplayer* displayer_;
 	boost::shared_ptr<DialogErrorControl> dialogErrorControl_;
 };
 

src/Interface/Application/ModuleWidget.cc

@@ -532,7 +532,7 @@ int ModuleWidget::buildDisplay(ModuleWidgetDisplayBase* display, const QString&
 
 void ModuleWidget::setupLogging()
 {
-  logWindow_ = new ModuleLogWindow(QString::fromStdString(moduleId_), dialogErrorControl_, SCIRunMainWindow::Instance());
+  logWindow_ = new ModuleLogWindow(QString::fromStdString(moduleId_), editor_, dialogErrorControl_, SCIRunMainWindow::Instance());
   connect(actionsMenu_->getAction("Show Log"), SIGNAL(triggered()), logWindow_, SLOT(show()));
   connect(actionsMenu_->getAction("Show Log"), SIGNAL(triggered()), logWindow_, SLOT(raise()));
   connect(logWindow_, SIGNAL(messageReceived(const QColor&)), this, SLOT(setLogButtonColor(const QColor&)));

src/Interface/Application/NetworkEditor.cc

@@ -1208,6 +1208,12 @@ void NetworkEditor::highlightTaggedItem(QGraphicsItem* item, int tagValue)
   }
 }
 
+void NetworkEditor::displayError(const QString& msg) const
+{
+  qDebug() << "displaying" << msg;
+  auto errorItem = scene()->addText(msg);
+}
+
 NetworkEditor::~NetworkEditor()
 {
   Q_FOREACH(QGraphicsItem* item, scene_->items())

src/Interface/Application/NetworkEditor.h

@@ -70,6 +70,13 @@ namespace Gui {
     virtual NotePosition position() const = 0;
   };
 
+  class ModuleErrorDisplayer
+  {
+  public:
+    virtual ~ModuleErrorDisplayer() {}
+    virtual void displayError(const QString& msg) const = 0;
+  };
+
   class ModuleEventProxy : public QObject
   {
     Q_OBJECT
@@ -108,7 +115,8 @@ namespace Gui {
     public SCIRun::Dataflow::Networks::ExecutableLookup,
     public SCIRun::Dataflow::Networks::NetworkEditorSerializationManager,
     public SCIRun::Dataflow::Engine::NetworkIOInterface<SCIRun::Dataflow::Networks::NetworkFileHandle>,
-    public SCIRun::Dataflow::Networks::ConnectionMakerService
+    public SCIRun::Dataflow::Networks::ConnectionMakerService,
+    public ModuleErrorDisplayer
   {
 	  Q_OBJECT
 
@@ -166,6 +174,8 @@ namespace Gui {
     void tagLayer(bool active, int tag);
     bool tagLayerActive() const { return tagLayerActive_; }
 
+    virtual void displayError(const QString& msg) const override;
+
   protected:
     virtual void dropEvent(QDropEvent* event) override;
     virtual void dragEnterEvent(QDragEnterEvent* event) override;

src/Interface/Application/SCIRunMainWindow.cc

@@ -118,9 +118,10 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true), returnCode_(
 	menubar_->setStyleSheet("QMenuBar::item::selected{background-color : rgb(66, 66, 69); } QMenuBar::item::!selected{ background-color : rgb(66, 66, 69); } ");
 	dialogErrorControl_.reset(new DialogErrorControl(this));
   setupTagManagerWindow();
+  tagManagerWindow_->hide();
   setupPreferencesWindow();
   setupNetworkEditor();
-
+  
   setTipsAndWhatsThis();
 
   connect(actionExecute_All_, SIGNAL(triggered()), this, SLOT(executeAll()));
@@ -240,6 +241,7 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true), returnCode_(
   }
 
   setupProvenanceWindow();
+  provenanceWindow_->hide();
   setupDevConsole();
   setupPythonConsole();
 
@@ -341,9 +343,6 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true), returnCode_(
 		"QHeaderView::section { background: rgb(66,66,69);} "
 		);
 
-  provenanceWindow_->hide();
-  tagManagerWindow_->hide();
-
   hideNonfunctioningWidgets();
 
   statusBar()->addPermanentWidget(new QLabel("Version: " + QString::fromStdString(VersionInfo::GIT_VERSION_TAG)));