krysalis-jcharts/src/java/org/krysalis/jcharts/test LineTestDriver.java,1.2,1.3 ChartTestDriver.java,1.5,1.6 RegressionTestDriver.java,1.1,1.2
"Nathaniel G. Auvil" <[email protected]> Fri, 22 Oct 2004 00:43:25 +0000
| Newsgroups | gmane.comp.krysalis.jcharts.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21688/src/java/org/krysalis/jcharts/test
Modified Files:
LineTestDriver.java ChartTestDriver.java
RegressionTestDriver.java
Log Message:
Index: RegressionTestDriver.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/RegressionTestDriver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RegressionTestDriver.java 13 Aug 2004 01:47:46 -0000 1.1
--- RegressionTestDriver.java 22 Oct 2004 00:43:23 -0000 1.2
***************
*** 164,174 ****
Paint[] paints= { Color.blue };
String[] legendLabels= { "Test Legend Label" };
! AxisChartDataSet axisChartDataSet = new AxisChartDataSet( data, legendLabels, paints, ChartType.LINE_REGRESSION, lineChartProperties );
! LineChartProperties lineChartProperties2= (LineChartProperties) getChartTypeProperties( 1 );
! double[][] data2= { { 280, 16, 150, 90 } };
! Paint[] paints2= { Color.red };
! String[] legendLabels2= { "Test Legend Label" };
! AxisChartDataSet axisChartDataSet2 = new AxisChartDataSet( data2, legendLabels2, paints2, ChartType.LINE, lineChartProperties2 );
--- 164,174 ----
Paint[] paints= { Color.blue };
String[] legendLabels= { "Test Legend Label" };
! AxisChartDataSet axisChartDataSet = new AxisChartDataSet( data, legendLabels, paints, ChartType.LINE, lineChartProperties );
! LineChartProperties lineChartProperties2= (LineChartProperties) getChartTypeProperties( 2 );
! double[][] data2= { { 280, 16, 150, 90 }, { 28, 90, -60, 210 } };
! Paint[] paints2= { Color.red, Color.green };
! String[] legendLabels2= { "Test Legend Label", "Timbuku Bitches" };
! AxisChartDataSet axisChartDataSet2 = new AxisChartDataSet( data2, legendLabels2, paints2, ChartType.LINE_REGRESSION, lineChartProperties2 );
Index: LineTestDriver.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/LineTestDriver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LineTestDriver.java 27 Jul 2004 00:54:06 -0000 1.2
--- LineTestDriver.java 22 Oct 2004 00:43:23 -0000 1.3
***************
*** 1,48 ****
/***********************************************************************************************
- * File Info: $Id$
- * Copyright (C) 2000
- * Author: Nathaniel G. Auvil
- * Contributor(s):
- *
* Copyright 2002 (C) Nathaniel G. Auvil. All Rights Reserved.
*
! * Redistribution and use of this software and associated documentation
! * ("Software"), with or without modification, are permitted provided
! * that the following conditions are met:
*
! * 1. Redistributions of source code must retain copyright
! * statements and notices. Redistributions must also contain a
! * copy of this document.
*
! * 2. Redistributions in binary form must reproduce the
! * above copyright notice, this list of conditions and the
! * following disclaimer in the documentation and/or other
! * materials provided with the distribution.
*
! * 3. The name "jCharts" or "Nathaniel G. Auvil" must not be used to
! * endorse or promote products derived from this Software without
! * prior written permission of Nathaniel G. Auvil. For written
! * permission, please contact [email protected]
*
! * 4. Products derived from this Software may not be called "jCharts"
! * nor may "jCharts" appear in their names without prior written
! * permission of Nathaniel G. Auvil. jCharts is a registered
! * trademark of Nathaniel G. Auvil.
*
! * 5. Due credit should be given to the jCharts Project
! * (http://jcharts.sourceforge.net/).
*
! * THIS SOFTWARE IS PROVIDED BY Nathaniel G. Auvil AND CONTRIBUTORS
! * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
! * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
! * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
! * jCharts OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
! * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
! * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
! * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
! * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
! * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
! * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
! * OF THE POSSIBILITY OF SUCH DAMAGE.
************************************************************************************************/
--- 1,34 ----
/***********************************************************************************************
* Copyright 2002 (C) Nathaniel G. Auvil. All Rights Reserved.
*
! * Redistribution and use of this software and associated documentation ("Software"), with or
! * without modification, are permitted provided that the following conditions are met:
*
! * 1. Redistributions of source code must retain copyright statements and notices.
! * Redistributions must also contain a copy of this document.
*
! * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
! * conditions and the following disclaimer in the documentation and/or other materials
! * provided with the distribution.
*
! * 3. The name "jCharts" or "Nathaniel G. Auvil" must not be used to endorse or promote
! * products derived from this Software without prior written permission of Nathaniel G.
! * Auvil. For written permission, please contact [email protected]
*
! * 4. Products derived from this Software may not be called "jCharts" nor may "jCharts" appear
! * in their names without prior written permission of Nathaniel G. Auvil. jCharts is a
! * registered trademark of Nathaniel G. Auvil.
*
! * 5. Due credit should be given to the jCharts Project (http://jcharts.sourceforge.net/).
*
! * THIS SOFTWARE IS PROVIDED BY Nathaniel G. Auvil AND CONTRIBUTORS ``AS IS'' AND ANY
! * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
! * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
! * jCharts OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
! * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
! * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
! * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,STRICT LIABILITY, OR TORT
! * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
! * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
************************************************************************************************/
***************
*** 58,66 ****
! /******************************************************************************************
* This file provides examples of how to create all the different chart types provided by
! * this package.
! *
! *******************************************************************************************/
class LineTestDriver extends AxisChartTestBase
{
--- 44,54 ----
! /*****************************************************************************************
* This file provides examples of how to create all the different chart types provided by
! * this package.
! *
! * @author Nathaniel Auvil
! * @version $Id$
! ****************************************************************************************/
class LineTestDriver extends AxisChartTestBase
{
***************
*** 71,104 ****
! /******************************************************************************************
* Separate this so can use for combo chart test
! *
* @param numberOfDataSets
! ******************************************************************************************/
static ChartTypeProperties getChartTypeProperties( int numberOfDataSets )
{
! Stroke[] strokes = new Stroke[ numberOfDataSets ];
for( int j = 0; j < numberOfDataSets; j++ )
{
! strokes[ j ] = LineChartProperties.DEFAULT_LINE_STROKE;
}
! strokes[ 0 ] = new BasicStroke( 3.0f );
! Shape[] shapes = new Shape[ numberOfDataSets ];
for( int j = 0; j < numberOfDataSets; j++ )
{
! shapes[ j ] = PointChartProperties.SHAPE_DIAMOND;
}
! shapes[ 0 ] = PointChartProperties.SHAPE_CIRCLE;
!
!
return new LineChartProperties( strokes, shapes );
}
! /******************************************************************************************
! *
! *
! ******************************************************************************************/
DataSeries getDataSeries() throws ChartDataException
{
--- 59,92 ----
! /***************************************************************************************
* Separate this so can use for combo chart test
! *
* @param numberOfDataSets
! **************************************************************************************/
static ChartTypeProperties getChartTypeProperties( int numberOfDataSets )
{
! Stroke[] strokes = new Stroke[numberOfDataSets];
for( int j = 0; j < numberOfDataSets; j++ )
{
! strokes[j] = LineChartProperties.DEFAULT_LINE_STROKE;
}
! strokes[0] = new BasicStroke( 3.0f );
! Shape[] shapes = new Shape[numberOfDataSets];
for( int j = 0; j < numberOfDataSets; j++ )
{
! shapes[j] = PointChartProperties.SHAPE_DIAMOND;
}
! shapes[0] = PointChartProperties.SHAPE_CIRCLE;
! shapes[1] = null; //PointChartProperties.SHAPE_CIRCLE;
!
return new LineChartProperties( strokes, shapes );
}
! /***************************************************************************************
! *
! *
! **************************************************************************************/
DataSeries getDataSeries() throws ChartDataException
{
***************
*** 107,121 ****
int dataSize = (int) TestDataGenerator.getRandomNumber( 3, 3 );
! int numberOfDataSets = ( int ) TestDataGenerator.getRandomNumber( 1, 1 );
!
dataSeries = super.createDataSeries( dataSize );
! axisChartDataSet = super.createAxisChartDataSet( ChartType.LINE,
! getChartTypeProperties( numberOfDataSets ),
! numberOfDataSets,
! dataSize,
! 10,
! 5000 );
dataSeries.addIAxisPlotDataSet( axisChartDataSet );
--- 95,108 ----
int dataSize = (int) TestDataGenerator.getRandomNumber( 3, 3 );
! int numberOfDataSets = (int) TestDataGenerator.getRandomNumber( 1, 1 );
dataSeries = super.createDataSeries( dataSize );
! axisChartDataSet = super.createAxisChartDataSet( ChartType.LINE,
! getChartTypeProperties( numberOfDataSets ),
! numberOfDataSets,
! dataSize,
! 10,
! 5000 );
dataSeries.addIAxisPlotDataSet( axisChartDataSet );
***************
*** 125,194 ****
!
! /******************************************************************************************
! *
! *
! ******************************************************************************************
! DataSeries getDataSeries() throws ChartDataException
! {
! String[] xAxisLabels={"1", "2", "3", "4", "5"};
! DataSeries dataSeries=new DataSeries( xAxisLabels, "numbers", "numbers", "Bug #559177" );
! AxisChartDataSet axisChartDataSet;
!
! double[][] data={{1, 2, 3, 4, 5},
! {7, 8, Double.NaN, Double.NaN, Double.NaN},
! {Double.NaN, Double.NaN, Double.NaN, Double.NaN, 2}};
!
! String[] legendLabels={"set 1", "set 2", "set 3"};
! Paint[] paints={Color.blue, Color.red, Color.green};
!
! axisChartDataSet=new AxisChartDataSet( data,
! legendLabels,
! paints,
! ChartType.LINE,
! this.getChartTypeProperties( 3 ) );
!
! dataSeries.addIAxisPlotDataSet( axisChartDataSet );
!
! return dataSeries;
!
! }
*/
-
-
public static void main( String[] args ) throws ChartDataException, PropertyException
{
! LineChartProperties lineChartProperties= (LineChartProperties) getChartTypeProperties( 1 );
! double[][] data= { { 280, 16, 150, 90 } };
! Paint[] paints= { Color.blue };
! String[] legendLabels= { "Test Legend Label" };
! AxisChartDataSet axisChartDataSet = new AxisChartDataSet( data, legendLabels, paints, ChartType.LINE, lineChartProperties );
! String[] axisLabels= { "1900", "1950", "2000", "2050" };
! DataSeries dataSeries = new DataSeries( axisLabels, "X-Axis Title", "Y-Axis Title", "Chart Title" );
dataSeries.addIAxisPlotDataSet( axisChartDataSet );
!
! ChartProperties chartProperties= new ChartProperties();
! AxisProperties axisProperties= new AxisProperties( false );
axisProperties.getYAxisProperties().setShowAxisLabels( false );
!
! /* axisProperties.getYAxisProperties().setShowRightAxis( true );
! axisProperties.getYAxisProperties().setMinRightAxis( 0 );
! axisProperties.getYAxisProperties().setMaxRightAxis( 1000 );
! */
!
!
axisProperties.getXAxisProperties().setShowAxisLabels( true );
! DataAxisProperties yAxis= (DataAxisProperties) axisProperties.getYAxisProperties();
yAxis.setUserDefinedScale( -10, 50 );
! yAxis.setNumItems( 4 );
yAxis.setRoundToNearest( 1 );
! LegendProperties legendProperties= new LegendProperties();
! AxisChart axisChart= new AxisChart( dataSeries, chartProperties, axisProperties, legendProperties, 500, 400 );
ChartTestDriver.exportImage( axisChart, "LineChartTest.png" );
--- 112,173 ----
! /***************************************************************************************
! *
! *
! * *****************************************************************************************
! * DataSeries getDataSeries() throws ChartDataException { String[] xAxisLabels={"1",
! * "2", "3", "4", "5"}; DataSeries dataSeries=new DataSeries( xAxisLabels, "numbers",
! * "numbers", "Bug #559177" ); AxisChartDataSet axisChartDataSet;
! *
! * double[][] data={{1, 2, 3, 4, 5}, {7, 8, Double.NaN, Double.NaN, Double.NaN},
! * {Double.NaN, Double.NaN, Double.NaN, Double.NaN, 2}};
! *
! * String[] legendLabels={"set 1", "set 2", "set 3"}; Paint[] paints={Color.blue,
! * Color.red, Color.green};
! *
! * axisChartDataSet=new AxisChartDataSet( data, legendLabels, paints, ChartType.LINE,
! * this.getChartTypeProperties( 3 ) );
! *
! * dataSeries.addIAxisPlotDataSet( axisChartDataSet );
! *
! * return dataSeries; }
*/
public static void main( String[] args ) throws ChartDataException, PropertyException
{
! LineChartProperties lineChartProperties = (LineChartProperties) getChartTypeProperties( 3 );
! double[][] data = { { 280, 16, 150, 90 }, { 80, 36, 15, 30 }, { 180, 26, 250, 120} };
! Paint[] paints = { Color.blue, Color.green, Color.red };
! String[] legendLabels = { "Test Legend Label", "dfsd", "fsd" };
! AxisChartDataSet axisChartDataSet = new AxisChartDataSet( data,
! legendLabels,
! paints,
! ChartType.LINE,
! lineChartProperties );
! String[] axisLabels = { "1900", "1950", "2000", "2050"};
! DataSeries dataSeries = new DataSeries( axisLabels, "X-Axis Title", "Y-Axis Title", "Chart Title" );
dataSeries.addIAxisPlotDataSet( axisChartDataSet );
! ChartProperties chartProperties = new ChartProperties();
! AxisProperties axisProperties = new AxisProperties( false );
axisProperties.getYAxisProperties().setShowAxisLabels( false );
!
! /*
! * axisProperties.getYAxisProperties().setShowRightAxis( true );
! * axisProperties.getYAxisProperties().setMinRightAxis( 0 );
! * axisProperties.getYAxisProperties().setMaxRightAxis( 1000 );
! */
!
axisProperties.getXAxisProperties().setShowAxisLabels( true );
! DataAxisProperties yAxis = (DataAxisProperties) axisProperties.getYAxisProperties();
yAxis.setUserDefinedScale( -10, 50 );
! yAxis.setNumItems( 4 );
yAxis.setRoundToNearest( 1 );
! LegendProperties legendProperties = new LegendProperties();
! AxisChart axisChart = new AxisChart( dataSeries, chartProperties, axisProperties, legendProperties, 500, 400 );
ChartTestDriver.exportImage( axisChart, "LineChartTest.png" );
***************
*** 196,199 ****
}
!
! }
--- 175,177 ----
}
! }
\ No newline at end of file
Index: ChartTestDriver.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/ChartTestDriver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChartTestDriver.java 27 Jul 2004 00:54:06 -0000 1.5
--- ChartTestDriver.java 22 Oct 2004 00:43:23 -0000 1.6
***************
*** 105,111 ****
//ChartTestDriver.testAxisScale();
! System.out.println( "" + Integer.parseInt( null ) );
-
/* stopWatch.stop();
System.out.println( stopWatch );
--- 105,113 ----
//ChartTestDriver.testAxisScale();
! //System.out.println( "" + Integer.parseInt( null ) );
!
! AxisChartTestBase.axisChartTest( "lineChart", new LineTestDriver() );
!
/* stopWatch.stop();
System.out.println( stopWatch );
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl