alejoar · alejoar · commit 1ae8239f63a3 · 2014-07-23T21:14:56.000+02:00
Change-Id: If7b079ca606f6ff2cd562f47982c5ce42d120e7f
Signed-off-by: panacotta &lt;alejoar@gmail.com&gt;
diff --git a/papiplot/src/plot.c b/papiplot/src/plot.c
@@ -161,7 +161,7 @@ void configure_handle(gnuplot_ctrl *  h, int number_of_events, int number_of_ele
 	gnuplot_cmd(h, "set xtics out");
 	gnuplot_cmd(h, "set xtics nomirror");
 	gnuplot_cmd(h, "set xtics autofreq");
-	gnuplot_cmd(h, "set xtics font \"Verdana,%d\"", tics_font_size);
+	gnuplot_cmd(h, "set xtics font \"monospace,%d\"", tics_font_size);
 	gnuplot_cmd(h, "set tic scale 0");
 	gnuplot_cmd(h, "set grid");
 
@@ -222,13 +222,13 @@ void plot_overall(char* output_path, char *path, int number_of_actors, int numbe
 		else{
 			for(i=0;i<number_of_events;i++){
 				if(i == 0){//first
-					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);
+					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);
 					}
 				else if (i==(number_of_events-1)){//last
-					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle", path, i, i+2, i+2, labels_font_size);
+					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle", path, i, i+2, i+2, labels_font_size);
 				}
 				else{
-					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);
+					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);
 				}
 			}
 		}
@@ -290,13 +290,13 @@ void plot(char* output_path, char *path, char* actor_name, int number_of_actions
 		else{
 			for(i=0;i<number_of_events;i++){
 				if(i == 0){//first
-					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);
+					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);
 					}
 				else if (i==(number_of_events-1)){//last
-					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle", path, i, i+2, i+2, labels_font_size);
+					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle", path, i, i+2, i+2, labels_font_size);
 				}
 				else{
-					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);
+					gnuplot_cmd(h, "\"%s\" using ((d='|'.strcol(1).'|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);
 				}
 			}
 		}
@@ -331,7 +331,7 @@ const int is_papioutput(const char *filename) {
 }
 
 void html_init(FILE* htmlfile){
-	fprintf(htmlfile, "<html><head><meta content=\"text/html; charset=ISO-8859-1\" http-equiv=\"content-type\"><title></title></head>"
+	fprintf(htmlfile, "<html><head><meta content=\"text/html; charset=ISO-8859-1\" http-equiv=\"content-type\"><title>PAPI stats</title></head>"
 			"<body><h1>Papify stats processed with PapiPlot</h1><hr style=\"width: 100%; height: 2px;\">");
 }
 void html_close(FILE* htmlfile, char* path){

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ void configure_handle(gnuplot_ctrl * h, int number_of_events, int number_of_ele`
`161`	`161`	`gnuplot_cmd(h, "set xtics out");`
`162`	`162`	`gnuplot_cmd(h, "set xtics nomirror");`
`163`	`163`	`gnuplot_cmd(h, "set xtics autofreq");`
`164`		`- gnuplot_cmd(h, "set xtics font \"Verdana,%d\"", tics_font_size);`
	`164`	`+ gnuplot_cmd(h, "set xtics font \"monospace,%d\"", tics_font_size);`
`165`	`165`	`gnuplot_cmd(h, "set tic scale 0");`
`166`	`166`	`gnuplot_cmd(h, "set grid");`
`167`	`167`
`@@ -222,13 +222,13 @@ void plot_overall(char* output_path, char *path, int number_of_actors, int numbe`
`222`	`222`	`else{`
`223`	`223`	`for(i=0;i<number_of_events;i++){`
`224`	`224`	`if(i == 0){//first`
`225`		`- gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);`
	`225`	`+ gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);`
`226`	`226`	`}`
`227`	`227`	`else if (i==(number_of_events-1)){//last`
`228`		`- gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle", path, i, i+2, i+2, labels_font_size);`
	`228`	`+ gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle", path, i, i+2, i+2, labels_font_size);`
`229`	`229`	`}`
`230`	`230`	`else{`
`231`		`- gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);`
	`231`	`+ gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`}`
`@@ -290,13 +290,13 @@ void plot(char* output_path, char path, char actor_name, int number_of_actions`
`290`	`290`	`else{`
`291`	`291`	`for(i=0;i<number_of_events;i++){`
`292`	`292`	`if(i == 0){//first`
`293`		`- gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);`
	`293`	`+ gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);`
`294`	`294`	`}`
`295`	`295`	`else if (i==(number_of_events-1)){//last`
`296`		`- gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle", path, i, i+2, i+2, labels_font_size);`
	`296`	`+ gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle", path, i, i+2, i+2, labels_font_size);`
`297`	`297`	`}`
`298`	`298`	`else{`
`299`		`- gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"Verdana,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);`
	`299`	`+ gnuplot_cmd(h, "\"%s\" using ((d='\|'.strcol(1).'\|', add_label(d),index(d))+(d_width*%d)):%d:(gprintf(\"%%.2se%%S\", $%d)) w labels rotate by 20 font \"monospace,%d\" notitle,\\", path, i, i+2, i+2, labels_font_size);`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`	`}`
`@@ -331,7 +331,7 @@ const int is_papioutput(const char *filename) {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`void html_init(FILE* htmlfile){`
`334`		`- fprintf(htmlfile, "<html><head><meta content=\"text/html; charset=ISO-8859-1\" http-equiv=\"content-type\"><title></title></head>"`
	`334`	`+ fprintf(htmlfile, "<html><head><meta content=\"text/html; charset=ISO-8859-1\" http-equiv=\"content-type\"><title>PAPI stats</title></head>"`
`335`	`335`	`"<body><h1>Papify stats processed with PapiPlot</h1><hr style=\"width: 100%; height: 2px;\">");`
`336`	`336`	`}`
`337`	`337`	`void html_close(FILE* htmlfile, char* path){`