From: Scott Worley Date: Fri, 24 Feb 2023 05:04:48 +0000 (-0800) Subject: Extract draw_data() X-Git-Url: http://git.scottworley.com/batteryviewer/commitdiff_plain/4c6797b5290feab5d454bd2b53cf31c9c6e4d331 Extract draw_data() --- diff --git a/chart.c b/chart.c index cdd7477..e9b60fe 100644 --- a/chart.c +++ b/chart.c @@ -43,6 +43,23 @@ static struct ScreenPoint to_screen(BVChartPrivate *priv, return screen_p; } +static void draw_data(BVChartPrivate *priv, cairo_t *cr, + GtkAllocation *allocation) { + cairo_set_source_rgb(cr, 0.0, 0.0, 1.0); + float gap_threshold = 3.0; + float prevx = 0.0; + for (guint i = 0; i < priv->points->len; i++) { + struct BVChartPoint *p = + &g_array_index(priv->points, struct BVChartPoint, i); + gboolean is_gap = p->x - prevx > gap_threshold; + cairo_draw_func f = is_gap ? cairo_move_to : cairo_line_to; + struct ScreenPoint screen_p = to_screen(priv, allocation, p); + f(cr, screen_p.x, screen_p.y); + prevx = p->x; + } + cairo_stroke(cr); +} + static gboolean bv_chart_draw(GtkWidget *widget, cairo_t *cr) { BVChart *chart = BV_CHART(widget); BVChartPrivate *priv = bv_chart_get_instance_private(chart); @@ -56,19 +73,7 @@ static gboolean bv_chart_draw(GtkWidget *widget, cairo_t *cr) { GtkAllocation allocation; gtk_widget_get_allocation(widget, &allocation); - cairo_set_source_rgb(cr, 0.0, 0.0, 1.0); - float gap_threshold = 3.0; - float prevx = 0.0; - for (guint i = 0; i < priv->points->len; i++) { - struct BVChartPoint *p = - &g_array_index(priv->points, struct BVChartPoint, i); - gboolean is_gap = p->x - prevx > gap_threshold; - cairo_draw_func f = is_gap ? cairo_move_to : cairo_line_to; - struct ScreenPoint screen_p = to_screen(priv, &allocation, p); - f(cr, screen_p.x, screen_p.y); - prevx = p->x; - } - cairo_stroke(cr); + draw_data(priv, cr, &allocation); return TRUE; }