moved rect calls to Width, Height, not end point

Kirk · Kirk · commit 2a8aab9dabf6 · 2022-03-20T09:55:01.000-06:00
diff --git a/examples/Example-01_Hello/Example-01_Hello.ino b/examples/Example-01_Hello/Example-01_Hello.ino
@@ -118,7 +118,7 @@ void setup()
     // Do a simple test - fill a rectangle on the screen and then print hello!
 
     // fill a rectangle on the screen that has a 4 pixel board
-    myOLED.rectangleFill(4, 4, myOLED.getWidth()-4, myOLED.getHeight()-4);
+    myOLED.rectangleFill(4, 4, myOLED.getWidth()-8, myOLED.getHeight()-8);
 
     String hello = "hello"; // our message
 
diff --git a/examples/Example-02_Shapes/Example-02_Shapes.ino b/examples/Example-02_Shapes/Example-02_Shapes.ino
@@ -192,7 +192,7 @@ void line_test_vert(void){
 // Simple - draw a rectangle test
 void rect_test(void){
 
-    myOLED.rectangle(4, 4, width-4, height-4);
+    myOLED.rectangle(4, 4, width-8, height-8);
 
 }
 
@@ -213,11 +213,11 @@ void rect_test_move(void){
     for(int i = 0; i < steps; i++){
 
         // Draw the rectangle and send it to device
-        myOLED.rectangle(x, y, x+side, y+side);
+        myOLED.rectangle(x, y, side, side);
         myOLED.display(); // sends erased rect and new rect pixels to device
 
         // Erase the that rect, increment and loop
-        myOLED.rectangle(x, y, x+side, y+side, 0);
+        myOLED.rectangle(x, y, side, side, 0);
 
         x += xinc;
         y += yinc;       
@@ -233,12 +233,12 @@ void rect_test_move(void){
 
 void rect_fill_test(void){
 
-    myOLED.rectangleFill(4, 4, width/2-4, height-4);
+    myOLED.rectangleFill(4, 4, width/2-8, height-8);
 
-    myOLED.rectangleFill(width/2+4, 4, width-4, height-4);
+    myOLED.rectangleFill(width/2+4, 4, width/2-8, height-8);
 
     myOLED.setDrawMode(grROPXOR);   // xor
-    myOLED.rectangleFill(width/4, 8, width - width/4, height-8);
+    myOLED.rectangleFill(width/4, 8, width/2, height-16);
     myOLED.setDrawMode(grROPCopy);  // back to copy op (default)
 }
 
diff --git a/examples/Example-08_Multi/Example-08_Multi.ino b/examples/Example-08_Multi/Example-08_Multi.ino
@@ -60,9 +60,9 @@
 //
 // The default is Micro OLED
 
-//#define MICRO
+#define MICRO
 //#define NARROW
-#define TRANSPARENT
+//#define TRANSPARENT
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
@@ -201,10 +201,10 @@ void shapeExample()
     myOLED.erase();
     
     // Draw an outline of the screen:
-    myOLED.rectangle(0, 0, width-1,  height-1);
+    myOLED.rectangle(0, 0, width-1,  height);
     
     // Draw the center line
-    myOLED.rectangleFill( width/ 2 - 1, 0, width/2 + 1, height-1);
+    myOLED.rectangleFill( width/ 2 - 1, 0, 2, height);
 
     bool firstLoop = true; 
 
@@ -214,10 +214,10 @@ void shapeExample()
 
             // Erase the old ball. In XOR mode, so just draw old values again!
             // Draw the Paddles:
-            myOLED.rectangleFill(paddle0_X, paddle0_Y, paddle0_X+paddleW, paddle0_Y+paddleH);
-            myOLED.rectangleFill(paddle1_X, paddle1_Y, paddle1_X+paddleW, paddle1_Y+paddleH);
+            myOLED.rectangleFill(paddle0_X, paddle0_Y, paddleW, paddleH);
+            myOLED.rectangleFill(paddle1_X, paddle1_Y, paddleW, paddleH);
             // Draw the ball: - use rect - xor and circle fails b/c of circle algorithm overdraws
-            myOLED.rectangleFill(ball_X, ball_Y, ball_X+ball_rad, ball_Y+ball_rad);   
+            myOLED.rectangleFill(ball_X, ball_Y, ball_rad, ball_rad);   
         }
         // Increment ball's position
         ball_X += ballVelocityX;
@@ -265,11 +265,11 @@ void shapeExample()
             paddle1Velocity = -paddle1Velocity;
 
         // Draw the Paddles:
-        myOLED.rectangleFill(paddle0_X, paddle0_Y, paddle0_X+paddleW, paddle0_Y+paddleH);
-        myOLED.rectangleFill(paddle1_X, paddle1_Y, paddle1_X+paddleW, paddle1_Y+paddleH);
+        myOLED.rectangleFill(paddle0_X, paddle0_Y, paddleW, paddleH);
+        myOLED.rectangleFill(paddle1_X, paddle1_Y, paddleW, paddleH);
 
         // Draw the ball:
-        myOLED.rectangleFill(ball_X, ball_Y, ball_X+ball_rad, ball_Y+ball_rad);
+        myOLED.rectangleFill(ball_X, ball_Y, ball_rad, ball_rad);
 
         // Actually draw everything on the screen:
         myOLED.display();
diff --git a/src/SparkFun_Qwiic_OLED.h b/src/SparkFun_Qwiic_OLED.h
@@ -474,12 +474,12 @@ class QwiicOLEDBaseClass : public Print {   // NOTE: implementing Arduino Print
     // ---------    -----------------------------
     // x0           The start X coordinate of the rectangle - upper left corner
     // y0           The start Y coordinate of the rectangle - upper left corner
-    // x1           The end X coordinate of the rectangle - lower right corner
-    // y1           The end Y coordinate of the rectangle - lower right corner
+    // width        The width of the rectangle
+    // height       The height of the rectangle    
     // clr          optional The color value to draw the rectangle. This defaults to white (1).
 
-    void rectangle(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr=COLOR_WHITE){
-        _device.rectangle(x0, y0, x1, y1, clr);
+    void rectangle(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr=COLOR_WHITE){
+        _device.rectangle(x0, y0, width, height, clr);
     }    
 
     ///////////////////////////////////////////////////////////////////////
@@ -491,12 +491,12 @@ class QwiicOLEDBaseClass : public Print {   // NOTE: implementing Arduino Print
     // ---------    -----------------------------
     // x0           The start X coordinate of the rectangle - upper left corner
     // y0           The start Y coordinate of the rectangle - upper left corner
-    // x1           The end X coordinate of the rectangle - lower right corner
-    // y1           The end Y coordinate of the rectangle - lower right corner
+    // width        The width of the rectangle
+    // height       The height of the rectangle
     // clr          optional The color value to draw the filled rectangle. This defaults to white (1).
 
-    void rectangleFill(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr=COLOR_WHITE){
-        _device.rectangle_fill(x0, y0, x1, y1, clr);
+    void rectangleFill(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr=COLOR_WHITE){
+        _device.rectangle_fill(x0, y0, width, height, clr);
     }
 
     ///////////////////////////////////////////////////////////////////////
diff --git a/src/qwiic_grbuffer.cpp b/src/qwiic_grbuffer.cpp
@@ -312,28 +312,22 @@ void QwGrBufferDevice::draw_line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,
 //
 // Draw a rectangle on screen.
 
-void QwGrBufferDevice::rectangle(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr){
+void QwGrBufferDevice::rectangle(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr){
 
     // Is this a line?
-    if(x0 == x1 || y0 == y1){
+    if(width <=1 || height <=1){
         // this is a line
-        line(x0, y0, x1, y1);
+        line(x0, y0, x0+width-1, y0+height-1);
         return;
     }
 
-    // Sanity check
-    if(x0 > x1 || y0 > y1){
-        swap_int(x0, x1);
-        swap_int(y0, y1);
-    }
-
     // bounds check
     if(x0 >= _viewport.width || y0 >= _viewport.height)
         return; // not on screen
 
     // Send to drawing routine. 
 
-    (*_idraw.draw_rect)(this, x0, y0, x1, y1, clr);
+    (*_idraw.draw_rect)(this, x0, y0, width, height, clr);
 
 }
 
@@ -342,11 +336,14 @@ void QwGrBufferDevice::rectangle(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,
 //
 // Does the actual drawing/logic
 
-void QwGrBufferDevice::draw_rect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr){
+void QwGrBufferDevice::draw_rect(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr){
 
 
     // A rect is really just a series of vert and horz lines 
 
+    uint8_t x1 = x0 + width-1;
+    uint8_t y1 = y0 + height-1;
+
     (*_idraw.draw_line_horz)(this, x0, y0, x1, y0, clr);
     (*_idraw.draw_line_horz)(this, x0, y1, x1, y1, clr);
 
@@ -364,37 +361,34 @@ void QwGrBufferDevice::draw_rect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,
 ////////////////////////////////////////////////////////////////////////////////////////
 // rectangle_fill()
 
-void QwGrBufferDevice::rectangle_fill(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr){
+void QwGrBufferDevice::rectangle_fill(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr){
 
 
-    if(x0 == x1 || y0 == y1){
+    // Is this a line?
+    if(width <=1 || height <=1){
         // this is a line
-        line(x0, y0, x1, y1);
+        line(x0, y0, x0+width-1, y0+height-1);
         return;
     }
-
-    // Sanity check
-    if(x0 > x1 || y0 > y1){
-        swap_int(x0, x1);
-        swap_int(y0, y1);
-    }
-
     // bounds check
     if(x0 >= _viewport.width || y0 >= _viewport.height)
         return; // not on screen
 
     // Send to drawing routine. 
 
-    (*_idraw.draw_rect_filled)(this, x0, y0, x1, y1, clr);
+    (*_idraw.draw_rect_filled)(this, x0, y0, width, height, clr);
 
 }
 ////////////////////////////////////////////////////////////////////////////////////////
 // draw_rect_fill()
 //
 // Does the actual drawing/logic
 
-void QwGrBufferDevice::draw_rect_filled(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr){
+void QwGrBufferDevice::draw_rect_filled(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr){
+
 
+    uint8_t x1 = x0 + width-1;
+    uint8_t y1 = y0 + height-1;
 
     // Just draw vertical lines 
     for(int i=x0; i <= x1; i++)
diff --git a/src/qwiic_grbuffer.h b/src/qwiic_grbuffer.h
@@ -104,8 +104,8 @@ class _QwIDraw{
     virtual void draw_line_vert(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr){}  
 
     // Rectangles
-    virtual void draw_rect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr){}
-    virtual void draw_rect_filled(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr){}    
+    virtual void draw_rect(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr){}
+    virtual void draw_rect_filled(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr){}    
 
     //Circles
     virtual void draw_circle(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t clr){} 
diff --git a/src/qwiic_grssd1306.cpp b/src/qwiic_grssd1306.cpp
@@ -238,13 +238,6 @@ bool QwGrSSD1306::init(void){
     if(!this->QwGrBufferDevice::init())
         return false; // something isn't right
 
-    // At this point, the main device interface is filled in. This classes draw_line_vert()
-    // can also draw filled rects, so hack the device table to have draw_rect_filled points
-    // to this classes draw_line_vert(), which should be the method in the draw_line_vert entry
-    // of the draw interface.
-
-    _idraw.draw_rect_filled = _idraw.draw_line_vert;
-
     // Start the device setup - sending commands to device. See command defs in header, and
     // device datasheet
     send_dev_command(kCmdDisplayOff);
@@ -679,7 +672,21 @@ void QwGrSSD1306::draw_line_vert(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,
     }
 
 }
+////////////////////////////////////////////////////////////////////////////////////////
+// draw_rect_fill()
+//
+// Does the actual drawing/logic
+
+void QwGrSSD1306::draw_rect_filled(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr){
 
+
+    uint8_t x1 = x0 + width-1;
+    uint8_t y1 = y0 + height-1;
+
+    // just call vert line
+    draw_line_vert(x0, y0, x1, y1, clr);
+
+}
 ////////////////////////////////////////////////////////////////////////////////////
 // draw_bitmap()
 //
diff --git a/src/qwiic_grssd1306.h b/src/qwiic_grssd1306.h
@@ -215,6 +215,9 @@ class QwGrSSD1306 :  public QwGrBufferDevice {
     void draw_line_horz(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr);
     void draw_line_vert(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t clr);   
 
+    // fast rect fill 
+    void draw_rect_filled(uint8_t x0, uint8_t y0, uint8_t width, uint8_t height, uint8_t clr);
+    
     // >> Fast Bitmap <<
     void draw_bitmap(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, 
                      uint8_t *pBitmap, uint8_t bmp_width, uint8_t bmp_height );
