Merge lp:~dnax88/upnp-router-control/network-graph into lp:~dnax88/upnp-router-control/devel

[Daniele Napolitano]

[Daniele Napolitano (dnax88)]

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-03-01 17:53:14 +0000
@@ -0,0 +1,16 @@
+_build_
+aclocal.m4
+missing
+Makefile.in
+.lock-wscript
+.waf-1.5.8-82618d9ddb24b59a4b121a86ef888bbb
+configure
+INSTALL
+depcomp
+config.h.in
+data/Makefile.in
+data/apps_scalable2_upnp-router-control.svg
+src/Makefile.in
+autom4te.cache
+install-sh
+NEWS

=== modified file 'data/upnp-router-control.glade'
--- data/upnp-router-control.glade	2010-02-09 16:17:44 +0000
+++ data/upnp-router-control.glade	2010-03-01 17:53:14 +0000
@@ -346,6 +346,16 @@
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkDrawingArea" id="network_graph">
+            <property name="height_request">100</property>
+            <property name="visible">True</property>
+            <property name="app_paintable">True</property>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>

=== modified file 'src/urc-gui.c'
--- src/urc-gui.c	2010-02-09 16:55:32 +0000
+++ src/urc-gui.c	2010-03-01 17:53:14 +0000
@@ -69,7 +69,8 @@
               *down_rate_label,
               *up_rate_label,
               *button_remove,
-              *button_add;
+              *button_add,
+              *network_drawing_area;
               
     AddPortWindow* add_port_window;
 
@@ -77,6 +78,18 @@
 
 static GuiContext* gui;
 
+static GList *downspeed_values = NULL;
+static GList *upspeed_values = NULL;
+
+#define GRAPH_POINTS 90
+
+
+typedef struct
+{
+    gdouble  speed;
+    gboolean valid;
+} SpeedValue;
+
 static void gui_add_port_window_close(GtkWidget *button,
                                       gpointer   user_data)
 {
@@ -440,10 +453,24 @@
     gchar* str;
     gchar* unit;
     gfloat value;
-    /* Method of divisions is too expensive? */
-    
-    
-        
+    GList *tmp_elem;
+    SpeedValue *speed;
+
+    speed = g_malloc (sizeof(SpeedValue));
+
+    speed->speed = down_speed;
+    speed->valid = TRUE;
+
+    downspeed_values = g_list_prepend(downspeed_values, speed);
+
+    tmp_elem = g_list_nth(downspeed_values, GRAPH_POINTS+1);
+    if(tmp_elem) {
+        g_free(tmp_elem->data);
+        downspeed_values = g_list_delete_link(downspeed_values, tmp_elem);
+    }
+
+
+    /* Method of divisions is too expensive? */       
     /* Down speed */
     if(down_speed >= 1024)
     {
@@ -488,8 +515,25 @@
     gchar* str;
     gchar* unit;
     gfloat value;
+    GList *tmp_elem;
+    SpeedValue *speed;
+
+    speed = g_malloc (sizeof(SpeedValue));
+
+    speed->speed = up_speed;
+    speed->valid = TRUE;
+
+    upspeed_values = g_list_prepend(upspeed_values, speed);
+
+    tmp_elem = g_list_nth(upspeed_values, GRAPH_POINTS+1);
+    if(tmp_elem) {
+        g_free(tmp_elem->data);
+        upspeed_values = g_list_delete_link(upspeed_values, tmp_elem);
+    }
+
+    gtk_widget_queue_draw(gui->network_drawing_area);
+
     /* Method of divisions is too expensive? */
-    
     /* Up speed */     
     if(up_speed >= 1024)
     {
@@ -792,10 +836,255 @@
 	gtk_main_quit();
 }
 
+#define FRAME_WIDTH 4
+
+cairo_surface_t *background;
+
+void clear_graph_background()
+{
+    if (background) {
+		cairo_surface_destroy(background);
+		background = NULL;
+	}
+}
+
+void
+speed_graph_draw (GtkWidget *widget)
+{
+	/* repaint */
+	gtk_widget_queue_draw (widget);
+}
+
+void
+speed_graph_draw_background (GtkWidget *widget)
+{
+    cairo_t *cr;
+    cairo_pattern_t *pat;
+    cairo_text_extents_t extents;
+    gchar *label;
+    double draw_width, draw_height;
+    
+    const double fontsize = 8.0;
+    const double rmargin = 3.5 * fontsize;
+	const guint indent = 24;
+	const guint x_frame_count = 6;
+	guint y_frame_count = 3;    
+    double dash[2] = { 1.0, 2.0 };
+    double x_frame_size, y_frame_size;
+    double x, y;
+    gint i;  
+    guint net_max = 100;
+
+	background = cairo_image_surface_create( CAIRO_FORMAT_ARGB32,
+	                                         widget->allocation.width,
+					                         widget->allocation.height);
+	cr = cairo_create(background);	
+
+    draw_width = widget->allocation.width - 2 * FRAME_WIDTH;
+    draw_height = widget->allocation.height - 2 * FRAME_WIDTH;
+    
+	cairo_translate (cr, FRAME_WIDTH, FRAME_WIDTH);	
+
+    // determines the number of grids based on height
+	switch ( (int) (draw_height) / 30 ) 
+	{
+	    case 0:
+	    case 1:
+		    y_frame_count = 1;
+		    break;
+	    case 2:
+	    case 3:
+		    y_frame_count = 2;
+		    break;
+	    case 4:
+		    y_frame_count = 4;
+		    break;
+	    default:
+		    y_frame_count = 5;
+		    
+	}
+
+	cairo_select_font_face (cr, "sans",
+                                CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size (cr, fontsize);
+
+    cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+    cairo_set_line_width (cr, 1);
+
+    // white to gray faded background
+    pat = cairo_pattern_create_linear (0.0, 0.0,  0.0, draw_height - 15.0);
+    cairo_pattern_add_color_stop_rgb (pat, 0, 1, 1, 1);
+    cairo_pattern_add_color_stop_rgb (pat, 1, 0.9, 0.9, 0.9);
+    cairo_rectangle (cr, rmargin + indent, 0, draw_width - rmargin - indent, draw_height - 15.0);
+    cairo_set_source (cr, pat);
+    cairo_fill(cr);
+    cairo_pattern_destroy (pat);
+    
+    // draw grid
+	cairo_set_dash (cr, dash, 2, 0);
+	cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.75);
+    
+    // drawing vertical grid    
+    x_frame_size = (draw_width - rmargin - indent) / x_frame_count;    
+    for(i = 0; i <= x_frame_count; i++) {
+        
+        x = rmargin + indent + (x_frame_size * i);
+
+        if(i == 0)
+            label = g_strdup_printf("%u seconds", GRAPH_POINTS - (GRAPH_POINTS / x_frame_count) * i);
+        
+        else
+            label = g_strdup_printf("%u", GRAPH_POINTS - (GRAPH_POINTS / x_frame_count) * i);
+        
+        cairo_text_extents (cr, label, &extents);
+		cairo_move_to (cr, x - extents.width/2 , draw_height+2);
+		cairo_show_text (cr, label);
+		g_free(label);
+
+		cairo_move_to (cr, x, 0);
+        cairo_line_to (cr, x, draw_height - 10.0);
+
+    }
+    
+    // drawing horizontal grid
+    y_frame_size = (draw_height - 15.0) / y_frame_count;    
+    for(i = 0; i <= y_frame_count; i++) {
+        y = y_frame_size * i;
+
+        label = g_strdup_printf("%u KiB/s", net_max - net_max / y_frame_count * i);
+        cairo_text_extents (cr, label, &extents);
+		cairo_move_to (cr, rmargin + indent - extents.width - 10 , y + extents.height/2);
+		cairo_show_text (cr, label);
+		g_free(label);
+        
+        cairo_move_to (cr, rmargin + indent - 5, y);
+        cairo_line_to (cr, draw_width - rmargin + indent + 5, y);
+        
+    }
+
+    cairo_stroke(cr);
+}
+
+static gboolean
+on_drawing_area_configure_event (GtkWidget         *widget,
+		                         GdkEventConfigure *event,
+		                         gpointer           data_ptr)
+{
+    clear_graph_background();
+
+	speed_graph_draw (widget);
+
+	return TRUE;
+}
+
+
+static gboolean
+on_drawing_area_expose_event (GtkWidget      *widget,
+                              GdkEventExpose *event,
+                              gpointer        user_data)
+{
+    cairo_t *cr;    
+
+    double draw_width, draw_height;    
+    const double fontsize = 8.0;
+    const double rmargin = 3.5 * fontsize;
+	const guint indent = 24;
+    double x, y;
+    gint i;  
+    GList *list;
+    guint net_max = 100;
+    SpeedValue *speed_value;
+
+    if(background == NULL)
+        speed_graph_draw_background (widget);
+
+    draw_width = widget->allocation.width - 2 * FRAME_WIDTH;
+    draw_height = widget->allocation.height - 2 * FRAME_WIDTH;
+
+    cr = gdk_cairo_create (widget->window);	
+
+    cairo_rectangle (cr,
+                         event->area.x, event->area.y,
+                         event->area.width, event->area.height);
+    cairo_clip (cr);
+
+    // draw background
+    cairo_set_source_surface(cr, background, 0.0, 0.0);
+    cairo_paint(cr);
+
+    cairo_translate (cr, FRAME_WIDTH, FRAME_WIDTH);
+    
+    /* draw load lines */
+    cairo_set_antialias(cr, CAIRO_ANTIALIAS_DEFAULT);
+    cairo_set_dash (cr, NULL, 0, 0);
+    cairo_set_line_width (cr, 1.00);
+
+    /* upload speed */
+    list = upspeed_values;    
+    speed_value = list->data;
+
+    if(speed_value->valid == TRUE) {
+        y = draw_height - 15 - speed_value->speed * (draw_height - 15) / net_max;
+        x = draw_width;
+        cairo_move_to (cr, x, y + 0.5);
+    }    
+    
+    for(i = GRAPH_POINTS; i >= 0; i--) {
+        
+        speed_value = list->data;
+
+        if(speed_value->valid == TRUE) {
+            y = draw_height  - 15 - speed_value->speed * (draw_height - 15) / net_max;
+            x = rmargin + indent + ((draw_width - rmargin - indent) / GRAPH_POINTS) * i;
+        
+            cairo_line_to (cr, x, y + 0.5);
+        }
+
+        list = list->next;        
+    }
+    
+    cairo_set_source_rgb (cr, 0.52, 0.28, 0.60);
+    cairo_stroke(cr);
+
+    /* download speed */
+    list = downspeed_values;    
+    speed_value = list->data;
+
+    if(speed_value->valid == TRUE) {
+        y = draw_height - 15 - speed_value->speed * (draw_height - 15) / 100;
+        x = draw_width;
+        cairo_move_to (cr, x, y + 0.5);
+    }    
+    
+    for(i = GRAPH_POINTS; i >= 0; i--) {
+        
+        speed_value = list->data;
+
+        if(speed_value->valid == TRUE) {
+            y = draw_height  - 15 - speed_value->speed * (draw_height - 15) / 100;
+            x = rmargin + indent + ((draw_width - rmargin - indent) / GRAPH_POINTS) * i;
+        
+            cairo_line_to (cr, x, y + 0.5);
+        }
+
+        list = list->next;        
+    }
+    
+    cairo_set_source_rgb (cr, 0.18, 0.49, 0.70);
+    cairo_stroke(cr);
+
+    cairo_destroy (cr);
+    
+    return FALSE;
+}
+
+
 void gui_init()
 {
     GtkBuilder* builder;
     GError* error = NULL;
+    SpeedValue *speed;
+    gint i;
     
     g_print("* Initializing GUI...\n");
     
@@ -821,10 +1110,25 @@
     gui->down_rate_label = GTK_WIDGET (gtk_builder_get_object (builder, "down_rate_label"));
     gui->up_rate_label = GTK_WIDGET (gtk_builder_get_object (builder, "up_rate_label"));
     gui->router_url_eventbox = GTK_WIDGET (gtk_builder_get_object (builder, "router_url_eventbox"));
+    gui->network_drawing_area = GTK_WIDGET (gtk_builder_get_object (builder, "network_graph"));
     
     gui->button_add = GTK_WIDGET (gtk_builder_get_object (builder, "button_add"));
     gui->button_remove = GTK_WIDGET (gtk_builder_get_object (builder, "button_remove"));
     
+    // fill speed graph lists
+    for(i = 0; i <= GRAPH_POINTS; i++) {
+        speed = g_malloc(sizeof(SpeedValue));
+        speed->speed = 0;
+        speed->valid = FALSE;
+        upspeed_values = g_list_prepend(upspeed_values, speed);
+    }
+
+    for(i = 0; i <= GRAPH_POINTS; i++) {
+        speed = g_malloc(sizeof(SpeedValue));
+        speed->speed = 0;
+        speed->valid = FALSE;
+        downspeed_values = g_list_prepend(downspeed_values, speed);
+    }
     
     g_signal_connect(gtk_builder_get_object (builder, "menuitem_about"), "activate",
                          G_CALLBACK(on_about_activate_cb), NULL);
@@ -834,6 +1138,11 @@
     
     g_signal_connect(G_OBJECT(gui->main_window), "delete-event",
                          G_CALLBACK(gui_destroy), NULL);
+
+    g_signal_connect(G_OBJECT(gui->network_drawing_area), "expose-event",
+                         G_CALLBACK(on_drawing_area_expose_event), NULL);
+    g_signal_connect(G_OBJECT(gui->network_drawing_area), "configure-event",
+                         G_CALLBACK(on_drawing_area_configure_event), NULL);
                              
     gui_create_add_port_window(builder);