Revision 6:2f220f5d782d, committed 2013-04-21

Comitter:

Rybowonder

Date:

Sun Apr 21 20:46:28 2013 +0000

Parent:

5:92389cf2106d

Child:

7:df9f5b6dd4ed

Commit message:

Error in code

Changed in this revision

--- a/CdisplayItem.cpp	Sun Apr 21 20:15:31 2013 +0000
+++ b/CdisplayItem.cpp	Sun Apr 21 20:46:28 2013 +0000
@@ -54,8 +54,9 @@
 {
     printRec(x1, y1, x2, y2);
 }
-
+/*
 void CdisplayItem::DeleteCrect(int x1, int y1, int x2, int y2)
 {
     eraseRec(x1, y1, x2, y2);
 }
+*/
\ No newline at end of file

--- a/CdisplayItem.h	Sun Apr 21 20:15:31 2013 +0000
+++ b/CdisplayItem.h	Sun Apr 21 20:46:28 2013 +0000
@@ -30,7 +30,7 @@
     void erase();
     void setValue(char *);
     void Crect(int x1, int y1, int x2, int y2);
-    void DeleteCrect(int x1, int y1, int x2, int y2);
+ //   void DeleteCrect(int x1, int y1, int x2, int y2);
 
 
 #endif /* defined(__menuSystem__menuItem__) */

--- a/Constantdisplay.cpp	Sun Apr 21 20:15:31 2013 +0000
+++ b/Constantdisplay.cpp	Sun Apr 21 20:46:28 2013 +0000
@@ -41,12 +41,12 @@
 {
     CdisplayItem[ID].Crect(x1, y1, x2, y2);
 }
-
+/*
 void Constantdisplay::deleterect(int ID, int x1, int y1, int x2, int y2)
 {
     CdisplayItem[ID].DeleteCrect(x1, y1, x2, y2);
 }
-
+*/
 /* itoa:  convert n to characters in s */
  void Constantdisplay::itoa(int n, char s[])
  {

--- a/Constantdisplay.h	Sun Apr 21 20:15:31 2013 +0000
+++ b/Constantdisplay.h	Sun Apr 21 20:46:28 2013 +0000
@@ -13,7 +13,7 @@
 
 class Constantdisplay {
     static const int MAXCDISPLAYITEMS = 3;
-    CdisplayItem CdisplayItem[MAXCDISPLAYITEMS];    
+    CdisplayItem CdisplayItem[MAXCDISPLAYITEMS];
     int maxitems;
 
 public:
@@ -22,7 +22,7 @@
     void setMaxCdisplayItems(int max);
     void printCdisplay();
     void printrect(int ID, int x1, int y1, int x2, int y2);
-    void deleterect(int ID, int x1, int y1, int x2, int y2);
+ //   void deleterect(int ID, int x1, int y1, int x2, int y2);
     void erase();
     void updatedisplayitem(int ID, char * updateText);
     void itoa(int n, char s[]);

--- a/console.cpp	Sun Apr 21 20:15:31 2013 +0000
+++ b/console.cpp	Sun Apr 21 20:46:28 2013 +0000
@@ -42,11 +42,12 @@
 {
     lcd.rect(x1, y1, x2, y2);
 }
-
+/*
 void eraseRec(int x1, int y1, int x2, int y2)
 {
     lcd.erase(x1, y1, x2, y2);
 }
+*/
 //
 // Set text and background colors
 //

--- a/console.h	Sun Apr 21 20:15:31 2013 +0000
+++ b/console.h	Sun Apr 21 20:46:28 2013 +0000
@@ -14,6 +14,6 @@
 void printXY( char * text, int x, int y);
 void setrgb(int);
 void printRec(int x1, int y1, int x2, int y2);
-void eraseRec(int x1, int y1, int x2, int y2);
+//void eraseRec(int x1, int y1, int x2, int y2);
 
 #endif
\ No newline at end of file