Properly show/hide canvas bounds.

jasonsikes · Nov 29, 2022 · 981aa1d · 981aa1d
1 parent 3f8ceaa
commit 981aa1d
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 3 deletions.
diff --git a/canvas.h b/canvas.h
@@ -221,6 +221,12 @@ class Canvas : public QOpenGLWidget, protected QOpenGLFunctions {
   /// Set the maximum X and Y bounds
   void setBounds(double x, double y);
 
+  /// Set whether the view should use the whole widget or a box within
+  void setIsBounded(bool aIsBounded) { canvasIsBounded = aIsBounded; update(); }
+
+  /// Returns true if the bounds are drawn
+  bool isBounded() { return canvasIsBounded; }
+
   /// Return a screenshot of the canvas
   QImage getImage();
 

diff --git a/constants.h b/constants.h
@@ -64,6 +64,7 @@ enum messageCategory : message_t {
     C_CANVAS_CLEAR_SCREEN,            // Clear the graphics screen
     C_CANVAS_SET_BACKGROUND_COLOR,    // Set the canvas background color
     C_CANVAS_SETBOUNDS,               // Set the X and Y bounds of the drawing surface area
+    C_CANVAS_SET_IS_BOUNDED,          // Determine whether canvas draws in a box or whole widget
     C_CANVAS_SET_PENSIZE,             // Set the drawing pen size
     C_CANVAS_SET_FONT_NAME,           // Set the label font name
     C_CANVAS_SET_FONT_SIZE,           // Set the label font size

diff --git a/kernel_graphics.cpp b/kernel_graphics.cpp
@@ -311,7 +311,11 @@ DatumP Kernel::excWrap(DatumP node) {
   TurtleModeEnum newMode = turtleWrap;
   if (mainTurtle()->getMode() != newMode) {
     mainTurtle()->setMode(newMode);
-    mainController()->setIsCanvasBounded(true);
+    if (mainController()->isCanvasBounded() == false) {
+        mainController()->setIsCanvasBounded(true);
+        mainTurtle()->home(false);
+        mainController()->clearScreen();
+    }
   }
   return h.ret();
 }
@@ -331,7 +335,11 @@ DatumP Kernel::excFence(DatumP node) {
   TurtleModeEnum newMode = turtleFence;
   if (mainTurtle()->getMode() != newMode) {
     mainTurtle()->setMode(newMode);
-    mainController()->setIsCanvasBounded(true);
+    if (mainController()->isCanvasBounded() == false) {
+        mainController()->setIsCanvasBounded(true);
+        mainTurtle()->home(false);
+        mainController()->clearScreen();
+    }
   }
   return h.ret();
 }

diff --git a/logocontroller.h b/logocontroller.h
@@ -109,7 +109,8 @@ class LogoController : public QObject {
 
   virtual void setPensize(double) { Error::noGraphics(); }
   virtual bool isPenSizeValid(double) { Error::noGraphics(); return false; }
-  void setIsCanvasBounded(bool) { Error::noGraphics(); }
+  virtual void setIsCanvasBounded(bool) { Error::noGraphics(); }
+  virtual bool isCanvasBounded() { Error::noGraphics(); return false; }
   void setSplitterSizeRatios(float, float) { Error::noGraphics(); }
 
   Kernel *kernel;

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -394,6 +394,13 @@ void MainWindow::readStandardOutput()
             ui->mainCanvas->setBounds(x, y);
             break;
         }
+        case C_CANVAS_SET_IS_BOUNDED:
+        {
+            bool isBounded;
+            *dataStream >> isBounded;
+            ui->mainCanvas->setIsBounded(isBounded);
+            break;
+        }
         case C_CANVAS_SET_FONT_NAME:
         {
             QString name;

diff --git a/qlogocontroller.cpp b/qlogocontroller.cpp
@@ -331,6 +331,21 @@ ScreenModeEnum QLogoController::getScreenMode()
     return screenMode;
 }
 
+void QLogoController::setIsCanvasBounded(bool aIsBounded)
+{
+    if (canvasIsBounded == aIsBounded)
+        return;
+    canvasIsBounded = aIsBounded;
+    sendMessage([&](QDataStream *out) {
+      *out << (message_t)C_CANVAS_SET_IS_BOUNDED << aIsBounded;
+    });
+}
+
+bool QLogoController::isCanvasBounded()
+{
+    return canvasIsBounded;
+}
+
 void QLogoController::setTurtleIsVisible(bool isVisible)
 {
     sendMessage([&](QDataStream *out) {

diff --git a/qlogocontroller.h b/qlogocontroller.h
@@ -37,6 +37,7 @@ class QLogoController : public LogoController
 
     double xbound;
     double ybound;
+    bool canvasIsBounded = true;
 
     QColor currentBackgroundColor;
     QImage canvasImage;
@@ -83,6 +84,8 @@ class QLogoController : public LogoController
     double boundX() { return xbound; }
     double boundY() { return ybound; }
     QColor getCanvasBackgroundColor(void);
+    void setIsCanvasBounded(bool aIsBounded);
+    bool isCanvasBounded();
 
     bool isPenSizeValid(double candidate) { return ((candidate >= minPensize) && (candidate <= maxPensize)); }
     QImage getCanvasImage();