From: Scott Worley Date: Thu, 23 Feb 2023 07:44:03 +0000 (-0800) Subject: Chart draws stuff X-Git-Url: http://git.scottworley.com/batteryviewer/commitdiff_plain/366d093364eaf8b83c3721bfae4e4d6091f61988?hp=148e0e28dd0fe98dd9892f598e74851304105748 Chart draws stuff --- diff --git a/batteryviewer.c b/batteryviewer.c index abc5106..4b8b754 100644 --- a/batteryviewer.c +++ b/batteryviewer.c @@ -8,11 +8,11 @@ static void activate(GtkApplication *app, gtk_window_set_title(GTK_WINDOW(window), "Window"); gtk_window_set_default_size(GTK_WINDOW(window), 200, 200); - GtkWidget *chart_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); - gtk_container_add(GTK_CONTAINER(window), chart_box); - GtkWidget *chart = bv_chart_new(); - gtk_container_add(GTK_CONTAINER(chart_box), chart); + gtk_container_add(GTK_CONTAINER(window), chart); + bv_chart_add_point(BV_CHART(chart), 0.0, 0.0); + bv_chart_add_point(BV_CHART(chart), 1.0, 1.0); + bv_chart_add_point(BV_CHART(chart), 3.0, 2.0); gtk_widget_show_all(window); } diff --git a/chart.c b/chart.c index 2705783..808a275 100644 --- a/chart.c +++ b/chart.c @@ -24,7 +24,41 @@ struct BVChartPoint { G_DEFINE_TYPE_WITH_CODE(BVChart, bv_chart, GTK_TYPE_DRAWING_AREA, G_ADD_PRIVATE(BVChart)) -static void bv_chart_class_init(BVChartClass *klass __attribute__((unused))) {} +static gboolean bv_chart_draw(GtkWidget *widget, cairo_t *cr) { + BVChart *chart = BV_CHART(widget); + BVChartPrivate *priv = bv_chart_get_instance_private(chart); + + cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); + cairo_paint(cr); + + if (priv->points->len < 2) + return TRUE; + + GtkAllocation allocation; + gtk_widget_get_allocation(widget, &allocation); + + float xscale = allocation.width / (priv->maxx - priv->minx); + float yscale = allocation.height / (priv->miny - priv->maxy); + cairo_set_source_rgb(cr, 0.0, 0.0, 1.0); + struct BVChartPoint *start = + &g_array_index(priv->points, struct BVChartPoint, 0); + cairo_move_to(cr, xscale * (start->x - priv->minx), + yscale * (start->y - priv->maxy)); + for (guint i = 1; i < priv->points->len; i++) { + struct BVChartPoint *p = + &g_array_index(priv->points, struct BVChartPoint, i); + cairo_line_to(cr, xscale * (p->x - priv->minx), + yscale * (p->y - priv->maxy)); + } + cairo_stroke(cr); + + return TRUE; +} + +static void bv_chart_class_init(BVChartClass *klass) { + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); + widget_class->draw = bv_chart_draw; +} static void bv_chart_init(BVChart *chart) { gtk_widget_set_has_window(GTK_WIDGET(chart), FALSE);