Two charts

[batteryviewer] / batteryviewer.c

diff --git a/batteryviewer.c b/batteryviewer.c
index 3b5add9a9d90b78f2a4ff569166d355b685341b5..bb0187a18be770677cfb7faf216add1b44cecd34 100644 (file)
--- a/batteryviewer.c
+++ b/batteryviewer.c
@@ -1,10 +1,6 @@
+#include "chart.h"
 #include <gtk/gtk.h>
 
-static void print_hello(GtkWidget *widget __attribute__((unused)),
-                        gpointer data __attribute__((unused))) {
-  g_print("Hello World\n");
-}
-
 static void activate(GtkApplication *app,
                      gpointer user_data __attribute__((unused))) {
 
@@ -12,14 +8,22 @@ static void activate(GtkApplication *app,
   gtk_window_set_title(GTK_WINDOW(window), "Window");
   gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
 
-  GtkWidget *button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-  gtk_container_add(GTK_CONTAINER(window), button_box);
-
-  GtkWidget *button = gtk_button_new_with_label("Hello World");
-  g_signal_connect(button, "clicked", G_CALLBACK(print_hello), NULL);
-  g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy),
-                           window);
-  gtk_container_add(GTK_CONTAINER(button_box), button);
+  GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
+  gtk_container_add(GTK_CONTAINER(window), box);
+
+  GtkWidget *chart = bv_chart_new();
+  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);
+  gboolean expand = TRUE;
+  gboolean fill = TRUE;
+  guint padding = 0;
+  gtk_box_pack_start(GTK_BOX(box), chart, expand, fill, padding);
+
+  GtkWidget *chart2 = bv_chart_new();
+  bv_chart_add_point(BV_CHART(chart2), 0.0, 1.0);
+  bv_chart_add_point(BV_CHART(chart2), 1.0, 0.0);
+  gtk_box_pack_end(GTK_BOX(box), chart2, expand, fill, padding);
 
   gtk_widget_show_all(window);
 }