[Jrobin-commits] src/jrobin/demo JRobinComplexGraph.java,1.8,1.9

[<cob...@us...>]

Update of /cvsroot/jrobin/src/jrobin/demo
In directory sc8-pr-cvs1:/tmp/cvs-serv19517/src/jrobin/demo

Modified Files:
	JRobinComplexGraph.java 
Log Message:
GRAPH LIB UPDATES
Add line width to horizontal rule 
Fixed stack legend

Index: JRobinComplexGraph.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinComplexGraph.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JRobinComplexGraph.java	15 Oct 2003 21:19:08 -0000	1.8
--- JRobinComplexGraph.java	17 Oct 2003 14:46:39 -0000	1.9
***************
*** 67,75 ****
  			gDef.comment("CPU utilization (%)\n");
  			gDef.comment("  ");
  			gDef.area("load", new Color(0x66,0x99,0xcc), " 0 - 25%");
  			gDef.area("p25t50", new Color(0x00,0x66,0x99), "25 - 50%");
  			gDef.comment("             ");
  			gDef.gprint("busy", "MIN", "Minimum:@5.1@s%");
! 			gDef.gprint("busy", "MAX", "Maximum: @5.1@s%");
  			gDef.comment("\n");
  			gDef.comment("  ");
--- 67,76 ----
  			gDef.comment("CPU utilization (%)\n");
  			gDef.comment("  ");
+ 			gDef.hrule( 7.0, Color.YELLOW, null, 10f);
  			gDef.area("load", new Color(0x66,0x99,0xcc), " 0 - 25%");
  			gDef.area("p25t50", new Color(0x00,0x66,0x99), "25 - 50%");
  			gDef.comment("             ");
  			gDef.gprint("busy", "MIN", "Minimum:@5.1@s%");
! 			gDef.gprint("busy", "MAX", "Maximum: @5.1@S%");
  			gDef.comment("\n");
  			gDef.comment("  ");
***************
*** 86,90 ****
  			gDef.line("load", new Color(0x00,0x00,0x00), "Load average (5 min)" );
  			//gDef.area("load", Color.RED, " hmm \n");
! 			//gDef.stack("p75t90", Color.GREEN, " hmm \n");
  			gDef.comment("             ");
  			gDef.gprint("load", "MIN", " Minimum: @5.2@s");
--- 87,91 ----
  			gDef.line("load", new Color(0x00,0x00,0x00), "Load average (5 min)" );
  			//gDef.area("load", Color.RED, " hmm \n");
! 			//gDef.stack("p75t90", Color.GREEN, " hmm");
  			gDef.comment("             ");
  			gDef.gprint("load", "MIN", " Minimum: @5.2@s");
***************
*** 98,102 ****
  			gDef.comment("\n");
  			gDef.comment("-------------------------------------------------------------------------------@c");
! 			gDef.vrule( new GregorianCalendar(2003, 7, 24, 9, 00), Color.BLUE, "9am", 3f );
  			gDef.vrule( new GregorianCalendar(2003, 7, 24, 17, 00), Color.BLUE, "5pm", 3f );
  			gDef.comment("Generated: " + new Date() + "@r");
--- 99,103 ----
  			gDef.comment("\n");
  			gDef.comment("-------------------------------------------------------------------------------@c");
! 			gDef.vrule( new GregorianCalendar(2003, 7, 24, 9, 00), Color.BLUE, "9am", 2f );
  			gDef.vrule( new GregorianCalendar(2003, 7, 24, 17, 00), Color.BLUE, "5pm", 3f );
  			gDef.comment("Generated: " + new Date() + "@r");
***************
*** 115,119 ****
  			gDef.setAxisColor( Color.RED );
  			gDef.setArrowColor( Color.GREEN );
! 			gDef.setChartLeftPadding( 40 );
  			//gDef.setAntiAliasing(false);
  			//gDef.setTimeAxis( TimeAxisUnit.HOUR, 6, TimeAxisUnit.DAY, 1, "EEEEE dd MMM", true );
--- 116,120 ----
  			gDef.setAxisColor( Color.RED );
  			gDef.setArrowColor( Color.GREEN );
! 			//gDef.setChartLeftPadding( 40 );
  			//gDef.setAntiAliasing(false);
  			//gDef.setTimeAxis( TimeAxisUnit.HOUR, 6, TimeAxisUnit.DAY, 1, "EEEEE dd MMM", true );
***************
*** 137,140 ****
--- 138,143 ----
  			gd.area("in", Color.GREEN, null);
  			gd.line("out", Color.BLUE, null);
+ 			gd.gprint("out", "AVERAGE", " Minimum: @5.2@s");
+ 			gd.gprint("in", "AVERAGE", "Maximum: @6.2@s");
  			gd.setRigidGrid(true);			
  			RrdGraph graph2 = new RrdGraph(gd);