From: Nathaniel G. A. <nat...@us...> - 2004-05-31 21:12:25
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32207/src/java/org/krysalis/jcharts/demo/userGuide Modified Files: PointChartsGuide.java LegendsGuide.java AxisChartsGuide.java BarChartsGuide.java ComboChartsGuide.java UserGuideBase.java StockChartsGuide.java PieChartsGuide.java AreaChartsGuide.java AllChartsGuide.java PieChart3DGuide.java LineChartsGuide.java Log Message: changed the paths Index: PieChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/PieChartsGuide.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PieChartsGuide.java 31 May 2003 19:10:28 -0000 1.1 --- PieChartsGuide.java 31 May 2004 21:12:15 -0000 1.2 *************** *** 57,60 **** --- 57,65 ---- { + public PieChartsGuide() + { + super( "pieCharts" ); + } + /***************************************************************************************** * Tests a 'real' data set and usage. Index: LegendsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/LegendsGuide.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LegendsGuide.java 8 Aug 2003 08:51:27 -0000 1.6 --- LegendsGuide.java 31 May 2004 21:12:15 -0000 1.7 *************** *** 62,65 **** --- 62,71 ---- public class LegendsGuide extends UserGuideBase { + + public LegendsGuide() + { + super( "legends" ); + } + /***************************************************************************************** Index: StockChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/StockChartsGuide.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StockChartsGuide.java 31 May 2003 19:10:28 -0000 1.1 --- StockChartsGuide.java 31 May 2004 21:12:15 -0000 1.2 *************** *** 60,66 **** /*****************************************************************************************/ ! public StockChartsGuide() throws Throwable { ! super(); } --- 60,66 ---- /*****************************************************************************************/ ! public StockChartsGuide() { ! super( "stock" ); } Index: PieChart3DGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/PieChart3DGuide.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PieChart3DGuide.java 13 Dec 2003 23:35:28 -0000 1.2 --- PieChart3DGuide.java 31 May 2004 21:12:15 -0000 1.3 *************** *** 58,61 **** --- 58,66 ---- public class PieChart3DGuide extends UserGuideBase { + + public PieChart3DGuide() + { + super( "pieChart3d" ); + } /***************************************************************************************** Index: PointChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/PointChartsGuide.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PointChartsGuide.java 31 May 2003 19:10:28 -0000 1.1 --- PointChartsGuide.java 31 May 2004 21:12:15 -0000 1.2 *************** *** 62,66 **** public PointChartsGuide() throws Throwable { ! super(); } --- 62,66 ---- public PointChartsGuide() throws Throwable { ! super( "pointCharts" ); } Index: AxisChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/AxisChartsGuide.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AxisChartsGuide.java 5 Jul 2003 13:24:35 -0000 1.3 --- AxisChartsGuide.java 31 May 2004 21:12:15 -0000 1.4 *************** *** 69,72 **** --- 69,84 ---- + public AxisChartsGuide() + { + super( "axisCharts" ); + } + + + public AxisChartsGuide( String subDirectory ) + { + super( subDirectory ); + } + + /***************************************************************************************** * Index: UserGuideBase.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/UserGuideBase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UserGuideBase.java 3 Sep 2003 02:40:13 -0000 1.5 --- UserGuideBase.java 31 May 2004 21:12:15 -0000 1.6 *************** *** 49,56 **** public class UserGuideBase { ! private static String path= "./src/documentation/resources/images/userGuide/"; ! private static String subdir; /******************************************************************************************* * --- 49,62 ---- public class UserGuideBase { ! private String path= "./src/documentation/resources/images/userGuide/"; ! private String subdir; + public UserGuideBase( String subdirectory ) + { + this.subdir= subdirectory; + } + + /******************************************************************************************* * *************** *** 73,77 **** if( whatToRun.equals( "all" ) ) { - UserGuideBase.subdir= "allCharts/"; AllChartsGuide allCharts = new AllChartsGuide(); allCharts.run(); --- 79,82 ---- *************** *** 80,84 **** if( whatToRun.equals( "legend" ) ) { - UserGuideBase.subdir= "legends/"; LegendsGuide legends = new LegendsGuide(); legends.run(); --- 85,88 ---- *************** *** 87,91 **** if( whatToRun.equals( "stock" ) ) { - UserGuideBase.subdir= "allCharts/"; StockChartsGuide stockCharts = new StockChartsGuide(); stockCharts.run(); --- 91,94 ---- *************** *** 94,98 **** if( whatToRun.equals( "pie" ) ) { - UserGuideBase.subdir= "pieCharts/"; PieChartsGuide pieChart = new PieChartsGuide(); pieChart.run(); --- 97,100 ---- *************** *** 101,105 **** if( whatToRun.equals( "pie3d" ) ) { - UserGuideBase.subdir= "pieChart3d/"; PieChart3DGuide pieChart3D = new PieChart3DGuide(); pieChart3D.run(); --- 103,106 ---- *************** *** 108,112 **** if( whatToRun.equals( "axis" ) ) { - UserGuideBase.subdir= "axisCharts/"; AxisChartsGuide axisCharts = new AxisChartsGuide(); axisCharts.run(); --- 109,112 ---- *************** *** 115,119 **** if( whatToRun.equals( "area" ) ) { - UserGuideBase.subdir= "areaCharts/"; AreaChartsGuide areaCharts = new AreaChartsGuide(); areaCharts.run(); --- 115,118 ---- *************** *** 122,126 **** if( whatToRun.equals( "bar" ) ) { - UserGuideBase.subdir= "barCharts/"; BarChartsGuide barCharts = new BarChartsGuide(); barCharts.run(); --- 121,124 ---- *************** *** 129,133 **** if( whatToRun.equals( "line" ) ) { - UserGuideBase.subdir= "lineCharts/"; LineChartsGuide lineCharts = new LineChartsGuide(); lineCharts.run(); --- 127,130 ---- *************** *** 136,140 **** if( whatToRun.equals( "point" ) ) { - UserGuideBase.subdir= "pointCharts/"; PointChartsGuide pointCharts = new PointChartsGuide(); pointCharts.run(); --- 133,136 ---- *************** *** 143,147 **** if( whatToRun.equals( "combo" ) ) { - UserGuideBase.subdir= "comboCharts/"; ComboChartsGuide comboCharts = new ComboChartsGuide(); comboCharts.run(); --- 139,142 ---- *************** *** 186,189 **** --- 181,194 ---- } + + /******************************************************************************** + * + * @return String + *******************************************************************************/ + private String getSubdirectory() + { + return this.subdir; + } + /****************************************************************************************** *************** *** 198,205 **** String extension = ".png"; FileOutputStream fileOutputStream; ! try { ! fileOutputStream = new FileOutputStream( UserGuideBase.path + UserGuideBase.subdir + fileName + extension ); PNGEncoder.encode( chart, fileOutputStream ); //JPEGEncoder13.encode( chart, 1.0f, fileOutputStream ); --- 203,212 ---- String extension = ".png"; FileOutputStream fileOutputStream; ! String path= this.path + this.getSubdirectory() + "/" + fileName + extension; ! try { ! System.out.println( path ); ! fileOutputStream = new FileOutputStream( path ); PNGEncoder.encode( chart, fileOutputStream ); //JPEGEncoder13.encode( chart, 1.0f, fileOutputStream ); Index: AreaChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/AreaChartsGuide.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AreaChartsGuide.java 31 May 2003 19:10:27 -0000 1.1 --- AreaChartsGuide.java 31 May 2004 21:12:15 -0000 1.2 *************** *** 58,62 **** public class AreaChartsGuide extends AxisChartsGuide { ! /***************************************************************************************** * Tests a 'real' data set and usage. --- 58,67 ---- public class AreaChartsGuide extends AxisChartsGuide { ! public AreaChartsGuide() ! { ! super( "areaCharts" ); ! } ! ! /***************************************************************************************** * Tests a 'real' data set and usage. Index: LineChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/LineChartsGuide.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LineChartsGuide.java 31 May 2003 19:10:28 -0000 1.1 --- LineChartsGuide.java 31 May 2004 21:12:15 -0000 1.2 *************** *** 58,63 **** public class LineChartsGuide extends AxisChartsGuide { ! /***************************************************************************************** * Tests a 'real' data set and usage. --- 58,67 ---- public class LineChartsGuide extends AxisChartsGuide { + public LineChartsGuide() + { + super( "lineCharts" ); + } ! /***************************************************************************************** * Tests a 'real' data set and usage. Index: ComboChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/ComboChartsGuide.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ComboChartsGuide.java 31 May 2003 19:10:28 -0000 1.1 --- ComboChartsGuide.java 31 May 2004 21:12:15 -0000 1.2 *************** *** 61,66 **** public class ComboChartsGuide extends AxisChartsGuide { ! /***************************************************************************************** * Tests a 'real' data set and usage. --- 61,70 ---- public class ComboChartsGuide extends AxisChartsGuide { + public ComboChartsGuide() + { + super( "comboCharts" ); + } ! /***************************************************************************************** * Tests a 'real' data set and usage. Index: BarChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/BarChartsGuide.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BarChartsGuide.java 25 Jun 2003 01:40:15 -0000 1.2 --- BarChartsGuide.java 31 May 2004 21:12:15 -0000 1.3 *************** *** 63,67 **** public class BarChartsGuide extends AxisChartsGuide { ! /***************************************************************************************** * Tests a 'real' data set and usage. --- 63,72 ---- public class BarChartsGuide extends AxisChartsGuide { ! public BarChartsGuide() ! { ! super( "barCharts" ); ! } ! ! /***************************************************************************************** * Tests a 'real' data set and usage. Index: AllChartsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/AllChartsGuide.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AllChartsGuide.java 25 Jun 2003 01:40:15 -0000 1.2 --- AllChartsGuide.java 31 May 2004 21:12:15 -0000 1.3 *************** *** 63,66 **** --- 63,67 ---- public AllChartsGuide() throws ChartDataException { + super( "allCharts" ); this.dataSeries= AxisChartsGuide.createDataSeries(); this.dataSeries.addIAxisPlotDataSet( AxisChartsGuide.createAxisChartDataSet( ChartType.AREA, new AreaChartProperties(), 200, 5000 ) ); |