Fixes the handling of long term captures from a simulation tool.

svn path=/trunk/; revision=18267

1 files changed, 127 insertions, 50 deletions

diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index 37b89a15f4..27d0c04083 100644
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -55,7 +55,7 @@
 #define COUNT_TYPE_BYTES    1
 #define COUNT_TYPE_ADVANCED 2
 
-#define LEFT_BORDER 50
+#define LEFT_BORDER 60
 #define RIGHT_BORDER 10
 #define TOP_BORDER 10
 #define BOTTOM_BORDER 50
@@ -111,7 +111,7 @@ static gboolean label_set = FALSE;
 static guint32 max_tsn=0, min_tsn=0;
 static void sctp_graph_set_title(struct sctp_udata *u_data);
 static void create_draw_area(GtkWidget *box, struct sctp_udata *u_data);
-
+static GtkWidget *zoomout_bt;
 
 static void draw_sack_graph(struct sctp_udata *u_data)
 {
@@ -213,7 +213,10 @@ static void draw_sack_graph(struct sctp_udata *u_data)
 							max_num=gap_end+tsnumber;
 							for (j=gap_start; j<=gap_end; j++)
 							{
-								diff = sack->secs*1000000+sack->usecs-u_data->io->min_x;
+								if (u_data->io->uoff)
+									diff = sack->secs - u_data->io->min_x;
+								else
+									diff=sack->secs*1000000+sack->usecs-u_data->io->min_x;
 								xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
 								yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE-u_data->io->offset-((SUB_32(j+tsnumber,min_tsn))*u_data->io->y_interval));
 								if (xvalue >= LEFT_BORDER+u_data->io->offset &&
@@ -233,7 +236,10 @@ static void draw_sack_graph(struct sctp_udata *u_data)
 						max_num=tsnumber;
 					if (tsnumber>=min_tsn)
 					{
-						diff=sack->secs*1000000+sack->usecs-u_data->io->min_x;
+						if (u_data->io->uoff)
+							diff = sack->secs - u_data->io->min_x;
+						else
+							diff=sack->secs*1000000+sack->usecs-u_data->io->min_x;
 						xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
 						yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE -u_data->io->offset-((SUB_32(tsnumber,min_tsn))*u_data->io->y_interval));
 						if (xvalue >= LEFT_BORDER+u_data->io->offset && 
@@ -305,10 +311,12 @@ static void draw_tsn_graph(struct sctp_udata *u_data)
 			type = ((struct chunk_header *)tlist->data)->type;
 			if (type == SCTP_DATA_CHUNK_ID)
 				tsnumber = ntohl(((struct data_chunk_header *)tlist->data)->tsn);
-
 			if (tsnumber>=min_tsn && tsnumber<=max_tsn && tsn->secs>=min_secs)
 			{
-					diff=tsn->secs*1000000+tsn->usecs-u_data->io->min_x;
+					if (u_data->io->uoff)
+						diff = tsn->secs - u_data->io->min_x;
+					else
+						diff=tsn->secs*1000000+tsn->usecs-u_data->io->min_x;
 					xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
 					yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE-u_data->io->offset-((SUB_32(tsnumber,min_tsn))*u_data->io->y_interval));
 					if (xvalue >= LEFT_BORDER+u_data->io->offset && 
@@ -329,16 +337,17 @@ static void draw_tsn_graph(struct sctp_udata *u_data)
 
 static void sctp_graph_draw(struct sctp_udata *u_data)
 {
-	int length, lwidth, j, b;
-	guint32  distance=5, i, e, sec, w, start, a;
+	int length, lwidth;
+	guint32  distance=5, i, e, sec, w, start, a, b, j;
 	gint label_width, label_height;
 	char label_string[15];
 	gfloat dis;
+	gboolean write_label = FALSE;
 
 #if GTK_MAJOR_VERSION < 2
-		GdkFont *font;
+	GdkFont *font;
 #else
-			PangoLayout  *layout;
+	PangoLayout  *layout;
 #endif
 
 	if (u_data->io->x1_tmp_sec==0 && u_data->io->x1_tmp_usec==0)
@@ -346,8 +355,19 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 	else
 		u_data->io->offset=5;
 
-	u_data->io->min_x=u_data->io->x1_tmp_sec*1000000+u_data->io->x1_tmp_usec;
-	u_data->io->max_x=u_data->io->x2_tmp_sec*1000000+u_data->io->x2_tmp_usec;
+	if (u_data->io->x2_tmp_sec - u_data->io->x1_tmp_sec > 1500)
+	{
+		u_data->io->min_x=u_data->io->x1_tmp_sec;
+		u_data->io->max_x=u_data->io->x2_tmp_sec;
+		u_data->io->uoff = TRUE;
+	}
+	else
+	{
+		u_data->io->min_x=u_data->io->x1_tmp_sec*1000000.0+u_data->io->x1_tmp_usec;
+		u_data->io->max_x=u_data->io->x2_tmp_sec*1000000.0+u_data->io->x2_tmp_usec;		
+		u_data->io->uoff = FALSE;
+	}
+
 	u_data->io->tmp_width=u_data->io->max_x-u_data->io->min_x;
 
 	if (u_data->dir==1)
@@ -399,12 +419,12 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 
 	/* try to avoid dividing by zero */
 	if(u_data->io->tmp_width>0){
-		u_data->io->x_interval = (float)((u_data->io->axis_width*1.0)/u_data->io->tmp_width);
+		u_data->io->x_interval = (float)((u_data->io->axis_width*1.0)/u_data->io->tmp_width); /*distance in pixels between 2 data points*/
 	} else {
 		u_data->io->x_interval = (float)(u_data->io->axis_width);
 	}
 
-	e=0;
+	e=0; /*number of decimals of x_interval*/
 	if (u_data->io->x_interval<1)
 	{
 		dis=1/u_data->io->x_interval;
@@ -414,24 +434,24 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 			e++;
 		}
 		distance=1;
-			for (i=0; i<=e+1; i++)
-			distance*=10;
+		for (i=0; i<=e+1; i++)
+			distance*=10; /*distance per 100 pixels*/
 	}
 	else
 		distance=5;
 
 #if GTK_MAJOR_VERSION < 2
-		font = u_data->io->draw_area->style->font;
+	font = u_data->io->draw_area->style->font;
 #endif
 
 #if GTK_MAJOR_VERSION < 2
-		label_width=gdk_string_width(font, label_string);
-		label_height=gdk_string_height(font, label_string);
+	label_width=gdk_string_width(font, label_string);
+	label_height=gdk_string_height(font, label_string);
 #else
-		g_snprintf(label_string, 15, "%d", 0);
-		memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
-		layout = gtk_widget_create_pango_layout(u_data->io->draw_area, label_string);
-		pango_layout_get_pixel_size(layout, &label_width, &label_height);
+	g_snprintf(label_string, 15, "%d", 0);
+	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+	layout = gtk_widget_create_pango_layout(u_data->io->draw_area, label_string);
+	pango_layout_get_pixel_size(layout, &label_width, &label_height);
 
 #endif
 
@@ -448,7 +468,7 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 #if GTK_MAJOR_VERSION < 2
 		lwidth=gdk_string_width(font, label_string);
 		gdk_draw_string(u_data->io->pixmap,font,u_data->io->draw_area->style->black_gc,
-		                LEFT_BORDER-10,
+		                LEFT_BORDER-25,
 		                u_data->io->pixmap_height-BOTTOM_BORDER+20,
 		                label_string);
 #else
@@ -457,40 +477,59 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 		pango_layout_get_pixel_size(layout, &lwidth, NULL);
 
 		gdk_draw_layout(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
-		                LEFT_BORDER-10,
+		                LEFT_BORDER-25,
 		                u_data->io->pixmap_height-BOTTOM_BORDER+20,
 		                layout);
 #endif
-}
+	}
+
+	w=(guint32)(500/(guint32)(distance*u_data->io->x_interval)); /*there will be a label for every w_th tic*/
 
-	w=(guint32)(500/(guint32)(distance*u_data->io->x_interval));
 	if (w==0)
 		w=1;
-	if (w==4)
+	
+	if (w==4 || w==3 || w==2)
 	{
 		w=5;
-		a=distance/10;
-		b=10+(((u_data->io->min_x/100000)-1)%5);
+		a=distance/10;  /*distance between two tics*/
+		b = (guint32)((u_data->io->min_x/100000))%10; /* start for labels*/
 	}
 	else
 	{
 		a=distance/5;
 		b=0;
 	}
+	
 
-	if (a>1000000)
-		start=u_data->io->min_x/1000000*1000000;
+	if (!u_data->io->uoff)	
+	{
+		if (a>=1000000)
+		{
+			start=u_data->io->min_x/1000000*1000000;
+			if (a==1000000)
+				b = 0;
+		}
+		else
+		{
+			start=u_data->io->min_x/100000;
+			if (start%2!=0)
+				start--;
+			start*=100000;
+			b = (guint32)((start/100000))%10;
+		}
+	}
 	else
 	{
-		start=u_data->io->min_x/100000;
+		start = u_data->io->min_x;
 		if (start%2!=0)
 			start--;
-		start*=100000;
+		b = 0;
+		
 	}
 
-
 	for (i=start, j=b; i<=u_data->io->max_x; i+=a, j++)
 	{
+		if (!u_data->io->uoff)
 		if (i>=u_data->io->min_x && i%1000000!=0)
 		{
 			length=5;
@@ -522,9 +561,24 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 				u_data->io->pixmap_height-BOTTOM_BORDER+length);
 		}
 
-		if (i%1000000==0)
+		if (!u_data->io->uoff)
+		{
+			if (i%1000000==0 && j%w==0)
+			{
+				sec=i/1000000;
+				write_label = TRUE;
+			}
+		}
+		else
+		{
+			if (j%w == 0)
+			{
+				sec = i;
+				write_label = TRUE;
+			}
+		}
+		if (write_label)
 		{
-			sec=i/1000000;
 			gdk_draw_line(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
 			(guint32)(LEFT_BORDER+u_data->io->offset+(i-u_data->io->min_x)*u_data->io->x_interval),
 			u_data->io->pixmap_height-BOTTOM_BORDER,
@@ -535,7 +589,7 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 			#if GTK_MAJOR_VERSION < 2
 				lwidth=gdk_string_width(font, label_string);
 				gdk_draw_string(u_data->io->pixmap,font,u_data->io->draw_area->style->black_gc,
-					(guint32)(LEFT_BORDER+u_data->io->offset+(i-u_data->io->min_x)*u_data->io->x_interval),
+					(guint32)(LEFT_BORDER+u_data->io->offset+(i-u_data->io->min_x)*u_data->io->x_interval-10),
 					u_data->io->pixmap_height-BOTTOM_BORDER+20,
 					label_string);
 			#else
@@ -544,11 +598,13 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 				pango_layout_get_pixel_size(layout, &lwidth, NULL);
 
 				gdk_draw_layout(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
-				(guint32)(LEFT_BORDER+u_data->io->offset+(i-u_data->io->min_x)*u_data->io->x_interval),
+				(guint32)(LEFT_BORDER+u_data->io->offset+(i-u_data->io->min_x)*u_data->io->x_interval-10),
 					u_data->io->pixmap_height-BOTTOM_BORDER+20,
 					layout);
 			#endif
+			write_label = FALSE;
 		}
+		
 	}
 
 	strcpy(label_string, "sec");
@@ -559,7 +615,7 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 	                font,
 	                u_data->io->draw_area->style->black_gc,
 	                u_data->io->pixmap_width-RIGHT_BORDER-10,
-	                u_data->io->pixmap_height-BOTTOM_BORDER+20,
+	                u_data->io->pixmap_height-BOTTOM_BORDER+30,
 	                label_string);
 #else
 	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
@@ -568,7 +624,7 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 	gdk_draw_layout(u_data->io->pixmap,
 	                u_data->io->draw_area->style->black_gc,
 	                u_data->io->pixmap_width-RIGHT_BORDER-10,
-	                u_data->io->pixmap_height-BOTTOM_BORDER+25,
+	                u_data->io->pixmap_height-BOTTOM_BORDER+30,
 	                layout);
 #endif
 
@@ -594,6 +650,8 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 		for (i=0; i<=e; i++)
 			distance=distance*10;
 	}
+	else if (u_data->io->y_interval<2)
+		distance = 10;
 
 	if (u_data->io->max_y>0)
 	{
@@ -783,8 +841,13 @@ on_zoomin_bt (GtkWidget *widget _U_, struct sctp_udata *u_data)
 		u_data->io->tmp=TRUE;
 		u_data->io->rectangle=FALSE;
 		u_data->io->rectangle_present=FALSE;
+		gtk_widget_set_sensitive(zoomout_bt, TRUE);
 		sctp_graph_redraw(u_data);
 	}
+	else
+	{
+		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Please draw a rectangle around the area you want to zoom in!");
+	}
 }
 
 static void
@@ -811,6 +874,7 @@ zoomin_bt (struct sctp_udata *u_data)
 	u_data->io->tmp=TRUE;
 	u_data->io->rectangle=FALSE;
 	u_data->io->rectangle_present=FALSE;
+	gtk_widget_set_sensitive(zoomout_bt, TRUE);
 	sctp_graph_redraw(u_data);
 	
 }
@@ -868,7 +932,8 @@ on_zoomout_bt (GtkWidget *widget _U_, struct sctp_udata *u_data)
 		u_data->io->tmp_max_tsn2=u_data->assoc->max_tsn2;
 		u_data->io->tmp=FALSE;
 	}
-
+	if (g_slist_length(u_data->assoc->min_max)==1)
+		gtk_widget_set_sensitive(zoomout_bt, FALSE);
 	sctp_graph_redraw(u_data);
 }
 
@@ -980,14 +1045,27 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
 			x2_tmp=x1_tmp;
 			x1_tmp=helpx;
 		}
+		if (u_data->io->uoff)
+		{
+			if (x2_tmp - x1_tmp <= 1500)			
+				u_data->io->uoff = FALSE;
+			u_data->io->x1_tmp_sec=(guint32)x1_tmp;
+			u_data->io->x1_tmp_usec=0;
+			u_data->io->x2_tmp_sec=(guint32)x2_tmp;
+			u_data->io->x2_tmp_usec=0;
+		}
+		else 
+		{
+			u_data->io->x1_tmp_sec=(guint32)x1_tmp/1000000;
+			u_data->io->x1_tmp_usec=x1_tmp%1000000;
+			u_data->io->x2_tmp_sec=(guint32)x2_tmp/1000000;
+			u_data->io->x2_tmp_usec=x2_tmp%1000000;
+		}
 		u_data->io->x1_akt_sec = u_data->io->x1_tmp_sec;
 		u_data->io->x1_akt_usec = u_data->io->x1_tmp_usec;
 		u_data->io->x2_akt_sec = u_data->io->x2_tmp_sec;
 		u_data->io->x2_akt_usec = u_data->io->x2_tmp_usec;
-		u_data->io->x1_tmp_sec=(guint32)x1_tmp/1000000;
-		u_data->io->x1_tmp_usec=x1_tmp%1000000;
-		u_data->io->x2_tmp_sec=(guint32)x2_tmp/1000000;
-		u_data->io->x2_tmp_usec=x2_tmp%1000000;
+
 		u_data->io->y1_tmp=(guint32)((u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-u_data->io->y_old)/u_data->io->y_interval);
 		u_data->io->y2_tmp=(guint32)((u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-event->y)/u_data->io->y_interval);
 		helpy = MIN(u_data->io->y1_tmp, u_data->io->y2_tmp);
@@ -1073,7 +1151,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 {
 	GtkWidget *vbox;
 	GtkWidget *hbox;
-	GtkWidget *bt_close, *sack_bt, *tsn_bt, *both_bt, *zoomin_bt, *zoomout_bt;
+	GtkWidget *bt_close, *sack_bt, *tsn_bt, *both_bt, *zoomin_bt;
 	GtkTooltips *tooltip_in, *tooltip_out;
 
 	/* create the main window */
@@ -1119,7 +1197,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 	gtk_widget_show(zoomin_bt);
 	SIGNAL_CONNECT(zoomin_bt, "clicked", on_zoomin_bt, u_data);
 	tooltip_in = gtk_tooltips_new();
-	gtk_tooltips_set_tip(tooltip_in, zoomin_bt, "Draw a rectangle around the area you want to zoom in", NULL);
+	gtk_tooltips_set_tip(tooltip_in, zoomin_bt, "Zoom in the area you have selected", NULL);
 
 	zoomout_bt = gtk_button_new_with_label ("Zoom out");
 	gtk_box_pack_start(GTK_BOX(hbox), zoomout_bt, FALSE, FALSE, 0);
@@ -1127,7 +1205,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 	SIGNAL_CONNECT(zoomout_bt, "clicked", on_zoomout_bt, u_data);
 	tooltip_out = gtk_tooltips_new();
 	gtk_tooltips_set_tip(tooltip_out, zoomout_bt, "Zoom out one step", NULL);
-
+	gtk_widget_set_sensitive(zoomout_bt, FALSE);
 
 	bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
 	gtk_box_pack_start(GTK_BOX(hbox), bt_close, FALSE, FALSE, 0);
@@ -1172,7 +1250,6 @@ gtk_sctpgraph_init(struct sctp_udata *u_data)
 	io->pixmap_height=600;
 	io->graph_type=0;
 	dir=u_data->dir-1;
-
 	u_data->io=io;
 	u_data->io->x1_tmp_sec=u_data->assoc->min_secs;
 	u_data->io->x1_tmp_usec=u_data->assoc->min_usecs;