mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- nglcd: use our own clock face

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

TODO: clock images
This commit is contained in:
svenhoefer
2020-06-15 12:03:20 +02:00
committed by Thilo Graf
parent 7c74515376
commit 028dd997bb
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/nglcd.cpp
View File

@@ -36,6 +36,8 @@
#include <eitd/sectionsd.h> #include <eitd/sectionsd.h>
#include <math.h> #include <math.h>
#define LCD_ICONSDIR "/share/lcd/icons/"
static const char * kDefaultConfigFile = "/etc/graphlcd.conf"; static const char * kDefaultConfigFile = "/etc/graphlcd.conf";
static nGLCD *nglcd = NULL; static nGLCD *nglcd = NULL;
@@ -150,23 +152,21 @@ void nGLCD::LcdAnalogClock(int posx,int posy,int dia)
hy_ = int((dia * 0.4 * sin(hAngleInRad))); hy_ = int((dia * 0.4 * sin(hAngleInRad)));
#endif #endif
std::string a_clock = ""; std::string clock_face = LCD_ICONSDIR "/clock/analog/dial.png";
a_clock = ICONSDIR "/a_clock.png"; int clock_face_width = 0, clock_face_height = 0;
if (access(a_clock.c_str(), F_OK) != 0) g_PicViewer->getSize(clock_face.c_str(), &clock_face_width, &clock_face_height);
a_clock = ICONSDIR "/a_clock.png"; if (clock_face_width && clock_face_height)
int lcd_a_clock_width = 0, lcd_a_clock_height = 0;
g_PicViewer->getSize(a_clock.c_str(), &lcd_a_clock_width, &lcd_a_clock_height);
if (lcd_a_clock_width && lcd_a_clock_height)
{ {
showImage(a_clock, (uint32_t) lcd_a_clock_width, (uint32_t) lcd_a_clock_height, showImage(clock_face, (uint32_t) clock_face_width, (uint32_t) clock_face_height,
0, 0, (uint32_t) nglcd->bitmap->Width(), (uint32_t) nglcd->bitmap->Height(), false, false); 0, 0, (uint32_t) nglcd->bitmap->Width(), (uint32_t) nglcd->bitmap->Height(), false, false);
lcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height()); lcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height());
lcd->Refresh(true); lcd->Refresh(true);
} }
// TODO: Fix these ugly and buggy clock hands
// hour // hour
bitmap->DrawLine(posx,posy-8,posx+hx_,posy+hy_, g_settings.glcd_color_fg); bitmap->DrawLine(posx,posy-8,posx+hx_,posy+hy_, g_settings.glcd_color_fg);
bitmap->DrawLine(posx,posy-7,posx+hx_,posy+hy_, g_settings.glcd_color_fg); bitmap->DrawLine(posx,posy-7,posx+hx_,posy+hy_, g_settings.glcd_color_fg);