From be52bdc01444b958f2e5340cbf930690605510a6 Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Fri, 7 Jun 2019 18:33:18 -0500 Subject: [PATCH] Now THIS place knows how to invisibly treat a person, The Cheat! --- examples/cluster.c | 78 ++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/examples/cluster.c b/examples/cluster.c index 8af11ee..de12e5c 100644 --- a/examples/cluster.c +++ b/examples/cluster.c @@ -97,9 +97,9 @@ static void draw_tachometer_needle(cairo_t *cr, cairo_arc(cr, x, y, 0.08 * r, 0, 2*M_PI); cairo_stroke(cr); - draw_needle(cr, x, y, 0.77 * r, - 232 * (M_PI/180), - 488 * (M_PI/180), + draw_needle(cr, x, y, 0.8 * r, + 232 * (M_PI/180), + 488 * (M_PI/180), rpm / 8000); } @@ -134,13 +134,6 @@ static void draw_tachometer(cairo_t *cr, 488 * (M_PI/180), i / 80.0, text); - - draw_face_mark(cr, x, y, - 0.7 * r, - 0.8 * r, - 232 * (M_PI/180), - 488 * (M_PI/180), - i / 80.0); } for (i=0; i<=80; i++) { @@ -148,12 +141,21 @@ static void draw_tachometer(cairo_t *cr, cairo_set_source_rgb(cr, 1, 0, 0); } - draw_face_mark(cr, x, y, - 0.75 * r, - 0.8 * r, - 232 * (M_PI/180), - 488 * (M_PI/180), - i / 80.0); + if (i % 5 == 0) { + draw_face_mark(cr, x, y, + 0.7 * r, + 0.8 * r, + 232 * (M_PI/180), + 488 * (M_PI/180), + i / 80.0); + } else { + draw_face_mark(cr, x, y, + 0.75 * r, + 0.8 * r, + 232 * (M_PI/180), + 488 * (M_PI/180), + i / 80.0); + } } } @@ -189,22 +191,22 @@ static void draw_speedometer(cairo_t *cr, text); } - for (i=0; i<=180; i+=10) { - draw_face_mark(cr, x, y, - 0.7 * r, - 0.8 * r, - 232 * (M_PI/180), - 488 * (M_PI/180), - i / 180.0); - } - for (i=0; i<=180; i+=2) { - draw_face_mark(cr, x, y, - 0.75 * r, - 0.8 * r, - 232 * (M_PI/180), - 488 * (M_PI/180), - i / 180.0); + if (i % 10 == 0) { + draw_face_mark(cr, x, y, + 0.7 * r, + 0.8 * r, + 232 * (M_PI/180), + 488 * (M_PI/180), + i / 180.0); + } else { + draw_face_mark(cr, x, y, + 0.75 * r, + 0.8 * r, + 232 * (M_PI/180), + 488 * (M_PI/180), + i / 180.0); + } } } @@ -224,7 +226,7 @@ static void draw_speedometer_needle(cairo_t *cr, cairo_arc(cr, x, y, 0.08 * r, 0, 2*M_PI); cairo_stroke(cr); - draw_needle(cr, x, y, 0.77 * r, + draw_needle(cr, x, y, 0.8 * r, 232 * (M_PI/180), 488 * (M_PI/180), kph / 290); @@ -279,9 +281,9 @@ static void draw_thermometer_needle(cairo_t *cr, cairo_arc(cr, x, y, 0.08 * r, 0, 2*M_PI); cairo_stroke(cr); - draw_needle(cr, x, y, 0.77 * r, - 300 * (M_PI/180), - 420 * (M_PI/180), + draw_needle(cr, x, y, 0.8 * r, + 300 * (M_PI/180), + 420 * (M_PI/180), temp / 260); } @@ -330,9 +332,9 @@ static void draw_fuel_gauge_needle(cairo_t *cr, cairo_arc(cr, x, y, 0.08 * r, 0, 2*M_PI); cairo_stroke(cr); - draw_needle(cr, x, y, 0.77 * r, - 300 * (M_PI/180), - 420 * (M_PI/180), + draw_needle(cr, x, y, 0.8 * r, + 300 * (M_PI/180), + 420 * (M_PI/180), level / 1.0); }