add width and height defaults to blocks

toddtreece · toddtreece · commit 1dfd2ba58aad · 2016-10-27T14:32:42.000-04:00
diff --git a/src/blocks/AdafruitIO_Block.h b/src/blocks/AdafruitIO_Block.h
@@ -26,6 +26,8 @@ class AdafruitIO_Block {
 
     int width = 2;
     int height = 2;
+    int row;
+    int column;
 
     virtual String properties();
     virtual const char* type();
diff --git a/src/blocks/ChartBlock.cpp b/src/blocks/ChartBlock.cpp
@@ -18,7 +18,6 @@ ChartBlock::ChartBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : AdafruitIO
   yAxisLabel = "Y";
   yAxisMin = 0;
   yAxisMax = 100;
-  _visual_type = "line_chart";
 }
 
 ChartBlock::~ChartBlock(){}
diff --git a/src/blocks/ChartBlock.h b/src/blocks/ChartBlock.h
@@ -27,10 +27,13 @@ class ChartBlock : public AdafruitIO_Block {
     int yAxisMin;
     int yAxisMax;
 
+    int width = 6;
+    int height = 4;
+
     String properties();
 
   private:
-    const char *_visual_type;
+    const char *_visual_type = "line_chart";
 
 };
 
diff --git a/src/blocks/ColorBlock.h b/src/blocks/ColorBlock.h
@@ -20,6 +20,9 @@ class ColorBlock : public AdafruitIO_Block {
     ColorBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : AdafruitIO_Block(d, f) {}
     ~ColorBlock() {}
 
+    int width = 4;
+    int height = 4;
+
     const char* type() { return _visual_type; }
 
   private:
diff --git a/src/blocks/GaugeBlock.cpp b/src/blocks/GaugeBlock.cpp
@@ -15,9 +15,8 @@ GaugeBlock::GaugeBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : AdafruitIO
 {
   min = 0;
   max = 100;
-  width = "thin";
+  ringWidth = "thin";
   label = "Value";
-  _visual_type = "gauge";
 }
 
 GaugeBlock::~GaugeBlock(){}
@@ -26,7 +25,7 @@ String GaugeBlock::properties()
 {
   int w = 0;
 
-  if(width == "thin") {
+  if(ringWidth == "thin") {
     w = 25;
   } else {
     w = 50;
diff --git a/src/blocks/GaugeBlock.h b/src/blocks/GaugeBlock.h
@@ -22,14 +22,18 @@ class GaugeBlock : public AdafruitIO_Block {
 
     int min;
     int max;
-    const char *width;
+
+    const char *ringWidth;
     const char *label;
 
+    int width = 4;
+    int height = 4;
+
     String properties();
     const char* type() { return _visual_type; }
 
   private:
-    const char *_visual_type;
+    const char *_visual_type = "gauge";
 
 };
 
diff --git a/src/blocks/ImageBlock.h b/src/blocks/ImageBlock.h
@@ -19,6 +19,10 @@ class ImageBlock : public AdafruitIO_Block {
   public:
     ImageBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : AdafruitIO_Block(d, f) {}
     ~ImageBlock() {}
+
+    int height = 6;
+    int width = 4;
+
     const char* type() { return _visual_type; }
 
   private:
diff --git a/src/blocks/MapBlock.cpp b/src/blocks/MapBlock.cpp
@@ -15,7 +15,6 @@ MapBlock::MapBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : AdafruitIO_Blo
 {
   historyHours = 0;
   tile = "contrast";
-  _visual_type = "map";
 }
 
 MapBlock::~MapBlock(){}
diff --git a/src/blocks/MapBlock.h b/src/blocks/MapBlock.h
@@ -23,11 +23,14 @@ class MapBlock : public AdafruitIO_Block {
     int historyHours;
     const char *tile;
 
+    int width = 4;
+    int height = 4;
+
     String properties();
     const char* type() { return _visual_type; }
 
   private:
-    const char *_visual_type;
+    const char *_visual_type = "map";
 
 };
 
diff --git a/src/blocks/MomentaryBlock.cpp b/src/blocks/MomentaryBlock.cpp
@@ -16,7 +16,6 @@ MomentaryBlock::MomentaryBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : Ad
   text = "RESET";
   value = "1";
   release = "0";
-  _visual_type = "momentary_button";
 }
 
 MomentaryBlock::~MomentaryBlock(){}
diff --git a/src/blocks/MomentaryBlock.h b/src/blocks/MomentaryBlock.h
@@ -24,11 +24,14 @@ class MomentaryBlock : public AdafruitIO_Block {
     const char *value;
     const char *release;
 
+    int width = 2;
+    int height = 2;
+
     String properties();
     const char* type() { return _visual_type; }
 
   private:
-    const char *_visual_type;
+    const char *_visual_type = "momentary_button";
 
 };
 
diff --git a/src/blocks/SliderBlock.cpp b/src/blocks/SliderBlock.cpp
@@ -17,7 +17,6 @@ SliderBlock::SliderBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : Adafruit
   max = 100;
   step = 10;
   label = "Value";
-  _visual_type = "slider";
 }
 
 SliderBlock::~SliderBlock(){}
diff --git a/src/blocks/SliderBlock.h b/src/blocks/SliderBlock.h
@@ -25,11 +25,14 @@ class SliderBlock : public AdafruitIO_Block {
     int step;
     const char *label;
 
+    int width = 4;
+    int height = 2;
+
     String properties();
     const char* type() { return _visual_type; }
 
   private:
-    const char *_visual_type;
+    const char *_visual_type = "slider";
 
 };
 
diff --git a/src/blocks/StreamBlock.cpp b/src/blocks/StreamBlock.cpp
@@ -18,7 +18,6 @@ StreamBlock::StreamBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : Adafruit
   showErrors = true;
   showTimestamp = true;
   showName = true;
-  _visual_type = "stream";
 }
 
 StreamBlock::~StreamBlock(){}
diff --git a/src/blocks/StreamBlock.h b/src/blocks/StreamBlock.h
@@ -26,11 +26,14 @@ class StreamBlock : public AdafruitIO_Block {
     bool showTimestamp;
     bool showName;
 
+    int width = 6;
+    int height = 4;
+
     String properties();
     const char* type() { return _visual_type; }
 
   private:
-    const char *_visual_type;
+    const char *_visual_type = "stream";
 
 };
 
diff --git a/src/blocks/TextBlock.cpp b/src/blocks/TextBlock.cpp
@@ -14,7 +14,6 @@
 TextBlock::TextBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : AdafruitIO_Block(d, f)
 {
   fontSize = "small";
-  _visual_type = "text";
 }
 
 TextBlock::~TextBlock(){}
diff --git a/src/blocks/TextBlock.h b/src/blocks/TextBlock.h
@@ -22,11 +22,14 @@ class TextBlock : public AdafruitIO_Block {
 
     const char *fontSize;
 
+    int width = 2;
+    int height = 1;
+
     String properties();
     const char* type() { return _visual_type; }
 
   private:
-    const char *_visual_type;
+    const char *_visual_type = "text";
 
 };
 
diff --git a/src/blocks/ToggleBlock.cpp b/src/blocks/ToggleBlock.cpp
@@ -15,7 +15,6 @@ ToggleBlock::ToggleBlock(AdafruitIO_Dashboard *d, AdafruitIO_Feed *f) : Adafruit
 {
   onText = "1";
   offText = "0";
-  _visual_type = "toggle_button";
 }
 
 ToggleBlock::~ToggleBlock(){}
diff --git a/src/blocks/ToggleBlock.h b/src/blocks/ToggleBlock.h
@@ -23,11 +23,14 @@ class ToggleBlock : public AdafruitIO_Block {
     const char *onText;
     const char *offText;
 
+    int width = 4;
+    int height = 2;
+
     String properties();
     const char* type() { return _visual_type; }
 
   private:
-    const char *_visual_type;
+    const char *_visual_type = "toggle_button";
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ ChartBlock::ChartBlock(AdafruitIO_Dashboard d, AdafruitIO_Feed f) : AdafruitIO`
`18`	`18`	`yAxisLabel = "Y";`
`19`	`19`	`yAxisMin = 0;`
`20`	`20`	`yAxisMax = 100;`
`21`		`- _visual_type = "line_chart";`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`ChartBlock::~ChartBlock(){}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,8 @@ GaugeBlock::GaugeBlock(AdafruitIO_Dashboard d, AdafruitIO_Feed f) : AdafruitIO`
`15`	`15`	`{`
`16`	`16`	`min = 0;`
`17`	`17`	`max = 100;`
`18`		`- width = "thin";`
	`18`	`+ ringWidth = "thin";`
`19`	`19`	`label = "Value";`
`20`		`- _visual_type = "gauge";`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`GaugeBlock::~GaugeBlock(){}`
`@@ -26,7 +25,7 @@ String GaugeBlock::properties()`
`26`	`25`	`{`
`27`	`26`	`int w = 0;`
`28`	`27`
`29`		`- if(width == "thin") {`
	`28`	`+ if(ringWidth == "thin") {`
`30`	`29`	`w = 25;`
`31`	`30`	`} else {`
`32`	`31`	`w = 50;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ MapBlock::MapBlock(AdafruitIO_Dashboard d, AdafruitIO_Feed f) : AdafruitIO_Blo`
`15`	`15`	`{`
`16`	`16`	`historyHours = 0;`
`17`	`17`	`tile = "contrast";`
`18`		`- _visual_type = "map";`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`MapBlock::~MapBlock(){}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ MomentaryBlock::MomentaryBlock(AdafruitIO_Dashboard d, AdafruitIO_Feed f) : Ad`
`16`	`16`	`text = "RESET";`
`17`	`17`	`value = "1";`
`18`	`18`	`release = "0";`
`19`		`- _visual_type = "momentary_button";`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`MomentaryBlock::~MomentaryBlock(){}`