|
From: <cob...@us...> - 2003-10-30 16:21:17
|
Update of /cvsroot/jrobin/src/jrobin/demo
In directory sc8-pr-cvs1:/tmp/cvs-serv20325/src/jrobin/demo
Modified Files:
JRobinGallery.java JRobinDemo.java JRobinComplexDemo.java
Removed Files:
JRobinTimeProfiler.java TimeProfile.java
JRobinComplexGraph.java ProfileGraphsOld.java
ProfileGraphsNew.java
Log Message:
Graph lib 1.2.0
Almost final to final...
Minor fixes, minor tweaking
Added option to disable spacer between comments
Index: JRobinGallery.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinGallery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JRobinGallery.java 27 Oct 2003 21:03:33 -0000 1.5
--- JRobinGallery.java 30 Oct 2003 16:21:13 -0000 1.6
***************
*** 1,6 ****
package jrobin.demo;
! import jrobin.graph2.RrdGraphDef;
! import jrobin.graph2.RrdGraph;
import jrobin.core.RrdException;
--- 1,6 ----
package jrobin.demo;
! import jrobin.graph.RrdGraphDef;
! import jrobin.graph.RrdGraph;
import jrobin.core.RrdException;
***************
*** 22,25 ****
--- 22,27 ----
GregorianCalendar start = new GregorianCalendar(2003, 3, 25);
GregorianCalendar end = new GregorianCalendar(2003, 5, 5);
+ //GregorianCalendar start = new GregorianCalendar(2003, 4, 1, 13, 00);
+ //GregorianCalendar end = new GregorianCalendar(2003, 4, 1, 13, 50);
def.setTimePeriod(start, end);
long t0 = start.getTime().getTime() / 1000L;
Index: JRobinDemo.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinDemo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JRobinDemo.java 28 Oct 2003 14:51:39 -0000 1.9
--- JRobinDemo.java 30 Oct 2003 16:21:13 -0000 1.10
***************
*** 175,181 ****
RrdGraphDef gDef = new RrdGraphDef();
gDef.setTimePeriod(start, end);
- gDef.setTimeAxisLabel("day in month");
gDef.setTitle("Temperatures in May 2003");
! gDef.setValueAxisLabel("temperature");
gDef.datasource("sun", rrdRestoredPath, "sun", "AVERAGE");
gDef.datasource("shade", rrdRestoredPath, "shade", "AVERAGE");
--- 175,180 ----
RrdGraphDef gDef = new RrdGraphDef();
gDef.setTimePeriod(start, end);
gDef.setTitle("Temperatures in May 2003");
! gDef.setVerticalLabel("temperature");
gDef.datasource("sun", rrdRestoredPath, "sun", "AVERAGE");
gDef.datasource("shade", rrdRestoredPath, "shade", "AVERAGE");
Index: JRobinComplexDemo.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinComplexDemo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JRobinComplexDemo.java 27 Oct 2003 21:03:33 -0000 1.1
--- JRobinComplexDemo.java 30 Oct 2003 16:21:13 -0000 1.2
***************
*** 31,35 ****
import jrobin.core.*;
! import jrobin.graph2.*;
/**
--- 31,35 ----
import jrobin.core.*;
! import jrobin.graph.*;
/**
***************
*** 101,105 ****
def.comment( "[ courtesy of www.cherrymon.org ]@L" );
def.comment( "Generated: " + timestamp() + " @r" );
!
graph.setGraphDef( def );
graph.saveAsPNG( "/complexdemo1.png" );
--- 101,105 ----
def.comment( "[ courtesy of www.cherrymon.org ]@L" );
def.comment( "Generated: " + timestamp() + " @r" );
!
graph.setGraphDef( def );
graph.saveAsPNG( "/complexdemo1.png" );
***************
*** 114,117 ****
--- 114,118 ----
def = new RrdGraphDef( start, stop );
def.setImageBorder( Color.GRAY, 1 );
+ //def.setGridRange( -4.5, 0.5, false );
def.setTitle( "JRobinComplexDemo@Ldemo graph 2@r\nServer load and CPU utilization" );
def.datasource("load", demofile, "serverLoad", "AVERAGE");
***************
*** 128,140 ****
def.comment( "CPU utilization (%)\n " );
def.area("load", new Color(0x66,0x99,0xcc), " 0 - 25%");
! def.area("p25t50", new Color(0x00,0x66,0x99), "25 - 50%");
! def.comment(" ");
def.gprint("busy", "MIN", "Minimum:@5.1@s%");
! def.gprint("busy", "MAX", "Maximum:@5.1@s%\n ");
def.area("p50t75", new Color(0x66,0x66,0x00), "50 - 75%");
def.area("p75t90", new Color(0xff,0x66,0x00), "75 - 90%");
! def.area("p90t100", new Color(0xcc,0x33,0x00), "90 - 100%");
def.gprint("busy", "AVG", " Average:@5.1@s%");
! def.gprint("busy", "LAST", "Current:@5.1@s%\n ");
def.comment( "\nServer load\n " );
def.line("load", new Color(0x00,0x00,0x00), "Load average (5 min)@L" );
--- 129,140 ----
def.comment( "CPU utilization (%)\n " );
def.area("load", new Color(0x66,0x99,0xcc), " 0 - 25%");
! def.area("p25t50", new Color(0x00,0x66,0x99), "25 - 50%@L");
def.gprint("busy", "MIN", "Minimum:@5.1@s%");
! def.gprint("busy", "MAX", "Maximum:@5.1@s% @r ");
def.area("p50t75", new Color(0x66,0x66,0x00), "50 - 75%");
def.area("p75t90", new Color(0xff,0x66,0x00), "75 - 90%");
! def.area("p90t100", new Color(0xcc,0x33,0x00), "90 - 100%@L");
def.gprint("busy", "AVG", " Average:@5.1@s%");
! def.gprint("busy", "LAST", "Current:@5.1@s% @r ");
def.comment( "\nServer load\n " );
def.line("load", new Color(0x00,0x00,0x00), "Load average (5 min)@L" );
***************
*** 152,155 ****
--- 152,158 ----
println( "- Creating graph 2: complexdemo2.jpg" );
graph.saveAsJPEG( "/complexdemo2.jpg", 640, 480, 1.0f );
+
+ println( "- Creating graph 2: complexdemo2.gif" );
+ graph.saveAsGIF( "/complexdemo2.gif" );
// ---------------------------------------------------------------
***************
*** 210,218 ****
public static void main(String[] args)
{
createDatabase();
createGraphs();
! println( "- Demo finished." );
}
}
--- 213,236 ----
public static void main(String[] args)
{
+ long start = System.currentTimeMillis();
+
+ println( "********************************************************************" );
+ println( "* JRobinComplexDemo *" );
+ println( "* This demo creates 3 separate graphs and stores them under *" );
+ println( "* several formats in 6 files. Values are selected from a large *" );
+ println( "* RRD file that will be created by importing an XML dump of +7 MB. *" );
+ println( "* *" );
+ println( "* Graphs are created using real-life values, original RRD file *" );
+ println( "* provided by www.cherrymon.org. See the JRobinComplexDemo *" );
+ println( "* sourcecode on how to create the graphs generated by this demo. *" );
+ println( "********************************************************************" );
+
createDatabase();
createGraphs();
! long stop = System.currentTimeMillis();
!
! println( "- Demo finished in " + (stop - start) + " milliseconds." );
}
}
--- JRobinTimeProfiler.java DELETED ---
--- TimeProfile.java DELETED ---
--- JRobinComplexGraph.java DELETED ---
--- ProfileGraphsOld.java DELETED ---
--- ProfileGraphsNew.java DELETED ---
|