Diff: Block.cpp

Revision:

26:bbcc25418ffa

Parent:

20:4e0f0944f28f

Child:

29:9c0339e3c593

--- a/Block.cpp	Mon Nov 30 15:06:38 2015 +0000
+++ b/Block.cpp	Mon Nov 30 21:29:51 2015 +0000
@@ -31,11 +31,17 @@
 	setAlpha(rhs.getAlpha());
 }
 
+void Colour::printDescription(){
+//	pc.printf("Red: %.3f, Green: %.3f, Blue: %.3f, Clear: %.3f\n", this->component[0], this->component[1], this->component[2], this->component[3]);
+}
+
 Block::Block(){
 	this->size = Small;
 	this->minColour = Colour();
 	this->averageColour = Colour();
 	this->maxColour = Colour();
+//		this->minError = {0, 0, 0, 0};
+//	this->maxError = {0, 0, 0, 0};
 }
 Block::Block(Size size) {
 	// TODO Auto-generated constructor stub
@@ -43,6 +49,8 @@
 	this->minColour = Colour();
 	this->maxColour = Colour();
 	this->averageColour = Colour();
+//		this->minError = {0, 0, 0, 0};
+//	this->maxError = {0, 0, 0, 0};
 }
 
 Block::Block(Size size, Colour minColour, Colour maxColour, Colour averageColour){
@@ -50,6 +58,8 @@
 	this->minColour = Colour(minColour);
 	this->maxColour = Colour(maxColour);
 	this->averageColour = Colour(averageColour);
+//		this->minError = {0, 0, 0, 0};
+//	this->maxError = {0, 0, 0, 0};
 }
 
 Block::Block(const Block& rhs){
@@ -57,9 +67,14 @@
 	maxColour = Colour(rhs.maxColour);
 	averageColour = Colour(rhs.averageColour);
 	size = rhs.size;
+//	minError = rhs.minError;
+//	maxError = rhs.maxError;
 }
 
 Block::~Block() {
 	// TODO Auto-generated destructor stub
 }
 
+void Block::printDescription(){
+	
+}