working width, height, row, and column vars for blocks

Author: toddtreece

src/blocks/AdafruitIO_Block.cpp

@@ -27,6 +27,26 @@ String AdafruitIO_Block::properties()
   return props;
 }
 
+String AdafruitIO_Block::dimensions()
+{
+  String dim = "\",\"size_x\":\"";
+  dim += _width();
+  dim += "\",\"size_y\":\"";
+  dim += _height();
+
+  if(_row() > 0) {
+    dim += "\",\"row\":\"";
+    dim += _row();
+  }
+
+  if(_column() > 0) {
+    dim += "\",\"column\":\"";
+    dim += _column();
+  }
+
+  return dim;
+}
+
 const char* AdafruitIO_Block::type()
 {
   return _visual_type;
@@ -53,16 +73,15 @@ bool AdafruitIO_Block::save()
 
   String body = "{\"visual_type\":\"";
   body += type();
+  body += dimensions();
   body += "\",\"properties\":";
   body += properties();
-  body += "\,\"size_x\":\"";
-  body += width;
-  body += "\",\"size_y\":\"";
-  body += height;
-  body += "\",\"block_feeds\":";
+  body += ",\"block_feeds\":";
   body += block_feeds;
   body += "}";
 
+  Serial.println(body);
+
   http->startRequest(url.c_str(), HTTP_METHOD_POST);
   http->sendHeader(HTTP_HEADER_CONTENT_TYPE, "application/json");
   http->sendHeader(HTTP_HEADER_CONTENT_LENGTH, body.length());

src/blocks/AdafruitIO_Block.h

@@ -26,19 +26,27 @@ class AdafruitIO_Block {
 
     int width = 2;
     int height = 2;
-    int row;
-    int column;
+    int row = 0;
+    int column = 0;
 
     virtual String properties();
+    String dimensions();
+
     virtual const char* type();
 
     bool save();
 
-  private:
+  protected:
     AdafruitIO_Dashboard *_dashboard;
     AdafruitIO_Feed *_feed;
+
     const char *_visual_type;
 
+    virtual int _width() { return width; }
+    virtual int _height() { return height; }
+    virtual int _row() { return row; }
+    virtual int _column() { return column; }
+
 };
 
 #endif // ADAFRUITIO_BLOCK_H

src/blocks/ChartBlock.h

@@ -21,6 +21,7 @@ class ChartBlock : public AdafruitIO_Block {
     ~ChartBlock();
 
     const char* type() { return _visual_type; }
+
     int historyHours;
     const char *xAxisLabel;
     const char *yAxisLabel;
@@ -32,9 +33,14 @@ class ChartBlock : public AdafruitIO_Block {
 
     String properties();
 
-  private:
+  protected:
     const char *_visual_type = "line_chart";
 
+    int _width() { return width; }
+    int _height() { return height; }
+    int _row() { return row; }
+    int _column() { return column; }
+
 };
 
 #endif // ADAFRUITIO_CHARTBLOCK_H

src/blocks/ColorBlock.h

@@ -25,9 +25,16 @@ class ColorBlock : public AdafruitIO_Block {
 
     const char* type() { return _visual_type; }
 
-  private:
+  protected:
+
     const char *_visual_type = "color_picker";
 
+    int _width() { return width; }
+    int _height() { return height; }
+    int _row() { return row; }
+    int _column() { return column; }
+
+
 };
 
 #endif // ADAFRUITIO_COLORBLOCK_H

src/blocks/GaugeBlock.h

@@ -31,10 +31,14 @@ class GaugeBlock : public AdafruitIO_Block {
 
     String properties();
     const char* type() { return _visual_type; }
-
-  private:
+  protected:
     const char *_visual_type = "gauge";
 
+    int _width() { return width; }
+    int _height() { return height; }
+    int _row() { return row; }
+    int _column() { return column; }
+
 };
 
 #endif // ADAFRUITIO_GAUGEBLOCK_H

src/blocks/ImageBlock.h

@@ -25,9 +25,14 @@ class ImageBlock : public AdafruitIO_Block {
 
     const char* type() { return _visual_type; }
 
-  private:
+  protected:
     const char *_visual_type = "image";
 
+    int _width() { return width; }
+    int _height() { return height; }
+    int _row() { return row; }
+    int _column() { return column; }
+
 };
 
 #endif // ADAFRUITIO_IMAGEBLOCK_H

src/blocks/MapBlock.h

@@ -29,9 +29,15 @@ class MapBlock : public AdafruitIO_Block {
     String properties();
     const char* type() { return _visual_type; }
 
-  private:
+  protected:
     const char *_visual_type = "map";
 
+    int _width() { return width; }
+    int _height() { return height; }
+    int _row() { return row; }
+    int _column() { return column; }
+
+
 };
 
 #endif // ADAFRUITIO_MAPBLOCK_H

src/blocks/MomentaryBlock.h

@@ -30,9 +30,15 @@ class MomentaryBlock : public AdafruitIO_Block {
     String properties();
     const char* type() { return _visual_type; }
 
-  private:
+  protected:
     const char *_visual_type = "momentary_button";
 
+    int _width() { return width; }
+    int _height() { return height; }
+    int _row() { return row; }
+    int _column() { return column; }
+
+
 };
 
 #endif // ADAFRUITIO_MOMENTARYBLOCK_H

src/blocks/SliderBlock.h

@@ -31,9 +31,15 @@ class SliderBlock : public AdafruitIO_Block {
     String properties();
     const char* type() { return _visual_type; }
 
-  private:
+  protected:
     const char *_visual_type = "slider";
 
+    int _width() { return width; }
+    int _height() { return height; }
+    int _row() { return row; }
+    int _column() { return column; }
+
+
 };
 
 #endif // ADAFRUITIO_SLIDERBLOCK_H

src/blocks/StreamBlock.h

@@ -32,9 +32,14 @@ class StreamBlock : public AdafruitIO_Block {
     String properties();
     const char* type() { return _visual_type; }
 
-  private:
+  protected:
     const char *_visual_type = "stream";
 
+    int _width() { return width; }
+    int _height() { return height; }
+    int _row() { return row; }
+    int _column() { return column; }
+
 };
 
 #endif // ADAFRUITIO_STREAMBLOCK_H