[GNUnet-SVN] r18538 - gnunet-gtk/src/statistics

[gnunet]

Author: grothoff
Date: 2011-12-09 17:59:35 +0100 (Fri, 09 Dec 2011)
New Revision: 18538

Added:
   gnunet-gtk/src/statistics/gtk_statistics_demo.c
Removed:
   gnunet-gtk/src/statistics/test.c
Modified:
   gnunet-gtk/src/statistics/Makefile.am
Log:
-rename

Modified: gnunet-gtk/src/statistics/Makefile.am
===================================================================
--- gnunet-gtk/src/statistics/Makefile.am       2011-12-09 16:59:03 UTC (rev 
18537)
+++ gnunet-gtk/src/statistics/Makefile.am       2011-12-09 16:59:35 UTC (rev 
18538)
@@ -7,7 +7,7 @@
   @GNUNET_CFLAGS@ \
   @GLADE_CFLAGS@
 
-bin_PROGRAMS = gnunet-statistics-gtk test
+bin_PROGRAMS = gnunet-statistics-gtk gtk_statistics_demo
 
 gnunet_statistics_gtk_SOURCES = \
   gnunet-statistics-gtk.c \
@@ -22,11 +22,11 @@
 gnunet_statistics_gtk_LDFLAGS = \
   -export-dynamic 
 
-test_SOURCES = \
-  gtk_statistics.c gtk_statistics.h test.c
-test_LDADD = \
+gtk_statistics_demo_SOURCES = \
+  gtk_statistics.c gtk_statistics.h gtk_statistics_demo.c
+gtk_statistics_demo_LDADD = \
   @GTK_LIBS@ \
   @GLADE_LIBS@ @GNUNET_LIBS@ -lm \
   $(INTLLIBS) 
-test_LDFLAGS = \
+gtk_statistics_demo_LDFLAGS = \
   -export-dynamic 
\ No newline at end of file

Copied: gnunet-gtk/src/statistics/gtk_statistics_demo.c (from rev 18537, 
gnunet-gtk/src/statistics/test.c)
===================================================================
--- gnunet-gtk/src/statistics/gtk_statistics_demo.c                             
(rev 0)
+++ gnunet-gtk/src/statistics/gtk_statistics_demo.c     2011-12-09 16:59:35 UTC 
(rev 18538)
@@ -0,0 +1,69 @@
+
+#include "gtk_statistics.h"
+#include <math.h>
+
+
+/**
+ * Update view (add more points).
+ */
+static gboolean
+update (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+  static unsigned int i = 600;
+  struct GtkStatistics *statistics = user_data;
+
+  gtk_statistics_update_value (GTK_STATISTICS (statistics),
+                              "sin",
+                              i,
+                              (uint64_t) (500 * (1.0 + sin(i/100.0))));
+  gtk_statistics_update_value (GTK_STATISTICS (statistics),
+                              "cos",
+                              i * 2,
+                              (uint64_t) (i * (1.0 + cos(i/100.0))));
+  i++;
+  return FALSE;
+}
+
+
+int main (int argc, char ** argv)
+{
+  GtkWidget *window;
+  GtkWidget *statistics;
+  unsigned int i;
+
+  gtk_init(&argc, &argv);
+  window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title(GTK_WINDOW(window), "STATISTICS widget");
+  gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+  gtk_window_set_default_size(GTK_WINDOW(window), 400, 200);
+  g_signal_connect(G_OBJECT(window), "destroy", 
+       G_CALLBACK(gtk_main_quit), NULL);
+  statistics = gtk_statistics_new();
+  gtk_statistics_add_line (GTK_STATISTICS (statistics),
+                          "sin",
+                          "sin",
+                          "red");
+  for (i=0;i<600;i++)
+    gtk_statistics_update_value (GTK_STATISTICS (statistics),
+                                "sin",
+                                i,
+                                (uint64_t) (500 * (1.0 + sin(i/100.0))));
+  gtk_statistics_add_line (GTK_STATISTICS (statistics),
+                          "cos",
+                          "cos",
+                          "blue");
+  for (i=0;i<600;i++)
+    gtk_statistics_update_value (GTK_STATISTICS (statistics),
+                                "cos",
+                                i * 2,
+                                (uint64_t) (i * (1.0 + cos(i/100.0))));
+  g_signal_connect (G_OBJECT(window), "motion-notify-event", G_CALLBACK 
(update), statistics);
+  gtk_container_add(GTK_CONTAINER(window), statistics);
+  gtk_widget_add_events (GTK_WIDGET (window), GDK_POINTER_MOTION_MASK);
+
+  gtk_widget_show(statistics);
+  gtk_widget_show_all(window);
+  gtk_main();
+
+  return 0;
+}

Deleted: gnunet-gtk/src/statistics/test.c
===================================================================
--- gnunet-gtk/src/statistics/test.c    2011-12-09 16:59:03 UTC (rev 18537)
+++ gnunet-gtk/src/statistics/test.c    2011-12-09 16:59:35 UTC (rev 18538)
@@ -1,69 +0,0 @@
-
-#include "gtk_statistics.h"
-#include <math.h>
-
-
-/**
- * Update view (add more points).
- */
-static gboolean
-update (GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-  static unsigned int i = 600;
-  struct GtkStatistics *statistics = user_data;
-
-  gtk_statistics_update_value (GTK_STATISTICS (statistics),
-                              "sin",
-                              i,
-                              (uint64_t) (500 * (1.0 + sin(i/100.0))));
-  gtk_statistics_update_value (GTK_STATISTICS (statistics),
-                              "cos",
-                              i * 2,
-                              (uint64_t) (i * (1.0 + cos(i/100.0))));
-  i++;
-  return FALSE;
-}
-
-
-int main (int argc, char ** argv)
-{
-  GtkWidget *window;
-  GtkWidget *statistics;
-  unsigned int i;
-
-  gtk_init(&argc, &argv);
-  window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title(GTK_WINDOW(window), "STATISTICS widget");
-  gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-  gtk_window_set_default_size(GTK_WINDOW(window), 400, 200);
-  g_signal_connect(G_OBJECT(window), "destroy", 
-       G_CALLBACK(gtk_main_quit), NULL);
-  statistics = gtk_statistics_new();
-  gtk_statistics_add_line (GTK_STATISTICS (statistics),
-                          "sin",
-                          "sin",
-                          "red");
-  for (i=0;i<600;i++)
-    gtk_statistics_update_value (GTK_STATISTICS (statistics),
-                                "sin",
-                                i,
-                                (uint64_t) (500 * (1.0 + sin(i/100.0))));
-  gtk_statistics_add_line (GTK_STATISTICS (statistics),
-                          "cos",
-                          "cos",
-                          "blue");
-  for (i=0;i<600;i++)
-    gtk_statistics_update_value (GTK_STATISTICS (statistics),
-                                "cos",
-                                i * 2,
-                                (uint64_t) (i * (1.0 + cos(i/100.0))));
-  g_signal_connect (G_OBJECT(window), "motion-notify-event", G_CALLBACK 
(update), statistics);
-  gtk_container_add(GTK_CONTAINER(window), statistics);
-  gtk_widget_add_events (GTK_WIDGET (window), GDK_POINTER_MOTION_MASK);
-
-  gtk_widget_show(statistics);
-  gtk_widget_show_all(window);
-  gtk_main();
-
-  return 0;
-}