[Jrobin-commits] src/jrobin/demo JRobinComplexGraph.java,1.3,1.4

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

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

Modified Files:
	JRobinComplexGraph.java 
Log Message:
GRAPH LIB UPDATES
Add graph coloring options
setChartLeftPadding()
fixed bug with getNiceHigher()

Index: JRobinComplexGraph.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinComplexGraph.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JRobinComplexGraph.java	30 Sep 2003 21:45:22 -0000	1.3
--- JRobinComplexGraph.java	3 Oct 2003 10:09:52 -0000	1.4
***************
*** 75,79 ****
  			gDef.area("p75t90", new Color(0xff,0x66,0x00), "75 - 90%");
  			gDef.area("p90t100", new Color(0xcc,0x33,0x00), "90 - 100%");
! 			gDef.rule(10.0, Color.ORANGE, null);
  			gDef.gprint("busy", "AVERAGE", " Average:@5.1@s%");
  			gDef.gprint("busy", "LAST", "Current: @5.1@s%");
--- 75,79 ----
  			gDef.area("p75t90", new Color(0xff,0x66,0x00), "75 - 90%");
  			gDef.area("p90t100", new Color(0xcc,0x33,0x00), "90 - 100%");
! 			//gDef.rule(10.0, Color.ORANGE, null);
  			gDef.gprint("busy", "AVERAGE", " Average:@5.1@s%");
  			gDef.gprint("busy", "LAST", "Current: @5.1@s%");
***************
*** 97,107 ****
  			gDef.comment("-------------------------------------------------------------------------------@c");
  			gDef.comment("Generated: " + new Date() + "@r");
! 			//gDef.setBackColor( Color.ORANGE );
  			gDef.setValueAxisLabel("server load");
  			//gDef.setGridX( false );
  			//gDef.setGridY( false );
! 			gDef.setImageBorder( Color.DARK_GRAY, 1 );
  			gDef.setFrontGrid(false);
  			gDef.setShowLegend(true);
  			// Create actual graph
  			RrdGraph graph = new RrdGraph(gDef);
--- 97,115 ----
  			gDef.comment("-------------------------------------------------------------------------------@c");
  			gDef.comment("Generated: " + new Date() + "@r");
! 			gDef.setBackColor( Color.DARK_GRAY );
! 			gDef.setCanvasColor( Color.LIGHT_GRAY );
  			gDef.setValueAxisLabel("server load");
+ 			gDef.setFontColor( Color.WHITE );
  			//gDef.setGridX( false );
  			//gDef.setGridY( false );
! 			gDef.setImageBorder( Color.BLACK, 1 );
  			gDef.setFrontGrid(false);
  			gDef.setShowLegend(true);
+ 			gDef.setMajorGridColor(Color.BLACK);
+ 			gDef.setMinorGridColor( new Color( 130, 30, 30) );
+ 			gDef.setFrameColor( Color.YELLOW );
+ 			gDef.setAxisColor( Color.RED );
+ 			gDef.setArrowColor( Color.GREEN );
+ 			gDef.setChartLeftPadding( 40 );
  			// Create actual graph
  			RrdGraph graph = new RrdGraph(gDef);
***************
*** 111,115 ****
  			// -- New graph
  			RrdGraphDef gd = new RrdGraphDef();
! 			gd.setBackColor( Color.WHITE );
  			gd.setTimePeriod( start, end );
  			gd.datasource("in2", "c:/test.rrd", "ifInOctets", "AVERAGE");
--- 119,123 ----
  			// -- New graph
  			RrdGraphDef gd = new RrdGraphDef();
! 			//gd.setBackColor( Color.WHITE );
  			gd.setTimePeriod( start, end );
  			gd.datasource("in2", "c:/test.rrd", "ifInOctets", "AVERAGE");
***************
*** 125,129 ****
  			//////////////////////////////
  			gd = new RrdGraphDef();
! 			gd.setBackColor( Color.WHITE );
  			gd.setTimePeriod( start, end );
  			gd.datasource("in2", "c:/test.rrd", "ifInUcastPkts", "AVERAGE");
--- 133,137 ----
  			//////////////////////////////
  			gd = new RrdGraphDef();
! 			//gd.setBackColor( Color.WHITE );
  			gd.setTimePeriod( start, end );
  			gd.datasource("in2", "c:/test.rrd", "ifInUcastPkts", "AVERAGE");