]> git.scottworley.com Git - batteryviewer/blobdiff - batteryviewer.c
Draw axis over data
[batteryviewer] / batteryviewer.c
index 5a516218e74ee01eb4dc0697bf12087ba44cfc24..37b6e009c1ce71a0b9b15e7dac65368b8f3706ad 100644 (file)
@@ -60,8 +60,17 @@ static float fatof(const char *filename) {
 }
 
 static gboolean collect_data(struct State *state) {
-  fprintf(stderr, "Voltage: %f, current: %f\n", fatof(state->voltage_filename),
-          fatof(state->current_filename));
+  float now = g_get_monotonic_time() / 1e6;
+  float voltage = fatof(state->voltage_filename);
+  float current = fatof(state->current_filename);
+  if (!isnan(voltage)) {
+    bv_chart_add_point(state->voltage, now, voltage);
+    gtk_widget_queue_draw(GTK_WIDGET(state->voltage));
+  }
+  if (!isnan(current)) {
+    bv_chart_add_point(state->current, now, current);
+    gtk_widget_queue_draw(GTK_WIDGET(state->current));
+  }
   return TRUE;
 }
 
@@ -76,9 +85,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
 
   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;
@@ -86,8 +92,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
                      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);
 
@@ -121,8 +125,11 @@ int main(int argc, char **argv) {
       .current_filename = sasprintf("%s/current_now", battery_dir),
   };
 
-  GtkApplication *app = gtk_application_new("com.scottworley.batteryviewer",
-                                            G_APPLICATION_DEFAULT_FLAGS);
+  GtkApplication *app = gtk_application_new(
+      "com.scottworley.batteryviewer",
+      // G_APPLICATION_FLAGS_NONE is deprecated, but
+      // G_APPLICATION_DEFAULT_FLAGS isn't available on Stable Debian yet.
+      G_APPLICATION_FLAGS_NONE);
   g_signal_connect(app, "activate", G_CALLBACK(activate), &state);
   int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);