From 0b4fe001fae2048c431a97ed526a5c0565472d0a Mon Sep 17 00:00:00 2001
From: rljonesau <ray@mrjones.id.au>
Date: Thu, 29 Nov 2018 06:32:26 +1100
Subject: [PATCH] Added _drawMenuText variants, tidied up Screen5 so far

---
 Arduino/BTCDieselHeater/Screen5.cpp | 45 ++++++++++-------------------
 Arduino/BTCDieselHeater/display.cpp | 26 +++++++++++++++++
 Arduino/BTCDieselHeater/display.h   |  3 ++
 3 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/Arduino/BTCDieselHeater/Screen5.cpp b/Arduino/BTCDieselHeater/Screen5.cpp
index 8a2a909..5ea285c 100644
--- a/Arduino/BTCDieselHeater/Screen5.cpp
+++ b/Arduino/BTCDieselHeater/Screen5.cpp
@@ -55,29 +55,31 @@ CScreen5::show(const CProtocol& CtlFrame, const CProtocol& HtrFrame)
 
   switch(_rowSel) {
     case 0:
+      // show settings overview (initial screen entry)
+      // pump max/min
       yPos = 28;
       _display.setCursor(0, yPos);
       _display.print("Pump (Hz)");
-      _display.setCursor(col2, yPos);
       sprintf(str, "%.1f", getPumpMin());
+      _display.setCursor(col2, yPos);
       _display.printRightJustified(str);
-      _display.setCursor(col3, yPos);
       sprintf(str, "%.1f", getPumpMax());
+      _display.setCursor(col3, yPos);
       _display.printRightJustified(str);
+      // fan max/min
       yPos = 40;
       _display.setCursor(0, yPos);
       _display.print("Fan (RPM)");
-      _display.setCursor(col2, yPos);
       sprintf(str, "%d", getFanMin());
+      _display.setCursor(col2, yPos);
       _display.printRightJustified(str);
-      _display.setCursor(col3, yPos);
       sprintf(str, "%d", getFanMax());
+      _display.setCursor(col3, yPos);
       _display.printRightJustified(str);
+      // navigation line
       yPos = 53;
       xPos = _display.xCentre();
-      _display.setCursor(xPos, yPos);
-      _display.printCentreJustified(baseLabel);
-      _drawSelectionBoxCentreJustified(xPos, yPos, baseLabel);
+      _drawMenuTextCentreJustified(xPos, yPos, true, baseLabel);
       break;
 
     case 1:
@@ -91,48 +93,31 @@ CScreen5::show(const CProtocol& CtlFrame, const CProtocol& HtrFrame)
     case 4:
     case 5:
       _display.clearDisplay();
-      //50, 38, 26, 14
-      yPos = border + 36;
       // Pump Minimum adjustment
+      yPos = border + 36;
       _display.setCursor(0, yPos);
       _display.print("Pump    Min");
-      _display.setCursor(col3, yPos);
       sprintf(str, "%.1f", adjPump[0]); 
-      _display.printRightJustified(str);
-      if(_rowSel == 2) {
-        _drawSelectionBoxRightJustified(col3, yPos, str);
-      }
+      _drawMenuTextRightJustified(col3, yPos, _rowSel == 2, str);
       // Pump Maximum adjustment
       yPos = border + 24;
       _display.setCursor(0, yPos);
       _display.print("Pump Hz Max");
-      _display.setCursor(col3, yPos);
       sprintf(str, "%.1f", adjPump[1]);
-      _display.printRightJustified(str);
-      if(_rowSel == 3) {
-        _drawSelectionBoxRightJustified(col3, yPos, str);
-      }
+      _drawMenuTextRightJustified(col3, yPos, _rowSel == 3, str);
       // Fan Minimum adjustment
       yPos = border + 12;
       _display.setCursor(0, yPos);
       _display.print("Fan     Min");
-      _display.setCursor(col3, yPos);
       sprintf(str, "%d", adjFan[0]);
-      _display.printRightJustified(str);
-      if(_rowSel == 4) {
-        _drawSelectionBoxRightJustified(col3, yPos, str);
-      }
+      _drawMenuTextRightJustified(col3, yPos, _rowSel == 4, str);
       // Fan Maximum adjustment
       yPos = border;
       _display.setCursor(0, yPos);
       _display.print("Fan RPM Max");
-      _display.setCursor(col3, yPos);
       sprintf(str, "%d", adjFan[1]);
-      _display.printRightJustified(str);
-      if(_rowSel == 5) {
-        _drawSelectionBoxRightJustified(col3, yPos, str);
-      }
-
+      _drawMenuTextRightJustified(col3, yPos, _rowSel == 5, str);
+      // navigation line
       yPos = 53;
       _display.setCursor(_display.xCentre(), yPos);
       _display.printCentreJustified(baseLabel);
diff --git a/Arduino/BTCDieselHeater/display.cpp b/Arduino/BTCDieselHeater/display.cpp
index 870867c..43d7a32 100644
--- a/Arduino/BTCDieselHeater/display.cpp
+++ b/Arduino/BTCDieselHeater/display.cpp
@@ -369,3 +369,29 @@ CScreen::_drawSelectionBoxRightJustified(int x, int y, const char* str, int bord
   _drawSelectionBox(x, y, str, border, radius);
 }
 
+void 
+CScreen::_drawMenuText(int x, int y, bool selected, const char* str, int border, int radius)
+{
+  _display.setCursor(x, y);
+  _display.print(str);
+  if(selected)
+    _drawSelectionBox(x, y, str, border, radius);
+}
+
+void 
+CScreen::_drawMenuTextCentreJustified(int x, int y, bool selected, const char* str, int border, int radius)
+{
+  _display.setCursor(x, y);
+  _display.printCentreJustified(str);
+  if(selected)
+    _drawSelectionBoxCentreJustified(x, y, str, border, radius);
+}
+
+void 
+CScreen::_drawMenuTextRightJustified(int x, int y, bool selected, const char* str, int border, int radius)
+{
+  _display.setCursor(x, y);
+  _display.printRightJustified(str);
+  if(selected)
+    _drawSelectionBoxRightJustified(x, y, str, border, radius);
+}
diff --git a/Arduino/BTCDieselHeater/display.h b/Arduino/BTCDieselHeater/display.h
index 9f6414c..4eed60f 100644
--- a/Arduino/BTCDieselHeater/display.h
+++ b/Arduino/BTCDieselHeater/display.h
@@ -59,6 +59,9 @@ protected:
   void _drawSelectionBox(int x, int y, const char* str, int border = 3, int radius = 4);
   void _drawSelectionBoxRightJustified(int x, int y, const char* str, int border = 3, int radius = 4);
   void _drawSelectionBoxCentreJustified(int x, int y, const char* str, int border = 3, int radius = 4);
+  void _drawMenuText(int x, int y, bool selected, const char* str, int border = 3, int radius = 4);
+  void _drawMenuTextCentreJustified(int x, int y, bool selected, const char* str, int border = 3, int radius = 4);
+  void _drawMenuTextRightJustified(int x, int y, bool selected, const char* str, int border = 3, int radius = 4);
 public:
   CScreen(C128x64_OLED& disp, CScreenManager& mgr); 
   virtual ~CScreen();