Two charts

[batteryviewer] / batteryviewer.c

diff --git a/batteryviewer.c b/batteryviewer.c
index 4a1a8509076c4e0225b104c21a31b52a09886ac2..bb0187a18be770677cfb7faf216add1b44cecd34 100644 (file)
--- a/batteryviewer.c
+++ b/batteryviewer.c
@@ -1,31 +1,39 @@
+#include "chart.h"
 #include <gtk/gtk.h>
 
-static void print_hello(GtkWidget *widget, gpointer data) {
-  g_print("Hello World\n");
-}
-
-static void activate(GtkApplication *app, gpointer user_data) {
-  GtkWidget *window;
-  GtkWidget *button;
+static void activate(GtkApplication *app,
+                     gpointer user_data __attribute__((unused))) {
 
-  window = gtk_application_window_new(app);
+  GtkWidget *window = gtk_application_window_new(app);
   gtk_window_set_title(GTK_WINDOW(window), "Window");
   gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
 
-  button = gtk_button_new_with_label("Hello World");
-  g_signal_connect(button, "clicked", G_CALLBACK(print_hello), NULL);
-  gtk_window_set_child(GTK_WINDOW(window), 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_window_present(GTK_WINDOW(window));
+  gtk_widget_show_all(window);
 }
 
 int main(int argc, char **argv) {
-  GtkApplication *app;
-  int status;
 
-  app = gtk_application_new("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  GtkApplication *app =
+      gtk_application_new("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
-  status = g_application_run(G_APPLICATION(app), argc, argv);
+  int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);
 
   return status;