From 2bb758b4c68641e2eb9931885a1d76c3b769301d Mon Sep 17 00:00:00 2001
From: Tats <info@sofianaudry.com>
Date: Sat, 26 Mar 2016 18:13:06 -0400
Subject: [PATCH] Moved display of test signal into OutputGLCanvas where it
 belongs.

---
 MainWindow.cpp     | 7 +++----
 MainWindow.h       | 6 ------
 OutputGLCanvas.cpp | 3 ++-
 OutputGLCanvas.h   | 5 +++++
 OutputGLWindow.cpp | 7 +++++++
 OutputGLWindow.h   | 1 +
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/MainWindow.cpp b/MainWindow.cpp
index 57fe72c..8bed600 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -52,7 +52,6 @@ MainWindow::MainWindow()
   // Editing toggles.
   _displayControls = true;
   _stickyVertices = true;
-  _displayTestSignal = false;
   _displayUndoStack = false;
   _showMenuBar = true; // Show menubar by default
 
@@ -1672,11 +1671,12 @@ void MainWindow::createActions()
   displayTestSignalAction->setToolTip(tr("Display test signal"));
   displayTestSignalAction->setIconVisibleInMenu(false);
   displayTestSignalAction->setCheckable(true);
-  displayTestSignalAction->setChecked(_displayTestSignal);
+  displayTestSignalAction->setChecked(false);
   displayTestSignalAction->setShortcutContext(Qt::ApplicationShortcut);
   addAction(displayTestSignalAction);
   // Manage show/hide of test signal
-  connect(displayTestSignalAction, SIGNAL(toggled(bool)), this, SLOT(enableTestSignal(bool)));
+  connect(displayTestSignalAction, SIGNAL(toggled(bool)), outputWindow, SLOT(setDisplayTestSignal(bool)));
+//  connect(displayTestSignalAction, SIGNAL(toggled(bool)), this, SLOT(update()));
 
   // Toggle display of Undo Stack
   displayUndoStackAction = new QAction(tr("Display &Undo Stack"), this);
@@ -2610,7 +2610,6 @@ void MainWindow::enableDisplayControls(bool display)
 
 void MainWindow::enableTestSignal(bool enable)
 {
-  _displayTestSignal = enable;
   updateCanvases();
 }
 
diff --git a/MainWindow.h b/MainWindow.h
index 407ac27..0f75113 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -431,9 +431,6 @@ private:
   // True iff we are displaying the controls.
   bool _displayControls;
 
-  // True iff we are displaying the test signal (grid)
-  bool _displayTestSignal;
-
   // True iff we want vertices to stick to each other.
   bool _stickyVertices;
 
@@ -487,9 +484,6 @@ public:
   /// Returns true iff we should display the controls.
   bool displayControls() const { return _displayControls; }
 
-  /// Returns true iff we should display the test signal
-  bool displayTestSignal() const { return _displayTestSignal; }
-
   /// Returns true iff we want vertices to stick to each other.
   bool stickyVertices() const { return _stickyVertices; }
 
diff --git a/OutputGLCanvas.cpp b/OutputGLCanvas.cpp
index 7666202..ef94103 100644
--- a/OutputGLCanvas.cpp
+++ b/OutputGLCanvas.cpp
@@ -26,6 +26,7 @@ MM_BEGIN_NAMESPACE
 OutputGLCanvas::OutputGLCanvas(MainWindow* mainWindow, QWidget* parent, const QGLWidget* shareWidget, QGraphicsScene* scene)
 : MapperGLCanvas(mainWindow, true, parent, shareWidget, scene),
   _displayCrosshair(false),
+  _displayTestSignal(false),
   _svg_test_signal(":/test-signal"),
   _brush_test_signal(_svg_test_signal)
 {
@@ -43,7 +44,7 @@ void OutputGLCanvas::setSceneRectToViewportGeometry()
 
 void OutputGLCanvas::drawForeground(QPainter *painter , const QRectF &rect)
 {
-  if (getMainWindow()->displayTestSignal())
+  if (_displayTestSignal)
   {
     glPushMatrix();
     painter->translate(rect.x(), rect.y());
diff --git a/OutputGLCanvas.h b/OutputGLCanvas.h
index 0455cb6..d0c940f 100644
--- a/OutputGLCanvas.h
+++ b/OutputGLCanvas.h
@@ -36,10 +36,14 @@ public:
   // Adjust viewable scene to correspond to absolute coordinates.
   void setSceneRectToViewportGeometry();
 
+public:
   void setDisplayCrosshair(bool displayCrosshair) {
     _displayCrosshair = displayCrosshair;
   }
 
+  void setDisplayTestSignal(bool displayTestSignal) {
+    _displayTestSignal = displayTestSignal;
+  }
   // Draws foreground (displays crosshair if needed).
   void drawForeground(QPainter *painter , const QRectF &rect);
 
@@ -47,6 +51,7 @@ private:
   void _drawTestSignal(QPainter* painter);
 
   bool _displayCrosshair;
+  bool _displayTestSignal;
   QImage _svg_test_signal;
   QBrush _brush_test_signal;
 
diff --git a/OutputGLWindow.cpp b/OutputGLWindow.cpp
index 05cf0bc..b3b6098 100644
--- a/OutputGLWindow.cpp
+++ b/OutputGLWindow.cpp
@@ -118,4 +118,11 @@ void OutputGLWindow::setFullScreen(bool fullscreen)
   }
 }
 
+void OutputGLWindow::setDisplayTestSignal(bool displayTestSignal)
+{
+  canvas->setDisplayTestSignal(displayTestSignal);
+  canvas->update();
+}
+
+
 MM_END_NAMESPACE
diff --git a/OutputGLWindow.h b/OutputGLWindow.h
index 2d6c3e6..865cd0d 100644
--- a/OutputGLWindow.h
+++ b/OutputGLWindow.h
@@ -46,6 +46,7 @@ public:
 
 public slots:
   void setFullScreen(bool fullScreen);
+  void setDisplayTestSignal(bool displayTestSignal);
 
 protected:
   void closeEvent(QCloseEvent* event);