implementing menu width foir GFX consistent selection draw

Author: neu-rah

Examples/menu_test/menu_test.ino

@@ -85,6 +85,8 @@ void setValue(prompt &p,menuOut &o, Stream &i,int &value,const char* text,const
 void ledOn() {digitalWrite(LEDPIN,1);}
 void ledOff() {digitalWrite(LEDPIN,0);}
 void disabledTest(prompt &p,menuOut &o,Stream &i) {
+  o.clear();
+  o.setCursor(0,0);
   o.print("THIS IS AN ERROR, this option should never be called as it is disabled");
   while(i.read()!=13);
 }
@@ -97,6 +99,7 @@ void setDutty(prompt &p,menuOut &o,Stream &i) {setValue(p,o,i,dutty,"Dutty:","%"
 
 void completeHandlerTest(prompt &p,menuOut &o,Stream &i) {
   o.clear();
+  o.setCursor(0,0);
   o.print("Handler test ok!");
   while(i.read()!=13);
 }
@@ -114,6 +117,17 @@ MENU(mainMenu,"Sistema",
   OP("Dutty",setDutty),
   OP("Disabled",disabledTest),
   OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
+  OP("Handler test",completeHandlerTest),
   SUBMENU(subMenu)
 );
 
@@ -144,6 +158,8 @@ menuGFX gfx(tft);
 ///////////////////////////////////////////////////////////////////////////////
 
 void setup() {
+  mainMenu.data[2]->enabled=false;//disabling option
+
   Serial.begin(9600);
   Serial.println("menu system test");
 
@@ -166,7 +182,7 @@ void setup() {
   lcd1.print("Menu test");
 
   digitalWrite(vpinsSPI_CS,HIGH);
-  digitalWrite(tftCS,LOW);
+  digitalWrite(tftCS,HIGH);
   tft.initR(INITR_BLACKTAB);
   tft.setRotation(3);
   tft.setTextWrap(false);
@@ -175,13 +191,22 @@ void setup() {
   tft.fillScreen(ST7735_BLACK);
   tft.print("Menu test on GFX");
   tft.setCursor(0,10);
+  
+  digitalWrite(vpinsSPI_CS,LOW);
+  digitalWrite(tftCS,LOW);
+  lcd1.setCursor(0,1);
+  lcd1.print(mainMenu.width);
+  digitalWrite(vpinsSPI_CS,HIGH);
+  digitalWrite(tftCS,HIGH);
+  
+  //update limits after screen rotation
+  gfx.maxX=tft.width()/gfx.resX;
+  gfx.maxY=tft.height()/gfx.resY;
 
   pinMode(encBtn, INPUT);
   digitalWrite(encBtn,1);
 
   pinMode(LEDPIN,OUTPUT);
-
-  mainMenu.data[2]->enabled=false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -211,7 +236,7 @@ void setValue(prompt &p,menuOut &o, Stream &i,int &value,const char* text,const
   int at=strlen(text);//.length();
   o.setCursor(0,0);
   o.print(text);
-  if (o.style==menuOut::enumerated) {//probably a Serial terminal -------------------------------------
+  /*if (o.style==menuOut::enumerated) {//probably a Serial terminal -------------------------------------
     //long timeout because some terminals send data righ away when typed, and parseInt would parse a partial number
     i.setTimeout(10000);//lib gives no access to previous timeout value :( ... cant restore it then, i would wait forever if possible
     value=i.parseInt();//assuming data was all delivered to the buffer (we had a large timeout)
@@ -221,7 +246,7 @@ void setValue(prompt &p,menuOut &o, Stream &i,int &value,const char* text,const
     i.setTimeout(1000);//assuming it was default
     Serial.println(value);//feed back
     while(i.available()) i.read();//clean up extra characters to avoid reentry
-  } else {// then we assume its some kind of encoder ---------------------------------------------------
+  } else {*/// then we assume its some kind of encoder ---------------------------------------------------
     if (!steps) steps=(hi-low)/(float)o.maxX;
     float fact=((float)sensivity)/((float)steps);//sensivity factor
     float pos=quadEncoder.pos*fact;
@@ -243,7 +268,7 @@ void setValue(prompt &p,menuOut &o, Stream &i,int &value,const char* text,const
         last=pos;
       }
       //func();
-    }
+    //}
     delay(100);
     while(encButton.read()==13);
   }

README.md

@@ -22,6 +22,6 @@ example of menu definition (c++ macros)
 
 input is read from generic streams, included simple streams for encoders and keyboards
 
-output to menuOut devices, included derivations to support serial and lcd
+output to menuOut devices, included derivations to support serial, GFX and lcd
 
 multiple stream packing for input allowing mixing encoder stream with encoder keyboard (usually 1 or 2 keys)

menu.cpp

@@ -9,11 +9,6 @@ char menu::enabledCursor='>';
 char menu::disabledCursor='-';
 prompt menu::exitOption(menu::exit);
 
-void menuOut::print(prompt &o,bool selected) {
-	print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
-	print(o.text);
-}
-
 int menu::menuKeys(menuOut &p,Stream& c) {
   int op=-2;
   do {
@@ -48,27 +43,27 @@ int menu::menuKeys(menuOut &p,Stream& c) {
 
 void menu::printMenu(menuOut& p) {
   p.clear();
-  if (p.style==menuOut::enumerated) {p.print(text); p.print("==========================");}
+  //if (p.style==menuOut::enumerated) {p.print(text); p.print("==========================");}
   if (sel-p.top>=p.maxY) p.top=sel-p.maxY+1;//selected option outside device (bottom)
   else if (sel<p.top) p.top=sel;//selected option outside device (top)
   int i=0;for(;i<sz;i++) {
     if ((i>=p.top)&&((i-p.top)<p.maxY)) {
-      p.setCursor(0,i-p.top);
+      //p.setCursor(0,i-p.top);
       if(i-p.top>=p.maxY) break;
-      if (p.style==menuOut::enumerated) {
+      /*if (p.style==menuOut::enumerated) {
         p.print(i<10?" ":"");
         p.print(i+1);
-      }
-      p.print(*data[i],i==sel);
+      }*/
+      p.print(*data[i],i==sel,i+1,i-p.top,width);
       /*p.print((i==sel)?data[i]->enabled?menu::enabledCursor:menu::disabledCursor:' ');
       p.print(data[i]->text);*/
     }
   }
   if (i-p.top<p.maxY) {
-    p.setCursor(0,i-p.top);
-    if (p.style==menuOut::enumerated) 
-      p.print(" 0");
-    p.print(exitOption,sel==sz);
+    //p.setCursor(0,i-p.top);
+    /*if (p.style==menuOut::enumerated) 
+      p.print(" 0");*/
+    p.print(exitOption,sel==sz,0,i-p.top,width);
     /*p.print(sel==sz?menu::enabledCursor:' ');
     p.println(menu::exit);*/
   }

menu.h

@@ -107,21 +107,23 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     //device resolution
     int resX;
     int resY;
-    enum styles {
+    /*enum styles {
       enumerated, //print numbers or references for options, adequated keyboard or file input
       cursor,//print a cursor at selected option, tracking device (encoder)
       point,//pointing device (not implemented)
-    } style;
+    } style;*/
     //menuOut(menuOut::styles style=menuOut::enumerated):maxX(0),maxY(0),style(style),top(0) {}
-    menuOut(menuOut::styles style=menuOut::enumerated,int x=0x7F,int y=0x7F,int resX=1,int resY=1):maxX(x),maxY(y),style(style),top(0),resX(resX),resY(resY) {}
+    //menuOut(menuOut::styles style=menuOut::enumerated,int width=0x7F,int x=0x7F,int y=0x7F,int resX=1,int resY=1):maxX(x),maxY(y),style(style),top(0),resX(resX),resY(resY) {}
+    menuOut(int x=0x7F,int y=0x7F,int resX=1,int resY=1)
+    	:maxX(x),maxY(y),top(0),resX(resX),resY(resY) {}
     virtual void clear()=0;
     virtual void setCursor(int x,int y)=0;
     virtual void print(char ch)=0;
     virtual void print(const char *text)=0;
     virtual void println(const char *text)=0;
     virtual void print(int)=0;
     virtual void println(int)=0;
-    virtual void print(prompt &o,bool selected);
+    virtual void print(prompt &o,bool selected,int idx,int posY,int width)=0;
   };
 
   ////////////////////////////////////////////////////////////////////
@@ -165,14 +167,15 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
   //a menu or sub-menu
   class menu:public prompt {
     public:
+    int width;//menu width
     static const char *exit;//text used for exit option
     static char enabledCursor;//character to be used as navigation cursor
     static char disabledCursor;//to be used when navigating over disabled options
     static prompt exitOption;//option tro append to every menu allowing exit when no escape button/key is available
     const int sz;
     int sel;//selection
     prompt* const* data;
-    menu(const char * text,int sz,prompt* const data[]):prompt(text),sz(sz),data(data),sel(0) {}
+    menu(const char * text,int sz,prompt* const data[]):prompt(text),sz(sz),data(data),sel(0),width(16) {}
 
     int menuKeys(menuOut &p,Stream& c);
     void printMenu(menuOut& p);

menuLCD.h

@@ -6,14 +6,20 @@
   class menuLCD:public menuOut {
     public:
     LiquidCrystal& lcd;
-    menuLCD(LiquidCrystal& lcd,int x=16,int y=1):lcd(lcd),menuOut(menuOut::cursor,x,y) {}
+    //menuLCD(LiquidCrystal& lcd,int x=16,int y=1):lcd(lcd),menuOut(menuOut::cursor,x,y) {}
+    menuLCD(LiquidCrystal& lcd,int x=16,int y=1):lcd(lcd),menuOut(x,y) {}
     virtual void clear() {lcd.clear();}
     virtual void setCursor(int x,int y) {lcd.setCursor(x*resX,y*resY);}
     virtual void print(char ch) {lcd.print(ch);}
     virtual void print(const char *text) {lcd.print(text);}
     virtual void println(const char *text) {lcd.print(text);};
     virtual void print(int i) {lcd.print(i);};
     virtual void println(int i) {lcd.println(i);};
+		virtual void print(prompt &o,bool selected,int idx,int posY,int width) {
+			lcd.setCursor(0,posY);
+			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
+			print(o.text);
+		}
   };
 #endif RSITE_ARDUINOP_MENU_LCD
 

menuPrint.h

@@ -14,6 +14,13 @@
     virtual void println(const char *text) {device.println(text);}
     virtual void print(int i) {device.print(i);};
     virtual void println(int i) {device.println(i);};
+		virtual void print(prompt &o,bool selected,int idx,int posY,int width) {
+			//setCursor(0,posY);
+      print(idx<10?" ":"");
+      print(idx);
+			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
+			println(o.text);
+		}
   };
 
 #endif RSITE_ARDUINOP_MENU_PRINT