You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(95) |
Sep
(42) |
Oct
(2) |
Nov
(7) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
(34) |
Mar
|
Apr
|
May
(64) |
Jun
(113) |
Jul
(60) |
Aug
(9) |
Sep
(6) |
Oct
(20) |
Nov
(11) |
Dec
|
|
From: <nat...@us...> - 2003-08-09 16:57:32
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer
In directory sc8-pr-cvs1:/tmp/cvs-serv504
Added Files:
ChartPanel.java Designer.java
Log Message:
initial revision
--- NEW FILE: ChartPanel.java ---
/***************************************************************************************
* File Info: $Id: ChartPanel.java,v 1.1 2003/08/09 16:57:29 nathaniel_auvil Exp $
*
* Description:
*
* Last Reviewed: NEVER
* Maintainer: Nathaniel Auvil
* Copyright: <copyright.icore>
***************************************************************************************/
package org.krysalis.jcharts.designer;
import org.krysalis.jcharts.Chart;
import org.krysalis.jcharts.properties.PropertyException;
import org.krysalis.jcharts.chartData.ChartDataException;
import javax.swing.*;
import java.awt.*;
public class ChartPanel extends JPanel {
private Designer designer;
private Chart chart;
/***********************************************************************************
*
* @param designer
**********************************************************************************/
public ChartPanel( Designer designer ) {
super();
super.setMinimumSize( new Dimension( 400, 400 ) );
super.setVisible( true );
this.designer = designer;
}
/**********************************************************************************
*
* @param chart
* @param width
* @param height
**********************************************************************************/
public void setChart( Chart chart, int width, int height ) {
this.chart = chart;
super.setSize( width, height );
//todo this does not set the size correctly
}
/***********************************************************************************
*
* @param graphics
**********************************************************************************/
public void paint( Graphics graphics ) {
super.paint( graphics );
if( this.chart != null ) {
try {
this.chart.setGraphics2D( (Graphics2D) graphics );
this.chart.render();
}
catch( ChartDataException chartDataException ) {
chartDataException.printStackTrace();
}
catch( PropertyException propertyException ) {
propertyException.printStackTrace();
}
}
}
}
--- NEW FILE: Designer.java ---
package org.krysalis.jcharts.designer;
import org.krysalis.jcharts.chartData.ChartDataException;
import org.krysalis.jcharts.designer.charts.DesignerPieChart;
import org.krysalis.jcharts.designer.exceptions.DesignerException;
import org.krysalis.jcharts.designer.menuBar.DesignerMenuBar;
import org.krysalis.jcharts.designer.tabs.LowerHalfPanel;
import javax.swing.*;
/***********************************************************************************
*
* @author Nathaniel Auvil
* @version $Id: Designer.java,v 1.1 2003/08/09 16:57:29 nathaniel_auvil Exp $
**********************************************************************************/
public class Designer extends JFrame {
public static final String TITLE= "jCharts Designer - 1.0.0";
private ChartPanel chartPanel;
private LowerHalfPanel lowerHalfPanel;
private DesignerPieChart designerPieChart;
private org.krysalis.jcharts.axisChart.AxisChart axisChart;
/***********************************************************************************
*
* @throws org.krysalis.jcharts.chartData.ChartDataException
**********************************************************************************/
public Designer() throws ChartDataException {
super( TITLE );
this.designerPieChart= new DesignerPieChart( 450, 450 );
super.setJMenuBar( new DesignerMenuBar( this ) );
super.getContentPane().setLayout( new BoxLayout( super.getContentPane(), BoxLayout.Y_AXIS ) );
this.chartPanel= new ChartPanel( this );
this.chartPanel.setChart( this.designerPieChart.getPieChart2D(), 500, 500 );
this.lowerHalfPanel= new LowerHalfPanel( this );
JScrollPane scrollPane= new JScrollPane( this.chartPanel );
JSplitPane jSplitPane = new JSplitPane( JSplitPane.VERTICAL_SPLIT, scrollPane, this.lowerHalfPanel );
jSplitPane.setOneTouchExpandable( true );
//this.getContentPane().add( jSplitPane, BorderLayout.CENTER );
this.getContentPane().add( jSplitPane );
//---so when they click on the 'x' in the upper right corner, the program exits
super.setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE );
this.pack();
this.setVisible( true );
super.setBounds( 30, 30, 600, 600 );
}
/************************************************************************************
*
***********************************************************************************/
public void refreshChart()
{
try
{
this.lowerHalfPanel.getTopLevelTabs().updateChartProperties( this.designerPieChart.getChartProperties() );
this.designerPieChart.updateChart();
this.chartPanel.repaint();
}
catch( DesignerException designerException )
{
designerException.display( this );
}
catch( ChartDataException chartDataException )
{
JOptionPane.showMessageDialog( this, chartDataException.getMessage(), "Chart Data Exception", JOptionPane.ERROR_MESSAGE );
}
}
/***********************************************************************************
*
**********************************************************************************/
public static void main( String[] args ) throws ChartDataException
{
Designer designer= new Designer();
/*
int width= 450;
int height= 450;
try {
String[] labels = {"BMW", "Audi", "Lexus"};
String title = "Cars that Own";
Paint[] paints = {Color.blue, Color.gray, Color.red};
double[] data = {50d, 30d, 20d};
PieChart2DProperties pieChart2DProperties = new PieChart2DProperties();
PieChartDataSet pieChartDataSet = new PieChartDataSet( title, data, labels, paints, pieChart2DProperties );
PieChart2D pieChart2D = new PieChart2D( pieChartDataSet, new LegendProperties(), new ChartProperties(), width, height );
designer.chartPanel.setChart( pieChart2D, width, height );
}
catch( ChartDataException chartDataException ) {
chartDataException.printStackTrace();
}
*/
}
}
|
|
From: <nat...@us...> - 2003-08-09 16:57:11
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer In directory sc8-pr-cvs1:/tmp/cvs-serv451/designer Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer added to the repository |
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties In directory sc8-pr-cvs1:/tmp/cvs-serv14669/src/java/org/krysalis/jcharts/properties Modified Files: AreaProperties.java LabelAxisProperties.java LineChartProperties.java StockChartProperties.java Log Message: Clean imports. Index: AreaProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/AreaProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AreaProperties.java 17 May 2003 17:00:31 -0000 1.1 --- AreaProperties.java 8 Aug 2003 08:51:27 -0000 1.2 *************** *** 43,51 **** import org.krysalis.jcharts.test.HTMLGenerator; import org.krysalis.jcharts.test.HTMLTestable; - import org.krysalis.jcharts.properties.util.ChartStroke; - - import java.awt.*; --- 43,49 ---- + import org.krysalis.jcharts.properties.util.ChartStroke; import org.krysalis.jcharts.test.HTMLGenerator; import org.krysalis.jcharts.test.HTMLTestable; Index: LabelAxisProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/LabelAxisProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LabelAxisProperties.java 17 May 2003 17:00:34 -0000 1.1 --- LabelAxisProperties.java 8 Aug 2003 08:51:27 -0000 1.2 *************** *** 42,51 **** - import org.krysalis.jcharts.test.HTMLGenerator; import org.krysalis.jcharts.test.HTMLTestable; - import org.krysalis.jcharts.properties.util.ChartFont; - - import java.awt.*; - import java.lang.reflect.Field; --- 42,46 ---- Index: LineChartProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/LineChartProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LineChartProperties.java 17 May 2003 17:00:36 -0000 1.1 --- LineChartProperties.java 8 Aug 2003 08:51:27 -0000 1.2 *************** *** 41,51 **** ! import org.krysalis.jcharts.test.HTMLGenerator; ! import org.krysalis.jcharts.Chart; ! import org.krysalis.jcharts.chartData.interfaces.IAxisPlotDataSet; ! import org.krysalis.jcharts.types.ChartType; ! import org.krysalis.jcharts.axisChart.AxisChart; ! import java.awt.*; --- 41,50 ---- ! import java.awt.BasicStroke; ! import java.awt.Shape; ! import java.awt.Stroke; ! import org.krysalis.jcharts.chartData.interfaces.IAxisPlotDataSet; ! import org.krysalis.jcharts.test.HTMLGenerator; Index: StockChartProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/StockChartProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StockChartProperties.java 17 May 2003 17:00:39 -0000 1.1 --- StockChartProperties.java 8 Aug 2003 08:51:27 -0000 1.2 *************** *** 41,50 **** ! import org.krysalis.jcharts.test.HTMLGenerator; ! import org.krysalis.jcharts.Chart; ! import org.krysalis.jcharts.chartData.interfaces.IAxisPlotDataSet; ! import org.krysalis.jcharts.axisChart.AxisChart; ! import java.awt.*; --- 41,49 ---- ! import java.awt.BasicStroke; ! import java.awt.Stroke; ! import org.krysalis.jcharts.chartData.interfaces.IAxisPlotDataSet; ! import org.krysalis.jcharts.test.HTMLGenerator; |
|
From: <nic...@us...> - 2003-08-08 09:23:35
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide In directory sc8-pr-cvs1:/tmp/cvs-serv14669/src/java/org/krysalis/jcharts/demo/userGuide Modified Files: LegendsGuide.java UserGuideBase.java Log Message: Clean imports. Index: LegendsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/LegendsGuide.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LegendsGuide.java 8 Aug 2003 02:41:15 -0000 1.5 --- LegendsGuide.java 8 Aug 2003 08:51:27 -0000 1.6 *************** *** 35,38 **** --- 35,44 ---- package org.krysalis.jcharts.demo.userGuide; + import java.awt.BasicStroke; + import java.awt.Color; + import java.awt.Font; + import java.awt.Shape; + import java.awt.Stroke; + import org.krysalis.jcharts.axisChart.AxisChart; import org.krysalis.jcharts.chartData.DataSeries; *************** *** 47,52 **** import org.krysalis.jcharts.properties.util.ChartStroke; import org.krysalis.jcharts.types.ChartType; - - import java.awt.*; --- 53,56 ---- Index: UserGuideBase.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/UserGuideBase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UserGuideBase.java 5 Jul 2003 13:24:35 -0000 1.3 --- UserGuideBase.java 8 Aug 2003 08:51:27 -0000 1.4 *************** *** 36,44 **** import org.krysalis.jcharts.Chart; import org.krysalis.jcharts.encoders.PNGEncoder; - import org.krysalis.jcharts.encoders.JPEGEncoder13; - - import java.io.FileOutputStream; --- 36,43 ---- + import java.io.FileOutputStream; + import org.krysalis.jcharts.Chart; import org.krysalis.jcharts.encoders.PNGEncoder; |
|
From: <nic...@us...> - 2003-08-08 09:23:34
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/chartData/processors In directory sc8-pr-cvs1:/tmp/cvs-serv14669/src/java/org/krysalis/jcharts/chartData/processors Modified Files: AxisChartDataProcessor.java Log Message: Clean imports. Index: AxisChartDataProcessor.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/chartData/processors/AxisChartDataProcessor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AxisChartDataProcessor.java 17 May 2003 16:57:50 -0000 1.1 --- AxisChartDataProcessor.java 8 Aug 2003 08:51:27 -0000 1.2 *************** *** 49,62 **** - import org.krysalis.jcharts.axisChart.AxisChart; - import org.krysalis.jcharts.axisChart.ScatterPlotAxisChart; - import org.krysalis.jcharts.chartData.interfaces.*; - import org.krysalis.jcharts.types.ChartType; - import org.krysalis.jcharts.chartText.TextTagGroup; - import org.krysalis.jcharts.properties.DataAxisProperties; - - import java.awt.*; import java.awt.font.FontRenderContext; import java.util.Iterator; --- 49,62 ---- import java.awt.font.FontRenderContext; import java.util.Iterator; + + import org.krysalis.jcharts.axisChart.AxisChart; + import org.krysalis.jcharts.chartData.interfaces.IAxisChartDataSet; + import org.krysalis.jcharts.chartData.interfaces.IAxisPlotDataSet; + import org.krysalis.jcharts.chartData.interfaces.IDataSeries; + import org.krysalis.jcharts.chartData.interfaces.IStockChartDataSet; + import org.krysalis.jcharts.properties.DataAxisProperties; + import org.krysalis.jcharts.types.ChartType; |
|
From: <nic...@us...> - 2003-08-08 09:23:34
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/chartData In directory sc8-pr-cvs1:/tmp/cvs-serv14669/src/java/org/krysalis/jcharts/chartData Modified Files: ScatterPlotDataSeries.java Log Message: Clean imports. Index: ScatterPlotDataSeries.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/chartData/ScatterPlotDataSeries.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScatterPlotDataSeries.java 17 May 2003 16:58:11 -0000 1.1 --- ScatterPlotDataSeries.java 8 Aug 2003 08:51:27 -0000 1.2 *************** *** 41,53 **** ! import org.krysalis.jcharts.chartData.interfaces.*; import org.krysalis.jcharts.test.HTMLGenerator; import org.krysalis.jcharts.test.HTMLTestable; - import org.krysalis.jcharts.types.ChartType; - import org.krysalis.jcharts.properties.PropertyException; - import org.krysalis.jcharts.axisChart.AxisChart; - - import java.util.HashMap; - import java.util.Iterator; --- 41,48 ---- ! import org.krysalis.jcharts.chartData.interfaces.IScatterPlotDataSeries; ! import org.krysalis.jcharts.chartData.interfaces.IScatterPlotDataSet; import org.krysalis.jcharts.test.HTMLGenerator; import org.krysalis.jcharts.test.HTMLTestable; |
|
From: <nic...@us...> - 2003-08-08 09:23:32
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts In directory sc8-pr-cvs1:/tmp/cvs-serv14669/src/java/org/krysalis/jcharts Modified Files: Legend.java Log Message: Clean imports. Index: Legend.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/Legend.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Legend.java 11 Jul 2003 02:21:32 -0000 1.6 --- Legend.java 8 Aug 2003 08:51:27 -0000 1.7 *************** *** 37,41 **** - import java.awt.Color; import java.awt.Graphics2D; import java.awt.Paint; --- 37,40 ---- |
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test In directory sc8-pr-cvs1:/tmp/cvs-serv14669/src/java/org/krysalis/jcharts/test Modified Files: BarTestDriver.java PieTestDriver.java ScatterPlotTestDriver.java StackedBarTestDriver.java Log Message: Clean imports. Index: BarTestDriver.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/BarTestDriver.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BarTestDriver.java 22 Jun 2003 14:15:42 -0000 1.2 --- BarTestDriver.java 8 Aug 2003 08:51:27 -0000 1.3 *************** *** 50,62 **** import org.krysalis.jcharts.axisChart.AxisChart; ! import org.krysalis.jcharts.axisChart.customRenderers.axisValue.renderers.*; ! import org.krysalis.jcharts.chartData.*; import org.krysalis.jcharts.chartData.interfaces.IAxisDataSeries; ! import org.krysalis.jcharts.properties.*; import org.krysalis.jcharts.properties.util.ChartStroke; import org.krysalis.jcharts.types.ChartType; - - import java.awt.*; --- 50,72 ---- + import java.awt.BasicStroke; + import java.awt.Color; + import java.awt.Paint; + import org.krysalis.jcharts.axisChart.AxisChart; ! import org.krysalis.jcharts.chartData.AxisChartDataSet; ! import org.krysalis.jcharts.chartData.ChartDataException; ! import org.krysalis.jcharts.chartData.DataSeries; import org.krysalis.jcharts.chartData.interfaces.IAxisDataSeries; ! import org.krysalis.jcharts.properties.AxisProperties; ! import org.krysalis.jcharts.properties.AxisTypeProperties; ! import org.krysalis.jcharts.properties.BarChartProperties; ! import org.krysalis.jcharts.properties.ChartProperties; ! import org.krysalis.jcharts.properties.ChartTypeProperties; ! import org.krysalis.jcharts.properties.DataAxisProperties; ! import org.krysalis.jcharts.properties.LegendProperties; ! import org.krysalis.jcharts.properties.PropertyException; import org.krysalis.jcharts.properties.util.ChartStroke; import org.krysalis.jcharts.types.ChartType; Index: PieTestDriver.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/PieTestDriver.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PieTestDriver.java 22 Jun 2003 14:15:42 -0000 1.3 --- PieTestDriver.java 8 Aug 2003 08:51:27 -0000 1.4 *************** *** 36,49 **** import org.krysalis.jcharts.chartData.ChartDataException; import org.krysalis.jcharts.chartData.PieChartDataSet; import org.krysalis.jcharts.nonAxisChart.PieChart2D; ! import org.krysalis.jcharts.nonAxisChart.PieChart3D; ! import org.krysalis.jcharts.properties.*; import org.krysalis.jcharts.properties.util.ChartStroke; - import org.krysalis.jcharts.imageMap.ImageMap; - import org.krysalis.jcharts.types.PieLabelType; - - import java.awt.*; --- 36,51 ---- + import java.awt.BasicStroke; + import java.awt.Paint; + import org.krysalis.jcharts.chartData.ChartDataException; import org.krysalis.jcharts.chartData.PieChartDataSet; + import org.krysalis.jcharts.imageMap.ImageMap; import org.krysalis.jcharts.nonAxisChart.PieChart2D; ! import org.krysalis.jcharts.properties.ChartProperties; ! import org.krysalis.jcharts.properties.LegendProperties; ! import org.krysalis.jcharts.properties.PieChart2DProperties; ! import org.krysalis.jcharts.properties.PropertyException; import org.krysalis.jcharts.properties.util.ChartStroke; Index: ScatterPlotTestDriver.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/ScatterPlotTestDriver.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ScatterPlotTestDriver.java 22 Jun 2003 14:15:42 -0000 1.2 --- ScatterPlotTestDriver.java 8 Aug 2003 08:51:27 -0000 1.3 *************** *** 41,52 **** ! import org.krysalis.jcharts.axisChart.AxisChart; ! import org.krysalis.jcharts.axisChart.ScatterPlotAxisChart; ! import org.krysalis.jcharts.chartData.*; ! import org.krysalis.jcharts.properties.*; ! import org.krysalis.jcharts.types.ChartType; ! ! import java.awt.*; import java.awt.geom.Point2D; --- 41,63 ---- ! import java.awt.BasicStroke; ! import java.awt.Paint; ! import java.awt.Shape; ! import java.awt.Stroke; import java.awt.geom.Point2D; + + import org.krysalis.jcharts.axisChart.ScatterPlotAxisChart; + import org.krysalis.jcharts.chartData.ChartDataException; + import org.krysalis.jcharts.chartData.DataSeries; + import org.krysalis.jcharts.chartData.ScatterPlotDataSeries; + import org.krysalis.jcharts.chartData.ScatterPlotDataSet; + import org.krysalis.jcharts.properties.AxisProperties; + import org.krysalis.jcharts.properties.ChartProperties; + import org.krysalis.jcharts.properties.DataAxisProperties; + import org.krysalis.jcharts.properties.LegendProperties; + import org.krysalis.jcharts.properties.LineChartProperties; + import org.krysalis.jcharts.properties.PointChartProperties; + import org.krysalis.jcharts.properties.PropertyException; + import org.krysalis.jcharts.properties.ScatterPlotProperties; Index: StackedBarTestDriver.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/StackedBarTestDriver.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StackedBarTestDriver.java 22 Jun 2003 14:15:42 -0000 1.2 --- StackedBarTestDriver.java 8 Aug 2003 08:51:27 -0000 1.3 *************** *** 36,49 **** ! import org.krysalis.jcharts.chartData.*; import org.krysalis.jcharts.chartData.interfaces.IAxisDataSeries; ! import org.krysalis.jcharts.properties.*; ! import org.krysalis.jcharts.properties.util.ChartStroke; import org.krysalis.jcharts.types.ChartType; - import org.krysalis.jcharts.axisChart.customRenderers.axisValue.renderers.ValueLabelRenderer; - import org.krysalis.jcharts.axisChart.customRenderers.axisValue.renderers.ValueLabelPosition; - import org.krysalis.jcharts.axisChart.AxisChart; - - import java.awt.*; --- 36,53 ---- ! import java.awt.Color; ! import java.awt.Paint; ! ! import org.krysalis.jcharts.axisChart.AxisChart; ! import org.krysalis.jcharts.chartData.AxisChartDataSet; ! import org.krysalis.jcharts.chartData.ChartDataException; ! import org.krysalis.jcharts.chartData.DataSeries; import org.krysalis.jcharts.chartData.interfaces.IAxisDataSeries; ! import org.krysalis.jcharts.properties.AxisProperties; ! import org.krysalis.jcharts.properties.ChartProperties; ! import org.krysalis.jcharts.properties.LegendProperties; ! import org.krysalis.jcharts.properties.PropertyException; ! import org.krysalis.jcharts.properties.StackedBarChartProperties; import org.krysalis.jcharts.types.ChartType; |
|
From: <nic...@us...> - 2003-08-08 09:10:58
|
Update of /cvsroot/jcharts/krysalis-jcharts
In directory sc8-pr-cvs1:/tmp/cvs-serv14781
Added Files:
.classpath .project
Log Message:
Now this project can be oponed in Eclipse :-)
--- NEW FILE: .classpath ---
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
<classpathentry kind="lib" path="lib/batik-awt-util.jar"/>
<classpathentry kind="lib" path="lib/batik-dom.jar"/>
<classpathentry kind="lib" path="lib/batik-svggen.jar"/>
<classpathentry kind="lib" path="lib/batik-util.jar"/>
<classpathentry kind="lib" path="lib/batik-xml.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>krysalis-jcharts</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
</natures>
</projectDescription>
|
|
From: <nat...@us...> - 2003-08-08 02:51:00
|
Update of /cvsroot/jcharts/krysalis-jcharts In directory sc8-pr-cvs1:/tmp/cvs-serv29095 Modified Files: status.xml Log Message: no message Index: status.xml =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/status.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** status.xml 6 Aug 2003 08:42:32 -0000 1.13 --- status.xml 8 Aug 2003 02:50:57 -0000 1.14 *************** *** 91,94 **** --- 91,97 ---- Refactored <code>LegendProperties</code> to use a <code>ChartFont</code> Object. </action> + <action dev="Rami Hansenne" type="add" context="code"> + Added a Radar Chart implementation. + </action> </release> |
|
From: <nat...@us...> - 2003-08-08 02:50:42
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/documentation
In directory sc8-pr-cvs1:/tmp/cvs-serv29069
Modified Files:
skinconf.xml
Log Message:
no message
Index: skinconf.xml
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/documentation/skinconf.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** skinconf.xml 29 Jun 2003 14:13:44 -0000 1.6
--- skinconf.xml 8 Aug 2003 02:50:39 -0000 1.7
***************
*** 21,25 ****
<!ELEMENT disable-compliance-links (#PCDATA)>
<!ELEMENT searchsite-domain (#PCDATA)>
! <!ELEMENT searchsite-name (#PCDATA)>
<!ELEMENT project-name (#PCDATA)>
<!ELEMENT project-url (#PCDATA)>
--- 21,25 ----
<!ELEMENT disable-compliance-links (#PCDATA)>
<!ELEMENT searchsite-domain (#PCDATA)>
! <!ELEMENT searchsite-name (#PCDATA)>
<!ELEMENT project-name (#PCDATA)>
<!ELEMENT project-url (#PCDATA)>
***************
*** 48,81 ****
<skinconfig>
! <!-- Do we want to disable the Google search box? -->
! <disable-search>false</disable-search>
! <disable-compliance-links>false</disable-compliance-links>
! <searchsite-domain>jcharts.sourceforge.net</searchsite-domain>
! <searchsite-name>jCharts</searchsite-name>
! <!-- mandatory project logo
! skin: forrest-site renders it at the top -->
! <project-name>jCharts</project-name>
! <project-url>http://jcharts.krysalis.org</project-url>
! <project-logo>images/jcharts-logo.png</project-logo>
! <!-- optional group logo
! skin: forrest-site renders it at the top-left corner -->
! <group-name>Krysalis</group-name>
! <group-url>http://www.krysalis.org</group-url>
! <group-logo>images/krysalis-logo.gif</group-logo>
! <!-- optional host logo (e.g. sourceforge logo)
! skin: forrest-site renders it at the bottom-left corner -->
<host-url>http://sourceforge.net</host-url>
<host-logo>http://sourceforge.net/sflogo.php?group_id=16161"</host-logo>
! <!-- The following are used to construct a copyright statement -->
! <year>2003</year>
! <vendor>The Krysalis Community Project.</vendor>
! <!-- Some skins use this to form a 'breadcrumb trail' of links. If you don't
! want these, set the attributes to blank. The DTD purposefully requires them.
! -->
<trail>
<link1 name="krysalis at sf.net" href="http://sourceforge.net/projects/krysalis/"/>
--- 48,81 ----
<skinconfig>
! <!-- Do we want to disable the Google search box? -->
! <disable-search>false</disable-search>
! <disable-compliance-links>false</disable-compliance-links>
! <searchsite-domain>jcharts.sourceforge.net</searchsite-domain>
! <searchsite-name>jCharts</searchsite-name>
! <!-- mandatory project logo
! skin: forrest-site renders it at the top -->
! <project-name>jCharts</project-name>
! <project-url>http://jcharts.krysalis.org</project-url>
! <project-logo>images/jcharts-logo.png</project-logo>
! <!-- optional group logo
! skin: forrest-site renders it at the top-left corner -->
! <group-name>Krysalis</group-name>
! <group-url>http://www.krysalis.org</group-url>
! <group-logo>images/krysalis-logo.gif</group-logo>
! <!-- optional host logo (e.g. sourceforge logo)
! skin: forrest-site renders it at the bottom-left corner -->
<host-url>http://sourceforge.net</host-url>
<host-logo>http://sourceforge.net/sflogo.php?group_id=16161"</host-logo>
! <!-- The following are used to construct a copyright statement -->
! <year>2003</year>
! <vendor>The Krysalis Community Project.</vendor>
! <!-- Some skins use this to form a 'breadcrumb trail' of links. If you don't
! want these, set the attributes to blank. The DTD purposefully requires them.
! -->
<trail>
<link1 name="krysalis at sf.net" href="http://sourceforge.net/projects/krysalis/"/>
***************
*** 84,100 ****
</trail>
! <!-- Credits are typically rendered as a set of small clickable images in the
! page footer -->
! <credits>
! <credit>
! <name>Built with Apache Forrest</name>
! <url>http://xml.apache.org/forrest/</url>
! <image>images/built-with-forrest-button.png</image>
! <width>88</width>
! <height>31</height>
! </credit>
! <!-- A credit with @role='pdf' will have its name and url displayed in the
! PDF page's footer. -->
! </credits>
</skinconfig>
--- 84,100 ----
</trail>
! <!-- Credits are typically rendered as a set of small clickable images in the
! page footer -->
! <credits>
! <credit>
! <name>Built with Apache Forrest</name>
! <url>http://xml.apache.org/forrest/</url>
! <image>images/built-with-forrest-button.png</image>
! <width>88</width>
! <height>31</height>
! </credit>
! <!-- A credit with @role='pdf' will have its name and url displayed in the
! PDF page's footer. -->
! </credits>
</skinconfig>
|
|
From: <nat...@us...> - 2003-08-08 02:43:17
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide In directory sc8-pr-cvs1:/tmp/cvs-serv27911 Modified Files: LegendsGuide.java Log Message: no message Index: LegendsGuide.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/demo/userGuide/LegendsGuide.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LegendsGuide.java 11 Jul 2003 02:41:48 -0000 1.4 --- LegendsGuide.java 8 Aug 2003 02:41:15 -0000 1.5 *************** *** 36,50 **** import org.krysalis.jcharts.axisChart.AxisChart; ! import org.krysalis.jcharts.properties.LegendProperties; ! import org.krysalis.jcharts.properties.AreaChartProperties; ! import org.krysalis.jcharts.properties.ChartProperties; import org.krysalis.jcharts.properties.AxisProperties; import org.krysalis.jcharts.properties.LegendAreaProperties; import org.krysalis.jcharts.properties.LineChartProperties; import org.krysalis.jcharts.properties.PointChartProperties; - import org.krysalis.jcharts.properties.ClusteredBarChartProperties; - import org.krysalis.jcharts.properties.util.ChartStroke; import org.krysalis.jcharts.properties.util.ChartFont; ! import org.krysalis.jcharts.chartData.DataSeries; import org.krysalis.jcharts.types.ChartType; --- 36,49 ---- import org.krysalis.jcharts.axisChart.AxisChart; ! import org.krysalis.jcharts.chartData.DataSeries; import org.krysalis.jcharts.properties.AxisProperties; + import org.krysalis.jcharts.properties.ChartProperties; + import org.krysalis.jcharts.properties.ClusteredBarChartProperties; import org.krysalis.jcharts.properties.LegendAreaProperties; + import org.krysalis.jcharts.properties.LegendProperties; import org.krysalis.jcharts.properties.LineChartProperties; import org.krysalis.jcharts.properties.PointChartProperties; import org.krysalis.jcharts.properties.util.ChartFont; ! import org.krysalis.jcharts.properties.util.ChartStroke; import org.krysalis.jcharts.types.ChartType; |
|
From: <nat...@us...> - 2003-08-08 02:42:51
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties
In directory sc8-pr-cvs1:/tmp/cvs-serv27844
Modified Files:
RadarChartProperties.java
Log Message:
added the jCharts license info
Index: RadarChartProperties.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/RadarChartProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadarChartProperties.java 4 Aug 2003 09:25:49 -0000 1.1
--- RadarChartProperties.java 8 Aug 2003 02:40:54 -0000 1.2
***************
*** 1,2 ****
--- 1,36 ----
+ /***********************************************************************************************
+ * 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 nat...@us...
+ *
+ * 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
+ ************************************************************************************************/
+
package org.krysalis.jcharts.properties;
***************
*** 10,132 ****
import org.krysalis.jcharts.test.HTMLTestable;
! /**
* Properties of a radar chart.
*
* @author Rami Hansenne
! */
final public class RadarChartProperties extends ChartTypeProperties implements HTMLTestable
{
! private boolean showGridLines = true;
! private boolean fillRadar = true;
! private double max = Double.NaN;
! private double increment = Double.NaN;
! private ChartFont axisLabelChartFont = ChartFont.DEFAULT_AXIS_TITLE;
! private ChartFont titleChartFont = ChartFont.DEFAULT_CHART_TITLE;
! private NumberFormat numberFormat = new DecimalFormat();
- public RadarChartProperties()
- {
- super();
- numberFormat.setMaximumFractionDigits(2);
- }
! public boolean getShowGridLines()
! {
! return showGridLines;
! }
! public void setShowGridLines( boolean showGridLines )
! {
! this.showGridLines = showGridLines;
! }
- public boolean getFillRadar()
- {
- return fillRadar;
- }
- public void setFillRadar( boolean fillRadar )
- {
- this.fillRadar = fillRadar;
- }
! public ChartFont getTitleChartFont()
! {
! return titleChartFont;
! }
! public void setTitleChartFont( ChartFont titleChartFont )
! {
! this.titleChartFont = titleChartFont;
! }
- public ChartFont getAxisLabelChartFont()
- {
- return axisLabelChartFont;
- }
- public void setAxisLabelChartFont( ChartFont axisLabelChartFont )
- {
- this.axisLabelChartFont = axisLabelChartFont;
- }
! public void setGridLabelFormat(NumberFormat format) {
! if (format!=null)
! this.numberFormat = format;
! }
- public NumberFormat getGridLabelFormat() {
- return this.numberFormat;
- }
! public double getScaleMaxValue() {
! return this.max;
! }
- public void setScaleMaxValue(double max) {
- this.max = max;
- }
! public double getScaleIncrement() {
! return this.increment;
! }
- public void setScaleIncrement(double increment) {
- this.increment = increment;
- }
! /*********************************************************************************************
! * Enables the testing routines to display the contents of this Object.
! *
! * @param htmlGenerator
! **********************************************************************************************/
! public void toHTML( HTMLGenerator htmlGenerator )
! {
! htmlGenerator.propertiesTableStart( "RadarChartProperties" );
! htmlGenerator.addTableRow( "Show gridlines", new Boolean(this.showGridLines) );
! htmlGenerator.addTableRow( "Fill radar", new Boolean(this.fillRadar) );
! htmlGenerator.addTableRow( "Scale max value", new Double(this.max) );
! htmlGenerator.addTableRow( "Scale increment", new Double(this.increment) );
! htmlGenerator.propertiesTableEnd();
! }
! /******************************************************************************************
! * Validates the properties.
! *
! * @param chart
! * @throws PropertyException
! *****************************************************************************************/
! public void validate( Chart chart ) throws PropertyException
! {
! }
}
--- 44,185 ----
import org.krysalis.jcharts.test.HTMLTestable;
!
! /*************************************************************************************
* Properties of a radar chart.
*
* @author Rami Hansenne
! * @version $Id$
! * @since 1.0.0
! ************************************************************************************/
final public class RadarChartProperties extends ChartTypeProperties implements HTMLTestable
{
! private boolean showGridLines = true;
! private boolean fillRadar = true;
! private double max = Double.NaN;
! private double increment = Double.NaN;
! private ChartFont axisLabelChartFont = ChartFont.DEFAULT_AXIS_TITLE;
! private ChartFont titleChartFont = ChartFont.DEFAULT_CHART_TITLE;
! private NumberFormat numberFormat = new DecimalFormat();
! public RadarChartProperties()
! {
! super();
! numberFormat.setMaximumFractionDigits( 2 );
! }
! public boolean getShowGridLines()
! {
! return showGridLines;
! }
+ public void setShowGridLines( boolean showGridLines )
+ {
+ this.showGridLines = showGridLines;
+ }
! public boolean getFillRadar()
! {
! return fillRadar;
! }
! public void setFillRadar( boolean fillRadar )
! {
! this.fillRadar = fillRadar;
! }
+ public ChartFont getTitleChartFont()
+ {
+ return titleChartFont;
+ }
! public void setTitleChartFont( ChartFont titleChartFont )
! {
! this.titleChartFont = titleChartFont;
! }
! public ChartFont getAxisLabelChartFont()
! {
! return axisLabelChartFont;
! }
! public void setAxisLabelChartFont( ChartFont axisLabelChartFont )
! {
! this.axisLabelChartFont = axisLabelChartFont;
! }
! public void setGridLabelFormat( NumberFormat format )
! {
! if( format != null )
! this.numberFormat = format;
! }
+ public NumberFormat getGridLabelFormat()
+ {
+ return this.numberFormat;
+ }
! public double getScaleMaxValue()
! {
! return this.max;
! }
!
! public void setScaleMaxValue( double max )
! {
! this.max = max;
! }
!
!
! public double getScaleIncrement()
! {
! return this.increment;
! }
!
!
! public void setScaleIncrement( double increment )
! {
! this.increment = increment;
! }
!
!
! /*********************************************************************************************
! * Enables the testing routines to display the contents of this Object.
! *
! * @param htmlGenerator
! **********************************************************************************************/
! public void toHTML( HTMLGenerator htmlGenerator )
! {
! htmlGenerator.propertiesTableStart( "RadarChartProperties" );
! htmlGenerator.addTableRow( "Show gridlines", new Boolean( this.showGridLines ) );
! htmlGenerator.addTableRow( "Fill radar", new Boolean( this.fillRadar ) );
! htmlGenerator.addTableRow( "Scale max value", new Double( this.max ) );
! htmlGenerator.addTableRow( "Scale increment", new Double( this.increment ) );
! htmlGenerator.propertiesTableEnd();
! }
!
!
! /******************************************************************************************
! * Validates the properties.
! *
! * @param chart
! * @throws PropertyException
! *****************************************************************************************/
! public void validate( Chart chart ) throws PropertyException
! {
!
! }
}
|
|
From: <nat...@us...> - 2003-08-07 22:44:43
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/nonAxisChart
In directory sc8-pr-cvs1:/tmp/cvs-serv18477
Modified Files:
PieChart3D.java
Log Message:
more work on the labelling code
Index: PieChart3D.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/nonAxisChart/PieChart3D.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PieChart3D.java 22 Jun 2003 14:15:08 -0000 1.6
--- PieChart3D.java 7 Aug 2003 22:10:27 -0000 1.7
***************
*** 399,403 ****
-
//---if only a single value use a circle map
//---IMAGE MAP
--- 399,402 ----
***************
*** 553,556 ****
--- 552,560 ----
}
+
+ if( sliceCenterDegrees > 180 && sliceCenterDegrees < 360 )
+ {
+ labelY+= properties.getDepth();
+ }
if( sliceCenterDegrees > 90 && sliceCenterDegrees < 270 )
|
|
From: <nat...@us...> - 2003-08-07 21:57:54
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/documentation/content/xdocs In directory sc8-pr-cvs1:/tmp/cvs-serv16063 Modified Files: downloads.xml Log Message: forgot to check in for the 0.7.4 release Index: downloads.xml =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/documentation/content/xdocs/downloads.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** downloads.xml 21 Jun 2003 16:01:15 -0000 1.3 --- downloads.xml 7 Aug 2003 21:57:51 -0000 1.4 *************** *** 19,23 **** </p> <ul> ! <li><link href="http://prdownloads.sourceforge.net/jcharts/jCharts-0.7.3.zip?download">jcharts 0.7.3</link></li> <li><link href="http://prdownloads.sourceforge.net/jcharts/jCharts-UsersGuide-0.3.0.zip?download">User Guide 0.3.0</link></li> </ul> --- 19,23 ---- </p> <ul> ! <li><link href="http://prdownloads.sourceforge.net/jcharts/jCharts-0.7.4.zip?download">jcharts 0.7.4</link></li> <li><link href="http://prdownloads.sourceforge.net/jcharts/jCharts-UsersGuide-0.3.0.zip?download">User Guide 0.3.0</link></li> </ul> |
|
From: <nat...@us...> - 2003-08-07 21:57:22
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/documentation/content/xdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv15938
Modified Files:
credits.xml
Log Message:
added credit for the Radar Chart
Index: credits.xml
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/documentation/content/xdocs/credits.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** credits.xml 29 May 2003 02:44:54 -0000 1.1
--- credits.xml 7 Aug 2003 21:57:19 -0000 1.2
***************
*** 11,14 ****
--- 11,25 ----
<body>
<section>
+ <title>1.0.0</title>
+ <p></p>
+ <table>
+ <tr>
+ <td>Rami Hansenne, Matthew Dornquast</td>
+ <td>Radar Chart Implementation</td>
+ </tr>
+ </table>
+ </section>
+
+ <section>
<title>0.7.0</title>
<p></p>
|
|
From: <nat...@us...> - 2003-08-07 21:55:29
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/nonAxisChart
In directory sc8-pr-cvs1:/tmp/cvs-serv15651
Modified Files:
RadarChart.java
Log Message:
added license header
Index: RadarChart.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/nonAxisChart/RadarChart.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadarChart.java 4 Aug 2003 09:25:49 -0000 1.1
--- RadarChart.java 7 Aug 2003 21:55:26 -0000 1.2
***************
*** 1,4 ****
--- 1,39 ----
+ /***********************************************************************************************
+ * 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 nat...@us...
+ *
+ * 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
+ ************************************************************************************************/
+
package org.krysalis.jcharts.nonAxisChart;
+
import java.awt.Color;
import java.awt.Graphics2D;
***************
*** 19,228 ****
import org.krysalis.jcharts.properties.util.ChartFont;
! /**
* Represents a radar chart a.k.a. spider chart
*
* @author Rami Hansenne
! * @todo : render legend, use scale processor classes,...
! */
public class RadarChart
! extends Chart {
! private IRadarChartDataSet iRadarChartDataSet;
! private RadarChartDataProcessor radarChartDataProcessor;
! private RadarChartProperties props;
! private double radius, step;
! private Point2D center;
! // scale max value and increment
! private double scaleMax, scaleIncrement;
! // default number of scale increments if no user defined increment
! private static final int DEFAULT_NR_OF_INCREMENTS = 10;
- /************************************************************************************************
- * Constructor
- *
- * @param iRadarChartDataSet
- * @param legendProperties
- * @param chartProperties general chart properties
- * @param pixelWidth
- * @param pixelHeight
- ************************************************************************************************/
- public RadarChart(IRadarChartDataSet iRadarChartDataSet,
- LegendProperties legendProperties,
- ChartProperties chartProperties,
- int pixelWidth,
- int pixelHeight) {
- super(legendProperties, chartProperties, pixelWidth, pixelHeight);
- this.iRadarChartDataSet = iRadarChartDataSet;
- props = (RadarChartProperties) iRadarChartDataSet.getChartTypeProperties();
- if (props == null) {
- props = new RadarChartProperties();
! }
! }
- /************************************************************************************************
- * Draws the chart
- *
- ************************************************************************************************/
- protected void renderChart() {
- Graphics2D g2d = getGraphics2D();
! // turn anti-aliasing on
! g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
! RenderingHints.VALUE_ANTIALIAS_ON);
! FontRenderContext fontRenderContext = super.getGraphics2D().
! getFontRenderContext();
- //---render the TITLE. If no title, this will return zero.
- float chartTitleHeight = super.renderChartTitle(this.iRadarChartDataSet.
- getChartTitle(), fontRenderContext);
! this.radarChartDataProcessor = new RadarChartDataProcessor( this.iRadarChartDataSet );
! this.radarChartDataProcessor.processData();
! // set scale max value
! if (Double.isNaN(props.getScaleMaxValue()))
! this.scaleMax = radarChartDataProcessor.getMaxValue();
! else scaleMax = props.getScaleMaxValue();
! // set scale increment
! if (Double.isNaN(props.getScaleIncrement()))
! this.scaleIncrement = scaleMax/DEFAULT_NR_OF_INCREMENTS;
! else scaleIncrement = props.getScaleIncrement();
! //@todo : adjust chart space in order to correctly render title & legend
! Rectangle chartSpace = new Rectangle(getImageWidth(), getImageHeight());
! center = new Point2D.Double(
! chartSpace.getWidth() / 2 - chartSpace.getX(),
! chartSpace.getHeight() / 2 - chartSpace.getY());
! radius = Math.min(chartSpace.getWidth(), chartSpace.getHeight());
! radius = (radius - (radius * 10) / 100) / 2;
! step = 2 * Math.PI / iRadarChartDataSet.getNumberOfDataItems();
! if (props.getShowGridLines()) {
! drawGridLines(g2d);
! }
! drawAxis(g2d);
! drawRadar(g2d);
! }
! private void drawRadar(
! Graphics2D g) {
! for (int dataset = 0; dataset < iRadarChartDataSet.getNumberOfDataSets();
! dataset++) {
! double currentValue;
! double previousValue = scaleValue(iRadarChartDataSet.getValue(dataset,
! iRadarChartDataSet.getNumberOfDataItems() -
! 1));
- Paint paint = iRadarChartDataSet.getPaint(dataset);
! for (int di = 0; di < iRadarChartDataSet.getNumberOfDataItems();di++) {
! currentValue = previousValue;
! previousValue = scaleValue(iRadarChartDataSet.getValue(dataset, di));
! g.setPaint(paint);
! int c0 = (int) Math.round(center.getX());
! int c1 = (int) Math.round(center.getY());
! int x0 = getX(di+1,previousValue);
! int y0 = getY(di+1,previousValue);
! int x1 = getX(di,currentValue);
! int y1 = getY(di,currentValue);
! if (props.getFillRadar()) {
! Polygon p = new Polygon();
! p.addPoint(c0, c1);
! p.addPoint(x0, y0);
! p.addPoint(x1, y1);
! // make color translucent
! if (paint instanceof Color) {
! Color color = (Color) paint;
! g.setPaint(new Color(color.getRed(), color.getGreen(),
! color.getBlue(), 100));
! }
! g.fillPolygon(p);
! g.setPaint(paint);
! }
! g.drawLine(x0, y0, x1, y1);
! }
! }
! }
! private void drawGridLines(Graphics2D g) {
! g.setColor(Color.lightGray);
! for (int di = 0; di < iRadarChartDataSet.getNumberOfDataItems();
! di++) {
! for (double i = scaleIncrement; i <= scaleMax; i+=scaleIncrement) {
! double pos = scaleValue(i);
! g.drawLine(
! getX(di+1,pos),
! getY(di+1,pos),
! getX(di,pos),
! getY(di,pos));
! }
! }
! }
! private void drawAxis(Graphics2D g) {
! g.setColor(Color.darkGray);
! for (int index = 0; index < iRadarChartDataSet.getNumberOfDataItems();
! index++) {
! String label = iRadarChartDataSet.getAxisLabel(index);
! g.drawLine(
! (int) center.getX(),
! (int) center.getY(),
! getX(index, 1),
! getY(index, 1));
! Rectangle2D bounds = g.getFontMetrics().getStringBounds(label, g);
! // draw axis label
! ChartFont cfont = props.getTitleChartFont();
! if (cfont != null) {
! g.setFont(cfont.getFont());
- }
- g.drawString(
- label,
- (int) (getX(index + 1, 1) - bounds.getWidth() / 2),
- getY(index+1, 1));
- }
! // draw gridline labels
! g.setColor(Color.darkGray);
! g.setFont(props.getAxisLabelChartFont().DEFAULT_AXIS_VALUE.getFont());
! int selectedLine = (int) iRadarChartDataSet.getNumberOfDataItems()/2;
! for (double i = scaleIncrement; i <= scaleMax; i+=scaleIncrement) {
! double pos = scaleValue(i);
! Rectangle2D bounds = g.getFont().getStringBounds("1",
! g.getFontRenderContext());
! g.drawString(props.getGridLabelFormat().format(i),
! getX(selectedLine,pos),
! (int) Math.round(getY(selectedLine,pos) + bounds.getHeight()));
! }
- }
! private int getX(int dataset, double factor) {
! return (int) Math.round(center.getX() + radius * factor * Math.sin(step * dataset));
! }
! private int getY(int dataset, double factor) {
! return (int) Math.round(center.getY() + radius * factor * Math.cos(step * dataset));
! }
! private double scaleValue(double value) {
! if (value>scaleMax)
! value=scaleMax;
! if (scaleMax==0)
! return 0;
! return value/scaleMax;
! }
}
--- 54,297 ----
import org.krysalis.jcharts.properties.util.ChartFont;
!
! /*************************************************************************************
* Represents a radar chart a.k.a. spider chart
*
* @author Rami Hansenne
! * @version $Id$
! * @since 1.0.0
! ************************************************************************************/
!
public class RadarChart
! extends Chart
! {
! private IRadarChartDataSet iRadarChartDataSet;
! private RadarChartDataProcessor radarChartDataProcessor;
! private RadarChartProperties props;
! private double radius, step;
! private Point2D center;
! // scale max value and increment
! private double scaleMax, scaleIncrement;
! // default number of scale increments if no user defined increment
! private static final int DEFAULT_NR_OF_INCREMENTS = 10;
! /************************************************************************************************
! * Constructor
! *
! * @param iRadarChartDataSet
! * @param legendProperties
! * @param chartProperties general chart properties
! * @param pixelWidth
! * @param pixelHeight
! ************************************************************************************************/
! public RadarChart( IRadarChartDataSet iRadarChartDataSet,
! LegendProperties legendProperties,
! ChartProperties chartProperties,
! int pixelWidth,
! int pixelHeight )
! {
! super( legendProperties, chartProperties, pixelWidth, pixelHeight );
! this.iRadarChartDataSet = iRadarChartDataSet;
! props = (RadarChartProperties) iRadarChartDataSet.getChartTypeProperties();
! if( props == null )
! {
! props = new RadarChartProperties();
! }
! }
! /************************************************************************************************
! * Draws the chart
! *
! ************************************************************************************************/
! protected void renderChart()
! {
! Graphics2D g2d = getGraphics2D();
! // turn anti-aliasing on
! g2d.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
! //todo : render legend, use scale processor classes,...
! FontRenderContext fontRenderContext = super.getGraphics2D().
! getFontRenderContext();
! //---render the TITLE. If no title, this will return zero.
! float chartTitleHeight = super.renderChartTitle( this.iRadarChartDataSet.
! getChartTitle(), fontRenderContext );
! this.radarChartDataProcessor = new RadarChartDataProcessor( this.iRadarChartDataSet );
! this.radarChartDataProcessor.processData();
! // set scale max value
! if( Double.isNaN( props.getScaleMaxValue() ) )
! this.scaleMax = radarChartDataProcessor.getMaxValue();
! else
! scaleMax = props.getScaleMaxValue();
! // set scale increment
! if( Double.isNaN( props.getScaleIncrement() ) )
! this.scaleIncrement = scaleMax / DEFAULT_NR_OF_INCREMENTS;
! else
! scaleIncrement = props.getScaleIncrement();
! //todo : adjust chart space in order to correctly render title & legend
! Rectangle chartSpace = new Rectangle( getImageWidth(), getImageHeight() );
! center = new Point2D.Double(
! chartSpace.getWidth() / 2 - chartSpace.getX(),
! chartSpace.getHeight() / 2 - chartSpace.getY() );
! radius = Math.min( chartSpace.getWidth(), chartSpace.getHeight() );
! radius = ( radius - ( radius * 10 ) / 100 ) / 2;
! step = 2 * Math.PI / iRadarChartDataSet.getNumberOfDataItems();
! if( props.getShowGridLines() )
! {
! drawGridLines( g2d );
! }
! drawAxis( g2d );
! drawRadar( g2d );
! }
! private void drawRadar(
! Graphics2D g )
! {
! for( int dataset = 0; dataset < iRadarChartDataSet.getNumberOfDataSets();
! dataset++ )
! {
! double currentValue;
! double previousValue = scaleValue( iRadarChartDataSet.getValue( dataset,
! iRadarChartDataSet.getNumberOfDataItems() -
! 1 ) );
! Paint paint = iRadarChartDataSet.getPaint( dataset );
! for( int di = 0; di < iRadarChartDataSet.getNumberOfDataItems(); di++ )
! {
! currentValue = previousValue;
! previousValue = scaleValue( iRadarChartDataSet.getValue( dataset, di ) );
! g.setPaint( paint );
! int c0 = (int) Math.round( center.getX() );
! int c1 = (int) Math.round( center.getY() );
! int x0 = getX( di + 1, previousValue );
! int y0 = getY( di + 1, previousValue );
! int x1 = getX( di, currentValue );
! int y1 = getY( di, currentValue );
! if( props.getFillRadar() )
! {
! Polygon p = new Polygon();
! p.addPoint( c0, c1 );
! p.addPoint( x0, y0 );
! p.addPoint( x1, y1 );
! // make color translucent
! if( paint instanceof Color )
! {
! Color color = (Color) paint;
! g.setPaint( new Color( color.getRed(), color.getGreen(),
! color.getBlue(), 100 ) );
! }
! g.fillPolygon( p );
! g.setPaint( paint );
! }
! g.drawLine( x0, y0, x1, y1 );
! }
! }
! }
! private void drawGridLines( Graphics2D g )
! {
! g.setColor( Color.lightGray );
! for( int di = 0; di < iRadarChartDataSet.getNumberOfDataItems();
! di++ )
! {
! for( double i = scaleIncrement; i <= scaleMax; i += scaleIncrement )
! {
! double pos = scaleValue( i );
! g.drawLine(
! getX( di + 1, pos ),
! getY( di + 1, pos ),
! getX( di, pos ),
! getY( di, pos ) );
! }
! }
! }
! private void drawAxis( Graphics2D g )
! {
! g.setColor( Color.darkGray );
! for( int index = 0; index < iRadarChartDataSet.getNumberOfDataItems();
! index++ )
! {
! String label = iRadarChartDataSet.getAxisLabel( index );
! g.drawLine(
! (int) center.getX(),
! (int) center.getY(),
! getX( index, 1 ),
! getY( index, 1 ) );
! Rectangle2D bounds = g.getFontMetrics().getStringBounds( label, g );
! // draw axis label
! ChartFont cfont = props.getTitleChartFont();
! if( cfont != null )
! {
! g.setFont( cfont.getFont() );
!
! }
! g.drawString(
! label,
! (int) ( getX( index + 1, 1 ) - bounds.getWidth() / 2 ),
! getY( index + 1, 1 ) );
! }
!
! // draw gridline labels
! g.setColor( Color.darkGray );
! g.setFont( props.getAxisLabelChartFont().DEFAULT_AXIS_VALUE.getFont() );
! int selectedLine = (int) iRadarChartDataSet.getNumberOfDataItems() / 2;
! for( double i = scaleIncrement; i <= scaleMax; i += scaleIncrement )
! {
! double pos = scaleValue( i );
! Rectangle2D bounds = g.getFont().getStringBounds( "1",
! g.getFontRenderContext() );
! g.drawString( props.getGridLabelFormat().format( i ),
! getX( selectedLine, pos ),
! (int) Math.round( getY( selectedLine, pos ) + bounds.getHeight() ) );
! }
!
! }
!
!
! private int getX( int dataset, double factor )
! {
! return (int) Math.round( center.getX() + radius * factor * Math.sin( step * dataset ) );
! }
!
!
! private int getY( int dataset, double factor )
! {
! return (int) Math.round( center.getY() + radius * factor * Math.cos( step * dataset ) );
! }
!
!
! private double scaleValue( double value )
! {
! if( value > scaleMax )
! value = scaleMax;
! if( scaleMax == 0 )
! return 0;
! return value / scaleMax;
! }
}
|
|
From: <nic...@us...> - 2003-08-06 08:42:40
|
Update of /cvsroot/jcharts/krysalis-jcharts In directory sc8-pr-cvs1:/tmp/cvs-serv6028 Modified Files: status.xml Log Message: Testing commit messages. Index: status.xml =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/status.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** status.xml 29 Jun 2003 14:13:36 -0000 1.12 --- status.xml 6 Aug 2003 08:42:32 -0000 1.13 *************** *** 7,11 **** </developers> ! <todo> <actions priority="high"> <action context="feedback" dev="nathaniel_auvil"> --- 7,11 ---- </developers> ! <todo> <actions priority="high"> <action context="feedback" dev="nathaniel_auvil"> |
|
From: Nicola K. B. <nic...@ap...> - 2003-08-06 08:33:20
|
Testing 1,2,3
--
Nicola Ken Barozzi nic...@ap...
- verba volant, scripta manent -
(discussions get forgotten, just code remains)
---------------------------------------------------------------------
|