Keep the charts in State

[batteryviewer] / batteryviewer.c

diff --git a/batteryviewer.c b/batteryviewer.c
index 6c4304cd643bde66f9dee732497724adc25c5308..a525a729b56ca9cdee6002a67b5f8142fd6caae5 100644 (file)
--- a/batteryviewer.c
+++ b/batteryviewer.c
@@ -1,39 +1,47 @@
+#include "chart.h"
 #include <gtk/gtk.h>
 
-static void print_hello(GtkWidget *widget __attribute__((unused)),
-                        gpointer data __attribute__((unused))) {
-  g_print("Hello World\n");
-}
+struct State {
+  BVChart *voltage;
+  BVChart *current;
+};
 
-static void activate(GtkApplication *app,
-                     gpointer user_data __attribute__((unused))) {
-  GtkWidget *window;
-  GtkWidget *button;
-  GtkWidget *button_box;
+static void activate(GtkApplication *app, gpointer user_data) {
 
-  window = gtk_application_window_new(app);
-  gtk_window_set_title(GTK_WINDOW(window), "Window");
+  GtkWidget *window = gtk_application_window_new(app);
+  gtk_window_set_title(GTK_WINDOW(window), "BatteryViewer");
   gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
 
-  button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-  gtk_container_add(GTK_CONTAINER(window), button_box);
-
-  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);
+
+  struct State *state = (struct State *)user_data;
+  state->voltage = BV_CHART(bv_chart_new());
+  bv_chart_add_point(state->voltage, 0.0, 0.0);
+  bv_chart_add_point(state->voltage, 1.0, 1.0);
+  bv_chart_add_point(state->voltage, 3.0, 2.0);
+  gboolean expand = TRUE;
+  gboolean fill = TRUE;
+  guint padding = 0;
+  gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(state->voltage), expand, fill,
+                     padding);
+
+  state->current = BV_CHART(bv_chart_new());
+  bv_chart_add_point(state->current, 0.0, 1.0);
+  bv_chart_add_point(state->current, 1.0, 0.0);
+  gtk_box_pack_end(GTK_BOX(box), GTK_WIDGET(state->current), expand, fill,
+                   padding);
 
   gtk_widget_show_all(window);
 }
 
 int main(int argc, char **argv) {
-  GtkApplication *app;
-  int status;
+  struct State state;
 
-  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);
+  GtkApplication *app = gtk_application_new("com.scottworley.batteryviewer",
+                                            G_APPLICATION_DEFAULT_FLAGS);
+  g_signal_connect(app, "activate", G_CALLBACK(activate), &state);
+  int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);
 
   return status;