Mirrors/MicroView-Arduino-Library
2
0
Fork 0
mirror of https://github.com/geekammo/MicroView-Arduino-Library.git synced 2026-03-11 20:46:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from MLXXXp/widget_no_value

Browse Source 
Add an option to supress the display of the numeric value for widgets
This commit is contained in:
jpliew
2014-09-22 19:55:14 +10:00
parent c86b454924 da7579a6e8
commit 85f51dcdba
3 changed files with 139 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

249
MicroView.cpp
View File

@@ -631,11 +631,11 @@ void MicroView::circleFill(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color
bool intersected = false; bool intersected = false;
// Optimization: relative x squared only changes with the outer loop/the horizontal scan. // Optimization: relative x squared only changes with the outer loop/the horizontal scan.
int16_t rx2 = (x-x0) * (x-x0); uint16_t rx2 = (x-x0) * (x-x0);
// Scan vertically... // Scan vertically...
for (uint16_t y = yStart; y <= yEnd; ++y) { for (uint16_t y = yStart; y <= yEnd; ++y) {
int16_t ry2 = (y-y0) * (y-y0); uint16_t ry2 = (y-y0) * (y-y0);
if (rx2 + ry2 <= radiusSq) { if (rx2 + ry2 <= radiusSq) {
pixel(x, y, color, mode); pixel(x, y, color, mode);
intersected = true; intersected = true;
@@ -1443,7 +1443,20 @@ void MicroViewWidget::reDraw() {
this->drawFace(); this->drawFace();
this->draw(); this->draw();
} }
/** \brief Draw a signed decimal numeric value at the current cursor location.
The value is right justified with leading spaces, within a field the length of the maximum posible for the widget's value range.
*/
void MicroViewWidget::drawNumValue(int16_t value) {
char strBuffer[7];
char formatStr[] = "%1d";
formatStr[1] = '0' + getMaxValLen(); // Set the field width for the value range
sprintf(strBuffer, formatStr, value);
uView.print(strBuffer);
}
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
// MicroViewWidget Class - end // MicroViewWidget Class - end
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
@@ -1459,6 +1472,7 @@ void MicroViewWidget::reDraw() {
MicroViewSlider::MicroViewSlider(uint8_t newx, uint8_t newy, int16_t min, int16_t max):MicroViewWidget(newx, newy, min, max) { MicroViewSlider::MicroViewSlider(uint8_t newx, uint8_t newy, int16_t min, int16_t max):MicroViewWidget(newx, newy, min, max) {
style=0; style=0;
totalTicks=30; totalTicks=30;
noValDraw=false;
prevValue=getMinValue(); prevValue=getMinValue();
needFirstDraw=true; needFirstDraw=true;
drawFace(); drawFace();
@@ -1467,24 +1481,29 @@ MicroViewSlider::MicroViewSlider(uint8_t newx, uint8_t newy, int16_t min, int16_
/** \brief MicroViewSlider class initialisation with style. /** \brief MicroViewSlider class initialisation with style.
Initialise the MicroViewSlider widget with style WIDGETSTYLE0 or WIDGETSTYLE1 or WIDGETSTYLE2 (like 0, but vertical) or WIDGETSTYLE3 (like 1, but vertical). If this list gets any longer, it might be better as a switch/case statement. Initialise the MicroViewSlider widget with style WIDGETSTYLE0 or WIDGETSTYLE1 or WIDGETSTYLE2 (like 0, but vertical) or WIDGETSTYLE3 (like 1, but vertical).
Add WIDGETNOVALUE to the style to suppress displaying the numeric value. E.g. WIDGETSTYLE0 + WIDGETNOVALUE
*/ */
MicroViewSlider::MicroViewSlider(uint8_t newx, uint8_t newy, int16_t min, int16_t max, uint8_t sty):MicroViewWidget(newx, newy, min, max) { MicroViewSlider::MicroViewSlider(uint8_t newx, uint8_t newy, int16_t min, int16_t max, uint8_t sty):MicroViewWidget(newx, newy, min, max) {
if (sty==WIDGETSTYLE1) { noValDraw = sty & WIDGETNOVALUE; // set "no value draw" flag as specified
style=1;
totalTicks=60; switch(sty & ~WIDGETNOVALUE) {
} case WIDGETSTYLE1:
else if (sty==WIDGETSTYLE2) { style=1;
style=2; totalTicks=60;
totalTicks=20; break;
} case WIDGETSTYLE2:
else if (sty==WIDGETSTYLE3) { style=2;
style=3; totalTicks=20;
totalTicks=40; break;
} case WIDGETSTYLE3:
else { // Use style 0 if specified or invalid style=3;
style=0; totalTicks=40;
totalTicks=30; break;
default:
style=0;
totalTicks=30;
break;
} }
prevValue=getMinValue(); prevValue=getMinValue();
@@ -1533,71 +1552,58 @@ void MicroViewSlider::drawFace() {
Convert the current value of the widget and draw the ticker representing the value. Convert the current value of the widget and draw the ticker representing the value.
*/ */
void MicroViewSlider::draw() { void MicroViewSlider::draw() {
uint8_t offsetX, offsetY; // Draw the initial pointer or erase the previous pointer
uint8_t tickPosition=0; drawPointer();
char strBuffer[7];
char formatStr[] = "%1d";
formatStr[1] = '0' + getMaxValLen(); // Set the field width for the value range
offsetX=getX();
offsetY=getY();
if (needFirstDraw) { if (needFirstDraw) {
if (style==0 || style==1){ //Horizontal
tickPosition = ((float)(uint16_t)(prevValue-getMinValue())/(float)(uint16_t)(getMaxValue()-getMinValue()))*totalTicks;
uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
}
else { //Vertical
tickPosition = ((float)(uint16_t)(getMaxValue()-prevValue)/(float)(uint16_t)(getMaxValue()-getMinValue()))*totalTicks;
uView.lineV(offsetX+7, offsetY+tickPosition, 3, WHITE, XOR);
uView.pixel(offsetX+6, offsetY+1+tickPosition, WHITE, XOR);
}
sprintf(strBuffer, formatStr, prevValue); // print with fixed width so that blank space will cover larger value
needFirstDraw=false; needFirstDraw=false;
} }
else { else {
// Draw previous pointer in XOR mode to erase it
if (style==0 || style==1){ //Horizontal
tickPosition = ((float)(uint16_t)(prevValue-getMinValue())/(float)(uint16_t)(getMaxValue()-getMinValue()))*totalTicks;
uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
}
else { //Vertical
tickPosition = ((float)(uint16_t)(getMaxValue()-prevValue)/(float)(uint16_t)(getMaxValue()-getMinValue()))*totalTicks;
uView.lineV(offsetX+7, offsetY+tickPosition, 3, WHITE, XOR);
uView.pixel(offsetX+6, offsetY+1+tickPosition, WHITE, XOR);
}
// Draw current pointer
if (style==0 || style==1){ //Horizontal
tickPosition = ((float)(uint16_t)(getValue()-getMinValue())/(float)(uint16_t)(getMaxValue()-getMinValue()))*totalTicks;
uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
}
else { //Vertical
tickPosition = ((float)(uint16_t)(getMaxValue()-getValue())/(float)(uint16_t)(getMaxValue()-getMinValue()))*totalTicks;
uView.lineV(offsetX+7, offsetY+tickPosition, 3, WHITE, XOR);
uView.pixel(offsetX+6, offsetY+1+tickPosition, WHITE, XOR);
}
sprintf(strBuffer, formatStr, getValue()); // print with fixed width so that blank space will cover larger value
prevValue=getValue(); prevValue=getValue();
// Draw current pointer
drawPointer();
} }
// Draw value // Draw numeric value if required
if (style==0) if (!noValDraw) {
uView.setCursor(offsetX+totalTicks+4, offsetY+1); uint8_t offsetX = getX();
else if (style==1) uint8_t offsetY = getY();
uView.setCursor(offsetX, offsetY+10);
else if (style==2)
uView.setCursor(offsetX+1, offsetY+totalTicks+4);
else //style==3
uView.setCursor(offsetX+9, offsetY);
uView.print(strBuffer); switch(style) {
case 0:
uView.setCursor(offsetX+totalTicks+4, offsetY+1);
break;
case 1:
uView.setCursor(offsetX, offsetY+10);
break;
case 2:
uView.setCursor(offsetX+1, offsetY+totalTicks+4);
break;
default:
uView.setCursor(offsetX+9, offsetY);
break;
}
drawNumValue(prevValue);
}
}
// Use XOR mode to erase or draw the pointer for prevValue
void MicroViewSlider::drawPointer() {
uint8_t tickPosition;
uint8_t offsetX = getX();
uint8_t offsetY = getY();
if (style==0 || style==1) { // Horizontal
tickPosition = ((float)(uint16_t)(prevValue-getMinValue())/(float)(uint16_t)(getMaxValue()-getMinValue()))*totalTicks;
uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
}
else { // Vertical
tickPosition = ((float)(uint16_t)(getMaxValue()-prevValue)/(float)(uint16_t)(getMaxValue()-getMinValue()))*totalTicks;
uView.lineV(offsetX+7, offsetY+tickPosition, 3, WHITE, XOR);
uView.pixel(offsetX+6, offsetY+1+tickPosition, WHITE, XOR);
}
} }
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
@@ -1615,6 +1621,7 @@ void MicroViewSlider::draw() {
MicroViewGauge::MicroViewGauge(uint8_t newx, uint8_t newy, int16_t min, int16_t max):MicroViewWidget(newx, newy, min, max) { MicroViewGauge::MicroViewGauge(uint8_t newx, uint8_t newy, int16_t min, int16_t max):MicroViewWidget(newx, newy, min, max) {
style=0; style=0;
radius=15; radius=15;
noValDraw=false;
prevValue=getMinValue(); prevValue=getMinValue();
needFirstDraw=true; needFirstDraw=true;
drawFace(); drawFace();
@@ -1624,9 +1631,12 @@ MicroViewGauge::MicroViewGauge(uint8_t newx, uint8_t newy, int16_t min, int16_t
/** \brief MicroViewGauge class initialisation with style. /** \brief MicroViewGauge class initialisation with style.
Initialise the MicroViewGauge widget with style WIDGETSTYLE0 or WIDGETSTYLE1. Initialise the MicroViewGauge widget with style WIDGETSTYLE0 or WIDGETSTYLE1.
Add WIDGETNOVALUE to the style to suppress displaying the numeric value. E.g. WIDGETSTYLE0 + WIDGETNOVALUE
*/ */
MicroViewGauge::MicroViewGauge(uint8_t newx, uint8_t newy, int16_t min, int16_t max, uint8_t sty):MicroViewWidget(newx, newy, min, max) { MicroViewGauge::MicroViewGauge(uint8_t newx, uint8_t newy, int16_t min, int16_t max, uint8_t sty):MicroViewWidget(newx, newy, min, max) {
if (sty==WIDGETSTYLE0) { noValDraw = sty & WIDGETNOVALUE; // set "no value draw" flag as specified
if ((sty & ~WIDGETNOVALUE) == WIDGETSTYLE0) {
style=0; style=0;
radius=15; radius=15;
} }
@@ -1651,23 +1661,23 @@ void MicroViewGauge::drawFace() {
offsetY=getY(); offsetY=getY();
uView.circle(offsetX,offsetY,radius); uView.circle(offsetX,offsetY,radius);
for (int i=150;i<=390;i+=30) { // Major tick from 150 degree to 390 degree for (int i=150;i<=390;i+=30) { // Major tick from 150 degree to 390 degree
degreeSec=i*(PI/180); degreeSec=i*(PI/180);
fromSecX = cos(degreeSec) * (radius / 1.5); fromSecX = cos(degreeSec) * (radius / 1.5);
fromSecY = sin(degreeSec) * (radius / 1.5); fromSecY = sin(degreeSec) * (radius / 1.5);
toSecX = cos(degreeSec) * (radius / 1); toSecX = cos(degreeSec) * radius;
toSecY = sin(degreeSec) * (radius / 1); toSecY = sin(degreeSec) * radius;
uView.line(1+offsetX+fromSecX,1+offsetY+fromSecY,1+offsetX+toSecX,1+offsetY+toSecY); uView.line(1+offsetX+fromSecX,1+offsetY+fromSecY,1+offsetX+toSecX,1+offsetY+toSecY);
} }
if(radius>15) { if (radius>15) {
for (int i=150;i<=390;i+=15) { // Minor tick from 150 degree to 390 degree for (int i=165;i<=375;i+=30) { // Minor tick from 165 degree to 375 degree
degreeSec=i*(PI/180); degreeSec=i*(PI/180);
fromSecX = cos(degreeSec) * (radius / 1.3); fromSecX = cos(degreeSec) * (radius / 1.3);
fromSecY = sin(degreeSec) * (radius / 1.3); fromSecY = sin(degreeSec) * (radius / 1.3);
toSecX = cos(degreeSec) * (radius / 1); toSecX = cos(degreeSec) * radius;
toSecY = sin(degreeSec) * (radius / 1); toSecY = sin(degreeSec) * radius;
uView.line(1+offsetX+fromSecX,1+offsetY+fromSecY,1+offsetX+toSecX,1+offsetY+toSecY); uView.line(1+offsetX+fromSecX,1+offsetY+fromSecY,1+offsetX+toSecX,1+offsetY+toSecY);
} }
} }
@@ -1678,54 +1688,47 @@ void MicroViewGauge::drawFace() {
Convert the current value of the widget and draw the ticker representing the value. Convert the current value of the widget and draw the ticker representing the value.
*/ */
void MicroViewGauge::draw() { void MicroViewGauge::draw() {
uint8_t offsetX, offsetY; // Draw the initial pointer or erase the previous pointer
uint8_t maxValLen, valOffset; drawPointer();
float degreeSec, toSecX, toSecY;
char strBuffer[7];
char formatStr[] = "%1d"; // The 1 will be replaced later by the proper length
maxValLen = getMaxValLen();
formatStr[1] = '0' + maxValLen; // Set the field width for the value range
valOffset = maxValLen * 3 - 1; // Offset left of centre to print the value
offsetX=getX();
offsetY=getY();
if (needFirstDraw) { if (needFirstDraw) {
degreeSec = ((float)(uint16_t)(prevValue-getMinValue())/(float)(uint16_t)(getMaxValue()-getMinValue()))*240; // total 240 degree in the widget
degreeSec = (degreeSec+150) * (PI/180); // 150 degree starting point
toSecX = cos(degreeSec) * (radius / 1.2);
toSecY = sin(degreeSec) * (radius / 1.2);
uView.line(offsetX,offsetY,1+offsetX+toSecX,1+offsetY+toSecY, WHITE,XOR);
sprintf(strBuffer, formatStr, prevValue); // print with fixed width so that blank space will cover larger value
needFirstDraw=false; needFirstDraw=false;
} }
else { else {
// Draw previous pointer in XOR mode to erase it
degreeSec = ((float)(uint16_t)(prevValue-getMinValue())/(float)(uint16_t)(getMaxValue()-getMinValue()))*240; // total 240 degree in the widget
degreeSec = (degreeSec+150) * (PI/180);
toSecX = cos(degreeSec) * (radius / 1.2);
toSecY = sin(degreeSec) * (radius / 1.2);
uView.line(offsetX,offsetY,1+offsetX+toSecX,1+offsetY+toSecY, WHITE,XOR);
// draw current pointer
degreeSec = ((float)(uint16_t)(getValue()-getMinValue())/(float)(uint16_t)(getMaxValue()-getMinValue()))*240; // total 240 degree in the widget
degreeSec = (degreeSec+150) * (PI/180); // 150 degree starting point
toSecX = cos(degreeSec) * (radius / 1.2);
toSecY = sin(degreeSec) * (radius / 1.2);
uView.line(offsetX,offsetY,1+offsetX+toSecX,1+offsetY+toSecY, WHITE,XOR);
sprintf(strBuffer, formatStr, getValue()); // print with fixed width so that blank space will cover larger value
prevValue=getValue(); prevValue=getValue();
// Draw current pointer
drawPointer();
} }
// Draw value // Draw numeric value if required
if (style>0) if (!noValDraw) {
uView.setCursor(offsetX-valOffset, offsetY+10); uint8_t offsetY = getY();
else uint8_t offsetX = getX() - (getMaxValLen() * 3 - 1); // Offset left of centre to print the value
uView.setCursor(offsetX-valOffset, offsetY+11);
if (style > 0)
uView.print(strBuffer); uView.setCursor(offsetX, offsetY+10);
else
uView.setCursor(offsetX, offsetY+11);
drawNumValue(prevValue);
}
}
// Use XOR mode to erase or draw the pointer for prevValue
void MicroViewGauge::drawPointer() {
uint8_t offsetX, offsetY;
float degreeSec, toSecX, toSecY;
offsetX = getX();
offsetY = getY();
// total 240 degree in the widget with 150 degree starting point
degreeSec = (((float)(uint16_t)(prevValue-getMinValue()) / (float)(uint16_t)(getMaxValue()-getMinValue())
* 240) + 150) * (PI / 180);
toSecX = cos(degreeSec) * (radius / 1.2);
toSecY = sin(degreeSec) * (radius / 1.2);
uView.line(offsetX,offsetY,1+offsetX+toSecX,1+offsetY+toSecY, WHITE,XOR);
} }
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------

14
MicroView.h
View File

@@ -77,10 +77,13 @@
#define WIDGETSTYLE0 0 #define WIDGETSTYLE0 0
#define WIDGETSTYLE1 1 #define WIDGETSTYLE1 1
// Added for Vertical slider styles
#define WIDGETSTYLE2 2 #define WIDGETSTYLE2 2
//Added for Vertical slider styles
#define WIDGETSTYLE3 3 #define WIDGETSTYLE3 3
// Flag to be added to widget style to indicate no numeric value display
#define WIDGETNOVALUE 0x80
#define SETCONTRAST 0x81 #define SETCONTRAST 0x81
#define DISPLAYALLONRESUME 0xA4 #define DISPLAYALLONRESUME 0xA4
#define DISPLAYALLON 0xA5 #define DISPLAYALLON 0xA5
@@ -237,8 +240,8 @@ public:
int16_t getMinValue(); int16_t getMinValue();
int16_t getMaxValue(); int16_t getMaxValue();
int16_t getValue(); int16_t getValue();
void setMinValue(int16_t min);
void setMaxValue(int16_t max); void setMaxValue(int16_t max);
void setMinValue(int16_t max);
void setValue(int16_t val); void setValue(int16_t val);
uint8_t getMaxValLen(); uint8_t getMaxValLen();
/** \brief Draw widget value overridden by child class. */ /** \brief Draw widget value overridden by child class. */
@@ -246,7 +249,8 @@ public:
/** \brief Draw widget face overridden by child class. */ /** \brief Draw widget face overridden by child class. */
virtual void drawFace(){}; virtual void drawFace(){};
void reDraw(); void reDraw();
void drawNumValue(int16_t value);
virtual ~MicroViewWidget(){};
private: private:
uint8_t x; uint8_t x;
uint8_t y; uint8_t y;
@@ -262,7 +266,9 @@ public:
void draw(); void draw();
void drawFace(); void drawFace();
private: private:
void drawPointer();
uint8_t totalTicks, style; uint8_t totalTicks, style;
bool noValDraw;
int16_t prevValue; int16_t prevValue;
}; };
@@ -273,7 +279,9 @@ public:
void draw(); void draw();
void drawFace(); void drawFace();
private: private:
void drawPointer();
uint8_t radius, style; uint8_t radius, style;
bool noValDraw;
int16_t prevValue; int16_t prevValue;
}; };

3
keywords.txt
View File

@@ -66,6 +66,7 @@ setValue KEYWORD2
draw KEYWORD2 draw KEYWORD2
reDraw KEYWORD2 reDraw KEYWORD2
drawFace KEYWORD2 drawFace KEYWORD2
drawNumValue KEYWORD2
checkComm KEYWORD2 checkComm KEYWORD2
####################################### #######################################
@@ -82,5 +83,5 @@ WIDGETSTYLE0 LITERAL1
WIDGETSTYLE1 LITERAL1 WIDGETSTYLE1 LITERAL1
WIDGETSTYLE2 LITERAL1 WIDGETSTYLE2 LITERAL1
WIDGETSTYLE3 LITERAL1 WIDGETSTYLE3 LITERAL1
WIDGETNOVALUE LITERAL1