Menu
▾
▴
jcharts-cvs — Commit messages for jcharts
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: Nathaniel G. A. <nat...@us...> - 2004-05-26 01:58:16
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11532/src/java/org/krysalis/jcharts/test Modified Files: ChartTestDriver.java BarTestDriver.java AxisChartTestBase.java Log Message: updates for imageMap with zero values Index: ChartTestDriver.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/ChartTestDriver.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChartTestDriver.java 22 Jun 2003 14:15:42 -0000 1.2 --- ChartTestDriver.java 26 May 2004 01:58:07 -0000 1.3 *************** *** 99,103 **** */ ! AxisChartTestBase.axisChartTest( "scatterChart", new ScatterPlotTestDriver() ); --- 99,103 ---- */ ! // AxisChartTestBase.axisChartTest( "scatterChart", new ScatterPlotTestDriver() ); Index: BarTestDriver.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/BarTestDriver.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BarTestDriver.java 8 Aug 2003 08:51:27 -0000 1.3 --- BarTestDriver.java 26 May 2004 01:58:07 -0000 1.4 *************** *** 116,121 **** numberOfDataSets, dataSize, ! -2000, ! 2000 ); dataSeries.addIAxisPlotDataSet( axisChartDataSet ); --- 116,121 ---- numberOfDataSets, dataSize, ! 0, ! 100 ); dataSeries.addIAxisPlotDataSet( axisChartDataSet ); Index: AxisChartTestBase.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/test/AxisChartTestBase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AxisChartTestBase.java 17 May 2003 17:01:10 -0000 1.1 --- AxisChartTestBase.java 26 May 2004 01:58:07 -0000 1.2 *************** *** 89,93 **** boolean horizontalPlot= false; //( TestDataGenerator.getRandomNumber( 1 ) > 0.5d ); ! boolean createImageMap= ( TestDataGenerator.getRandomNumber( 1 ) > 0.5d ); axisProperties = new AxisProperties( horizontalPlot ); --- 89,93 ---- boolean horizontalPlot= false; //( TestDataGenerator.getRandomNumber( 1 ) > 0.5d ); ! boolean createImageMap= true; //( TestDataGenerator.getRandomNumber( 1 ) > 0.5d ); axisProperties = new AxisProperties( horizontalPlot ); |
|
From: Nathaniel G. A. <nat...@us...> - 2004-05-26 01:57:29
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/axisChart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11439/src/java/org/krysalis/jcharts/axisChart Modified Files: BarChart.java Log Message: image maps for zero values on vertical plots. Still need to test User Defined Scale. Index: BarChart.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/axisChart/BarChart.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BarChart.java 17 May 2003 16:56:57 -0000 1.1 --- BarChart.java 26 May 2004 01:57:19 -0000 1.2 *************** *** 33,65 **** ************************************************************************************************/ - package org.krysalis.jcharts.axisChart; import org.krysalis.jcharts.axisChart.customRenderers.axisValue.AxisValueRenderEvent; import org.krysalis.jcharts.chartData.interfaces.IAxisChartDataSet; import org.krysalis.jcharts.imageMap.RectMapArea; import org.krysalis.jcharts.properties.BarChartProperties; import org.krysalis.jcharts.properties.DataAxisProperties; - import java.awt.*; - import java.awt.geom.Rectangle2D; - ! /************************************************************************************* ! * * @author Nathaniel Auvil * @version $Id$ ! ************************************************************************************/ abstract class BarChart { ! /******************************************************************************************** ! * Draws the chart ! * uses Rectangle2D......keep having rounding problems. ! * * @param axisChart * @param iAxisChartDataSet ! *********************************************************************************************/ static void render( AxisChart axisChart, IAxisChartDataSet iAxisChartDataSet ) { --- 33,63 ---- ************************************************************************************************/ package org.krysalis.jcharts.axisChart; + import java.awt.Graphics2D; + import java.awt.geom.Rectangle2D; + import org.krysalis.jcharts.axisChart.customRenderers.axisValue.AxisValueRenderEvent; import org.krysalis.jcharts.chartData.interfaces.IAxisChartDataSet; + import org.krysalis.jcharts.chartText.TextTagGroup; import org.krysalis.jcharts.imageMap.RectMapArea; import org.krysalis.jcharts.properties.BarChartProperties; import org.krysalis.jcharts.properties.DataAxisProperties; ! /***************************************************************************************** * @author Nathaniel Auvil * @version $Id$ ! ****************************************************************************************/ abstract class BarChart { ! /*************************************************************************************** ! * Draws the chart uses Rectangle2D......keep having rounding problems. ! * * @param axisChart * @param iAxisChartDataSet ! **************************************************************************************/ static void render( AxisChart axisChart, IAxisChartDataSet iAxisChartDataSet ) { *************** *** 76,80 **** float height; - if( axisChart.getAxisProperties().isPlotHorizontal() ) { --- 74,77 ---- *************** *** 88,92 **** Rectangle2D.Float rectangle = new Rectangle2D.Float( startingX, startingY, width, height ); ! BarChart.horizontalPlot( axisChart, iAxisChartDataSet, barChartProperties, dataAxisProperties, g2d, rectangle, startingX ); } else --- 85,95 ---- Rectangle2D.Float rectangle = new Rectangle2D.Float( startingX, startingY, width, height ); ! BarChart.horizontalPlot( axisChart, ! iAxisChartDataSet, ! barChartProperties, ! dataAxisProperties, ! g2d, ! rectangle, ! startingX ); } else *************** *** 101,111 **** Rectangle2D.Float rectangle = new Rectangle2D.Float( startingX, startingY, width, height ); ! BarChart.verticalPlot( axisChart, iAxisChartDataSet, barChartProperties, dataAxisProperties, g2d, rectangle, startingY ); } } ! /********************************************************************************************* ! * * @param axisChart * @param iAxisChartDataSet --- 104,119 ---- Rectangle2D.Float rectangle = new Rectangle2D.Float( startingX, startingY, width, height ); ! BarChart.verticalPlot( axisChart, ! iAxisChartDataSet, ! barChartProperties, ! dataAxisProperties, ! g2d, ! rectangle, ! startingY ); } } ! /*************************************************************************************** * @param axisChart * @param iAxisChartDataSet *************** *** 115,128 **** * @param rectangle * @param startingX ! *********************************************************************************************/ private static void horizontalPlot( AxisChart axisChart, ! IAxisChartDataSet iAxisChartDataSet, ! BarChartProperties barChartProperties, ! DataAxisProperties dataAxisProperties, ! Graphics2D g2d, ! Rectangle2D.Float rectangle, ! float startingX ) { ! int imageMapLabelIndex = axisChart.getYAxis().getNumberOfScaleItems() - 1; //---setup the total area rectangle --- 123,136 ---- * @param rectangle * @param startingX ! **************************************************************************************/ private static void horizontalPlot( AxisChart axisChart, ! IAxisChartDataSet iAxisChartDataSet, ! BarChartProperties barChartProperties, ! DataAxisProperties dataAxisProperties, ! Graphics2D g2d, ! Rectangle2D.Float rectangle, ! float startingX ) { ! int imageMapLabelIndex = axisChart.getYAxis().getNumberOfScaleItems() - 1; //---setup the total area rectangle *************** *** 133,148 **** totalItemArea.width = axisChart.getXAxis().getPixelLength() - 1; - //---reuse the same Object for pre and post render events. AxisValueRenderEvent axisValueRenderEvent = new AxisValueRenderEvent( axisChart, ! iAxisChartDataSet, ! g2d, ! totalItemArea, ! axisChart.getXAxis().getZeroLineCoordinate() ); //---there is only ever one data set for a regular bar chart axisValueRenderEvent.setDataSetIndex( 0 ); - //LOOP for( int i = 0; i < iAxisChartDataSet.getNumberOfDataItems(); i++ ) --- 141,154 ---- totalItemArea.width = axisChart.getXAxis().getPixelLength() - 1; //---reuse the same Object for pre and post render events. AxisValueRenderEvent axisValueRenderEvent = new AxisValueRenderEvent( axisChart, ! iAxisChartDataSet, ! g2d, ! totalItemArea, ! axisChart.getXAxis().getZeroLineCoordinate() ); //---there is only ever one data set for a regular bar chart axisValueRenderEvent.setDataSetIndex( 0 ); //LOOP for( int i = 0; i < iAxisChartDataSet.getNumberOfDataItems(); i++ ) *************** *** 159,163 **** barChartProperties.firePreRender( axisValueRenderEvent ); - //---if value == 0 do not plot anything. if( iAxisChartDataSet.getValue( 0, i ) != 0.0d ) --- 165,168 ---- *************** *** 166,171 **** { rectangle.x = axisChart.getXAxis().computeAxisCoordinate( axisChart.getXAxis().getOrigin(), ! iAxisChartDataSet.getValue( 0, i ), ! axisChart.getXAxis().getScaleCalculator().getMinValue() ); rectangle.width = startingX - rectangle.x; --- 171,178 ---- { rectangle.x = axisChart.getXAxis().computeAxisCoordinate( axisChart.getXAxis().getOrigin(), ! iAxisChartDataSet.getValue( 0, i ), ! axisChart .getXAxis() ! .getScaleCalculator() ! .getMinValue() ); rectangle.width = startingX - rectangle.x; *************** *** 177,181 **** rectangle.x = startingX; rectangle.width = BarChart.computeScaleHeightOfValue( iAxisChartDataSet.getValue( 0, i ), ! axisChart.getXAxis().getOneUnitPixelSize() ); //---set values for the postRender event --- 184,188 ---- rectangle.x = startingX; rectangle.width = BarChart.computeScaleHeightOfValue( iAxisChartDataSet.getValue( 0, i ), ! axisChart.getXAxis().getOneUnitPixelSize() ); //---set values for the postRender event *************** *** 183,197 **** } ! ! //---with a user defined scale, we could have non-zero data points with a height of zero. if( rectangle.width != 0 ) { ! /* ! System.out.println( "rectangle.x= " + rectangle.x ); ! System.out.println( "rectangle.y= " + rectangle.y ); ! System.out.println( "rectangle.width= " + rectangle.width ); ! System.out.println( "rectangle.height= " + rectangle.height ); ! */ g2d.fill( rectangle ); --- 190,204 ---- } ! //---with a user defined scale, we could have non-zero data points with a height ! // of zero. if( rectangle.width != 0 ) { ! /* ! * System.out.println( "rectangle.x= " + rectangle.x ); System.out.println( ! * "rectangle.y= " + rectangle.y ); System.out.println( "rectangle.width= " + ! * rectangle.width ); System.out.println( "rectangle.height= " + ! * rectangle.height ); ! */ g2d.fill( rectangle ); *************** *** 215,221 **** axisChart.getImageMap().addImageMapArea( new RectMapArea( rectangle, ! iAxisChartDataSet.getValue( 0, i ), ! label, ! iAxisChartDataSet.getLegendLabel( 0 ) ) ); imageMapLabelIndex--; --- 222,228 ---- axisChart.getImageMap().addImageMapArea( new RectMapArea( rectangle, ! iAxisChartDataSet.getValue( 0, i ), ! label, ! iAxisChartDataSet.getLegendLabel( 0 ) ) ); imageMapLabelIndex--; *************** *** 224,228 **** } - //---notify everyone we just rendered barChartProperties.firePostRender( axisValueRenderEvent ); --- 231,234 ---- *************** *** 234,239 **** ! /************************************************************************************** ! * * @param axisChart * @param iAxisChartDataSet --- 240,244 ---- ! /*************************************************************************************** * @param axisChart * @param iAxisChartDataSet *************** *** 245,256 **** **************************************************************************************/ private static void verticalPlot( AxisChart axisChart, ! IAxisChartDataSet iAxisChartDataSet, ! BarChartProperties barChartProperties, ! DataAxisProperties dataAxisProperties, ! Graphics2D g2d, ! Rectangle2D.Float rectangle, ! float startingY ) { - //---setup the total area rectangle Rectangle2D.Float totalItemArea = new Rectangle2D.Float(); --- 250,260 ---- **************************************************************************************/ private static void verticalPlot( AxisChart axisChart, ! IAxisChartDataSet iAxisChartDataSet, ! BarChartProperties barChartProperties, ! DataAxisProperties dataAxisProperties, ! Graphics2D g2d, ! Rectangle2D.Float rectangle, ! float startingY ) { //---setup the total area rectangle Rectangle2D.Float totalItemArea = new Rectangle2D.Float(); *************** *** 260,276 **** totalItemArea.height = axisChart.getYAxis().getPixelLength() - 1; - //---reuse the same Object for pre and post render events. AxisValueRenderEvent axisValueRenderEvent = new AxisValueRenderEvent( axisChart, ! iAxisChartDataSet, ! g2d, ! totalItemArea, ! axisChart.getYAxis().getZeroLineCoordinate() ); //---there is only ever one data set for a regular bar chart axisValueRenderEvent.setDataSetIndex( 0 ); - - //LOOP for( int i = 0; i < iAxisChartDataSet.getNumberOfDataItems(); i++ ) --- 264,277 ---- totalItemArea.height = axisChart.getYAxis().getPixelLength() - 1; //---reuse the same Object for pre and post render events. AxisValueRenderEvent axisValueRenderEvent = new AxisValueRenderEvent( axisChart, ! iAxisChartDataSet, ! g2d, ! totalItemArea, ! axisChart.getYAxis().getZeroLineCoordinate() ); //---there is only ever one data set for a regular bar chart axisValueRenderEvent.setDataSetIndex( 0 ); //LOOP for( int i = 0; i < iAxisChartDataSet.getNumberOfDataItems(); i++ ) *************** *** 287,291 **** barChartProperties.firePreRender( axisValueRenderEvent ); - //---if value == 0 do not plot anything. if( iAxisChartDataSet.getValue( 0, i ) != 0.0d ) --- 288,291 ---- *************** *** 294,299 **** { rectangle.y = startingY; ! rectangle.height = BarChart.computeScaleHeightOfValue( iAxisChartDataSet.getValue( 0, i ), ! axisChart.getYAxis().getOneUnitPixelSize() ); axisValueRenderEvent.setValueY( rectangle.y + rectangle.height ); --- 294,298 ---- { rectangle.y = startingY; ! rectangle.height = BarChart.computeScaleHeightOfValue( iAxisChartDataSet.getValue( 0, i ), axisChart.getYAxis().getOneUnitPixelSize() ); axisValueRenderEvent.setValueY( rectangle.y + rectangle.height ); *************** *** 309,312 **** --- 308,312 ---- } + //TODO not sure this makes sense. How could this be zero? //---with a user defined scale, we could have non-zero data points with a height of zero. if( rectangle.height != 0 ) *************** *** 319,343 **** g2d.setPaint( iAxisChartDataSet.getPaint( 0 ) ); } //---if we are generating an ImageMap, store the image coordinates if( axisChart.getGenerateImageMapFlag() ) { ! String label; ! if( axisChart.getXAxis().getAxisLabelsGroup() != null ) ! { ! label = axisChart.getXAxis().getAxisLabelsGroup().getTextTag( i ).getText(); ! } ! else ! { ! label = null; ! } ! axisChart.getImageMap().addImageMapArea( new RectMapArea( rectangle, ! iAxisChartDataSet.getValue( 0, i ), ! label, ! iAxisChartDataSet.getLegendLabel( 0 ) ) ); } } ! } //---notify everyone we just rendered --- 319,364 ---- g2d.setPaint( iAxisChartDataSet.getPaint( 0 ) ); } + } + + //---even if the bar is not visible, we still need to generate an ImageMapArea + if( axisChart.getGenerateImageMapFlag() ) + { + RectMapArea rectMapArea = createImageMapArea( axisChart.getXAxis().getAxisLabelsGroup(), + i, + rectangle, + iAxisChartDataSet.getValue( 0, i ), + iAxisChartDataSet.getLegendLabel( 0 ) ); + + axisChart.getImageMap().addImageMapArea( rectMapArea ); + } + } + else + { + // System.out.println( "value was zero" ); + + //---make sure zero is even visible on the scale + if( axisChart.getYAxis().getScaleCalculator().getMaxValue() >= 0 + && axisChart.getYAxis().getScaleCalculator().getMinValue() <= 0 ) + { + rectangle.y = startingY; + rectangle.height = 1; //---if we are generating an ImageMap, store the image coordinates if( axisChart.getGenerateImageMapFlag() ) { ! RectMapArea rectMapArea = createImageMapArea( axisChart.getXAxis().getAxisLabelsGroup(), ! i, ! rectangle, ! iAxisChartDataSet.getValue( 0, i ), ! iAxisChartDataSet.getLegendLabel( 0 ) ); ! axisChart.getImageMap().addImageMapArea( rectMapArea ); } } ! /* else ! { ! System.out.println( "Not in scale range so skip." ); ! } ! */ } //---notify everyone we just rendered *************** *** 350,362 **** ! /******************************************************************************************************* ! * Takes a value and determines the number of pixels it should fill on the screen. ! * If there is a user defined scale and the passed value is greater than the MAX or less than the MIN, ! * the height will be forced to the MAX or MIN respectively. ! * * @param value * @param oneUnitPixelSize * @return float the screen pixel coordinate ! ********************************************************************************************************/ static float computeScaleHeightOfValue( double value, double oneUnitPixelSize ) { --- 371,383 ---- ! /*************************************************************************************** ! * Takes a value and determines the number of pixels it should fill on the screen. If ! * there is a user defined scale and the passed value is greater than the MAX or less ! * than the MIN, the height will be forced to the MAX or MIN respectively. ! * * @param value * @param oneUnitPixelSize * @return float the screen pixel coordinate ! **************************************************************************************/ static float computeScaleHeightOfValue( double value, double oneUnitPixelSize ) { *************** *** 364,366 **** } ! } --- 385,414 ---- } ! ! /*************************************************************************************** ! * @param axisLabelsGroup ! * @param index ! * @param rectangle ! * @param value ! * @param legendLabel ! * @return ! **************************************************************************************/ ! private static RectMapArea createImageMapArea( TextTagGroup axisLabelsGroup, ! int index, ! Rectangle2D.Float rectangle, ! double value, ! String legendLabel ) ! { ! String label; ! if( axisLabelsGroup != null ) ! { ! label = axisLabelsGroup.getTextTag( index ).getText(); ! } ! else ! { ! label = null; ! } ! ! return new RectMapArea( rectangle, value, label, legendLabel ); ! } ! } \ No newline at end of file |
|
From: Nathaniel G. A. <nat...@us...> - 2004-05-25 01:04:19
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common/stroke In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3969/src/java/org/krysalis/jcharts/designer/common/stroke Modified Files: StrokeChooser.java EndCapsCombo.java LineJoinsCombo.java Log Message: Index: StrokeChooser.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common/stroke/StrokeChooser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StrokeChooser.java 9 Aug 2003 17:05:38 -0000 1.1 --- StrokeChooser.java 25 May 2004 01:04:07 -0000 1.2 *************** *** 37,41 **** --- 37,46 ---- + import java.awt.BasicStroke; + import java.awt.Color; + import java.awt.Stroke; + import org.krysalis.jcharts.designer.common.LabelledTextfield; + import org.krysalis.jcharts.properties.util.ChartStroke; import javax.swing.*; *************** *** 64,68 **** this.setLayout( new BoxLayout( this, BoxLayout.Y_AXIS ) ); ! this.widthField= new LabelledTextfield( "Width" ); super.add( this.widthField ); --- 69,73 ---- this.setLayout( new BoxLayout( this, BoxLayout.Y_AXIS ) ); ! this.widthField= new LabelledTextfield( "Width", 4 ); super.add( this.widthField ); *************** *** 89,93 **** this.setLayout( new BoxLayout( this, BoxLayout.Y_AXIS ) ); ! this.widthField= new LabelledTextfield( "Width" ); super.add( this.widthField ); --- 94,99 ---- this.setLayout( new BoxLayout( this, BoxLayout.Y_AXIS ) ); ! this.widthField= new LabelledTextfield( "Width", 3 ); ! this.widthField.setText( "1" ); super.add( this.widthField ); *************** *** 100,102 **** --- 106,120 ---- + /***************************************************************** + * + * @return ChartStroke + ****************************************************************/ + public ChartStroke getChartStroke() + { + Stroke stroke= new BasicStroke( Float.valueOf( this.widthField.getText() ).floatValue(), + this.endCaps.getEndCapsConstant(), + this.lineJoins.getLineJoinsConstant() ); + return new ChartStroke( stroke, Color.BLACK ); + //TODO need to get the Paint + } } Index: LineJoinsCombo.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common/stroke/LineJoinsCombo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LineJoinsCombo.java 9 Aug 2003 17:05:38 -0000 1.1 --- LineJoinsCombo.java 25 May 2004 01:04:07 -0000 1.2 *************** *** 50,54 **** static { ! ALL_LINE_JOINS= new String[]{ "BEVEL", "MITER", "ROUND" }; } --- 50,54 ---- static { ! ALL_LINE_JOINS= new String[]{ "MITER", "BEVEL", "ROUND" }; } *************** *** 62,64 **** --- 62,74 ---- } + + /***************************************************************** + * + * @return int the Constant value for the selected value + * @see java.awt.BasicStroke + *****************************************************************/ + public int getLineJoinsConstant() + { + return super.getSelectedIndex(); + } } Index: EndCapsCombo.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common/stroke/EndCapsCombo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EndCapsCombo.java 9 Aug 2003 17:05:38 -0000 1.1 --- EndCapsCombo.java 25 May 2004 01:04:07 -0000 1.2 *************** *** 62,64 **** --- 62,74 ---- } + + /************************************************************** + * + * @return int + * @see java.awt.BasicStroke + *************************************************************/ + protected int getEndCapsConstant() + { + return super.getSelectedIndex(); + } } |
|
From: Nathaniel G. A. <nat...@us...> - 2004-05-25 01:04:19
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common/font In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3969/src/java/org/krysalis/jcharts/designer/common/font Modified Files: StylesCombo.java FontChooser.java Log Message: Index: FontChooser.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common/font/FontChooser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FontChooser.java 9 Aug 2003 17:04:56 -0000 1.1 --- FontChooser.java 25 May 2004 01:04:08 -0000 1.2 *************** *** 51,55 **** this.add( this.fontCombo ); ! this.size= new LabelledTextfield( "Size:" ); this.add( this.size ); --- 51,56 ---- this.add( this.fontCombo ); ! this.size= new LabelledTextfield( "Size:", 3 ); ! this.size.setText( "12" ); this.add( this.size ); *************** *** 67,71 **** if( this.size.getText().trim().equals( "" ) ) { ! throw new DesignerException( this.title + " can not be NULL." ); } --- 68,72 ---- if( this.size.getText().trim().equals( "" ) ) { ! throw new DesignerException( "Title Font size can not be NULL." ); } Index: StylesCombo.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common/font/StylesCombo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StylesCombo.java 9 Aug 2003 17:04:56 -0000 1.1 --- StylesCombo.java 25 May 2004 01:04:07 -0000 1.2 *************** *** 50,54 **** static { ! ALL_STYLES= new String[]{ "BOLD", "ITALIC", "PLAIN" }; } --- 50,54 ---- static { ! ALL_STYLES= new String[]{ "PLAIN", "BOLD", "ITALIC" }; } |
|
From: Nathaniel G. A. <nat...@us...> - 2004-05-25 01:04:19
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3969/src/java/org/krysalis/jcharts/designer/common Modified Files: LabelledTextfield.java Added Files: LabelledCheckbox.java Log Message: Index: LabelledTextfield.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/common/LabelledTextfield.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LabelledTextfield.java 9 Aug 2003 17:04:28 -0000 1.1 --- LabelledTextfield.java 25 May 2004 01:04:07 -0000 1.2 *************** *** 55,65 **** * * @param label ********************************************************************************/ ! public LabelledTextfield( String label ) { super(); this.jLabel = new JLabel( label ); ! this.textField = new JTextField( 2 ); this.setLayout( new FlowLayout() ); --- 55,66 ---- * * @param label + * @param size ********************************************************************************/ ! public LabelledTextfield( String label, int size ) { super(); this.jLabel = new JLabel( label ); ! this.textField = new JTextField( size ); this.setLayout( new FlowLayout() ); *************** *** 68,72 **** } ! /********************************************************************************* * --- 69,73 ---- } ! /********************************************************************************* * *************** *** 76,78 **** --- 77,84 ---- return this.textField.getText(); } + + public void setText( String text ) + { + this.textField.setText( text ); + } } --- NEW FILE: LabelledCheckbox.java --- /*********************************************************************************************** * File Info: Id: $ * Copyright (C) 2002 * Author: Nathaniel G. Auvil * Contributor(s): * * Copyright 2004 (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.designer.common; import javax.swing.*; import java.awt.*; public class LabelledCheckbox extends JPanel { private JLabel jLabel; private JCheckBox checkbox; /******************************************************************************** * * @param label ********************************************************************************/ public LabelledCheckbox( String label ) { super(); this.jLabel = new JLabel( label ); this.checkbox = new JCheckBox(); this.setLayout( new FlowLayout() ); this.add( this.jLabel ); this.add( this.checkbox ); } public boolean isSelected() { return this.checkbox.isSelected(); } public void setSelected( boolean selected ) { this.checkbox.setSelected( selected ); } } |
|
From: Nathaniel G. A. <nat...@us...> - 2004-05-25 01:03:13
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3831/src/java/org/krysalis/jcharts/designer/tabs/allChart Modified Files: ChartPropertiesTab.java Log Message: Index: ChartPropertiesTab.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/ChartPropertiesTab.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChartPropertiesTab.java 2 Sep 2003 08:48:19 -0000 1.2 --- ChartPropertiesTab.java 25 May 2004 01:03:04 -0000 1.3 *************** *** 42,45 **** --- 42,47 ---- import org.krysalis.jcharts.designer.common.stroke.StrokeChooser; import org.krysalis.jcharts.designer.exceptions.DesignerException; + import org.krysalis.jcharts.designer.tabs.allChart.items.EdgePadding; + import org.krysalis.jcharts.properties.ChartProperties; *************** *** 55,58 **** --- 57,61 ---- private FontChooser titleFont; private StrokeChooser borderStroke; + private EdgePadding edgePadding; *************** *** 68,83 **** allChartTabs.addTab( "Chart Properties", this ); ! this.titleFont= new org.krysalis.jcharts.designer.common.font.FontChooser( "Title Font" ); this.add( this.titleFont ); ! this.borderStroke= new org.krysalis.jcharts.designer.common.stroke.StrokeChooser( "Border Stroke" ); this.add( this.borderStroke ); } ! ! public void updateChartProperties( org.krysalis.jcharts.properties.ChartProperties chartProperties ) throws DesignerException { chartProperties.setTitleFont( this.titleFont.getChartFont() ); } } --- 71,97 ---- allChartTabs.addTab( "Chart Properties", this ); ! this.titleFont= new FontChooser( "Title Font" ); this.add( this.titleFont ); ! this.borderStroke= new StrokeChooser( "Border Stroke" ); this.add( this.borderStroke ); + + this.edgePadding= new EdgePadding( "Edge Padding" ); + this.add( this.edgePadding ); } ! /****************************************************************** ! * ! * @param chartProperties ! * @throws DesignerException ! *****************************************************************/ ! public void updateChartProperties( ChartProperties chartProperties ) throws DesignerException { chartProperties.setTitleFont( this.titleFont.getChartFont() ); + chartProperties.setBorderStroke( this.borderStroke.getChartStroke() ); + chartProperties.setEdgePadding( this.edgePadding.getEdgePadding() ); + + //TODO add more stuff } } |
|
From: Nathaniel G. A. <nat...@us...> - 2004-05-25 01:02:53
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/items In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3701/src/java/org/krysalis/jcharts/designer/tabs/allChart/items Added Files: EdgePadding.java AntiAliasing.java Log Message: --- NEW FILE: EdgePadding.java --- package org.krysalis.jcharts.designer.tabs.allChart.items; import java.awt.FlowLayout; import javax.swing.BorderFactory; import javax.swing.JPanel; import org.krysalis.jcharts.designer.common.LabelledTextfield; import org.krysalis.jcharts.designer.exceptions.DesignerException; public class EdgePadding extends JPanel { private String title; private LabelledTextfield padding; /*********************************************************************************** * * @param title **********************************************************************************/ public EdgePadding( String title ) { super(); this.title= title; super.setBorder( BorderFactory.createCompoundBorder( BorderFactory.createTitledBorder( this.title ), BorderFactory.createEmptyBorder( 5, 5, 5, 5 ) ) ); this.setLayout( new FlowLayout() ); this.padding = new LabelledTextfield( "Pixels:", 4 ); this.padding.setText( Float.toString( 5 ) ); this.add( this.padding ); } /********************************************************************************* * * @return float ********************************************************************************/ public float getEdgePadding() throws DesignerException { if( this.padding.getText().trim().equals( "" ) ) { throw new DesignerException( "Edge Padding can not be NULL." ); } return Float.parseFloat( this.padding.getText() ); } } --- NEW FILE: AntiAliasing.java --- package org.krysalis.jcharts.designer.tabs.allChart.items; import java.awt.FlowLayout; import javax.swing.BorderFactory; import javax.swing.JPanel; import org.krysalis.jcharts.designer.common.LabelledCheckbox; public class AntiAliasing extends JPanel { private LabelledCheckbox checkbox; /*********************************************************************************** * **********************************************************************************/ public AntiAliasing() { super(); super.setBorder( BorderFactory.createCompoundBorder( BorderFactory.createTitledBorder( "Anti Aliasing" ), BorderFactory.createEmptyBorder( 5, 5, 5, 5 ) ) ); this.setLayout( new FlowLayout() ); this.checkbox = new LabelledCheckbox( "Use:" ); this.checkbox.setSelected( true ); this.add( this.checkbox ); } /********************************************************************************* * * @return boolean ********************************************************************************/ public boolean useAntiAliasing() { return this.checkbox.isSelected(); } } |
|
From: Nathaniel G. A. <nat...@us...> - 2004-05-25 01:02:22
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/items In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3669/src/java/org/krysalis/jcharts/designer/tabs/allChart/items Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/items added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:58:11
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java/org/krysalis/jcharts/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8122/xml Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java/org/krysalis/jcharts/xml added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:57:49
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java/org/krysalis/jcharts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8034/jcharts Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java/org/krysalis/jcharts added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:57:33
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java/org/krysalis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8008/krysalis Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java/org/krysalis added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:57:15
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java/org In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7957/org Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java/org added to the repository |
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/java/org/krysalis/jcharts/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7870 Removed Files: AreachartRenderer.java BarchartRenderer.java DataLoader.java DocumentMerger.java FullRenderTest.java JChartsRenderer.java LinechartRenderer.java NoSuchAttributeException.java PaintProvider.java Piechart2DRenderer.java RadarchartRenderer.java WingsTestSuite.java WingsTransformer.java XPathUtil.java Log Message: make whiteboard xml work --- AreachartRenderer.java DELETED --- --- BarchartRenderer.java DELETED --- --- DataLoader.java DELETED --- --- DocumentMerger.java DELETED --- --- FullRenderTest.java DELETED --- --- JChartsRenderer.java DELETED --- --- LinechartRenderer.java DELETED --- --- NoSuchAttributeException.java DELETED --- --- PaintProvider.java DELETED --- --- Piechart2DRenderer.java DELETED --- --- RadarchartRenderer.java DELETED --- --- WingsTestSuite.java DELETED --- --- WingsTransformer.java DELETED --- --- XPathUtil.java DELETED --- |
|
From: <nic...@us...> - 2004-02-16 13:56:22
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/examples/charts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7772 Added Files: areachart1.xml barchart1.xml data1.xml data2.xml data3.xml graph1.xml graph2.xml graph3.xml graph4.xml graph5.xml graph6.xml linechart1.xml piechart1.xml radarchart1.xml Log Message: make whiteboard xml work --- NEW FILE: areachart1.xml --- <?xml version="1.0" ?> <!-- add the type to the root element, so the program can decide which interpreter to call to interpret the rest of the sheet It will of course also influence the renderer that is called. --> <chartstyle type="areachart"> <lines> <!-- The first line is for the first dataset in the graph The second line for the second one etc. (you get the picture ;) ) --> <line> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> CC6666 </stroke> <stroke-width> 1 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint --> <shape name="rectangle"> <width>10</width> <height>5</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </line> <line> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> CCCC66 </stroke> <stroke-width> 0.5 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape name="ellipse"> <width>5</width> <height>10</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </line> </lines> </chartstyle> --- NEW FILE: barchart1.xml --- <?xml version="1.0" ?> <!-- add the type to the root element, so the program can decide which interpreter to call to interpret the rest of the sheet It will of course also influence the renderer that is called. --> <chartstyle type="barchart"> <bars> <!-- The first bar is for the first dataset in the graph The second bar for the second one etc. (you get the picture ;) ) --> <bar> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB - FIXME: is it possible to define colors in RGB format in SVG? --> <stroke> FF9966 </stroke> <stroke-width> 2 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </bar> <bar> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB - FIXME: is it possible to define colors in RGB format in SVG? --> <stroke> FFCC66 </stroke> <stroke-width> 2 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </bar> </bars> </chartstyle> --- NEW FILE: data1.xml --- <!-- The data --> <data> <!-- v is value (datapoint) --> <v> <!-- y is y-value x is x-value. If one of these is not specified, some default value can be calculated. If, for example, not one x value is specified for the whole dataset, they will be placed on regular intervals. x-values are necessary for defining scatterplots, for example. z-values might also be possible --> <y>80</y> <!-- c stands for "content". This can be used for defining tooltips, for example --> <c>(1990,North) = 80</c> <!-- l stands for "link". Format of the link should be investigated further (I suspect this format is too much html-oriented) --> <l>/1990/North</l> </v> <v> <y>77.6</y> <!-- Emphasize: if it's a pie chart, let this piece jump out. Other charts could provide other emphasizing mechanisms, maybe even dependent on the "style" sheet --> <emphasize /> </v> <v><y>75.7</y></v> <v><y>76.6</y></v> <v><y>76.6</y></v> <v><y>75.6</y></v> <v><y>75.6</y></v> <v><y>75.6</y></v> <v><y>74.6</y></v> <v><y>490.6</y></v> <v><y>74.6</y></v> <v><y>73.6</y></v> <v><y>73.6</y></v> <v><y>73.6</y></v> <v><y>73.6</y></v> <v><y>72.6</y></v> <v><y>72.6</y></v> </data> --- NEW FILE: data2.xml --- <!-- The data --> <data> <!-- v is value (datapoint) --> <v> <!-- y is y-value x is x-value. If one of these is not specified, some default value can be calculated. If, for example, not one x value is specified for the whole dataset, they will be placed on regular intervals. x-values are necessary for defining scatterplots, for example. z-values might also be possible --> <y>40</y> <!-- c stands for "content". This can be used for defining tooltips, for example --> <c>(1990,North) = 80</c> <!-- l stands for "link". Format of the link should be investigated further (I suspect this format is too much html-oriented) --> <l>/1990/North</l> </v> <v> <y>38.3</y> <!-- Emphasize: if it's a pie chart, let this piece jump out. Other charts could provide other emphasizing mechanisms, maybe even dependent on the "style" sheet --> <emphasize /> </v> <v><y>40.7</y></v> <v><y>150.2</y></v> <v><y>174.6</y></v> <v><y>33.6</y></v> <v><y>54.6</y></v> <v><y>54.6</y></v> <v><y>117.6</y></v> <v><y>177.6</y></v> <v><y>176.6</y></v> <v><y>8.6</y></v> <v><y>30.6</y></v> <v><y>0.6</y></v> <v><y>13.6</y></v> <v><y>34.6</y></v> <v><y>72.6</y></v> </data> --- NEW FILE: data3.xml --- <!-- The data --> <data> <!-- v is value (datapoint) --> <v> <!-- y is y-value x is x-value. If one of these is not specified, some default value can be calculated. If, for example, not one x value is specified for the whole dataset, they will be placed on regular intervals. x-values are necessary for defining scatterplots, for example. z-values might also be possible --> <y>80</y> <!-- c stands for "content". This can be used for defining tooltips, for example --> <c>(1990,North) = 80</c> <!-- l stands for "link". Format of the link should be investigated further (I suspect this format is too much html-oriented) --> <l>/1990/North</l> </v> <v> <y>77.6</y> <!-- Emphasize: if it's a pie chart, let this piece jump out. Other charts could provide other emphasizing mechanisms, maybe even dependent on the "style" sheet --> <emphasize /> </v> <v><y>490.6</y></v> <v><y>7.6</y></v> </data> --- NEW FILE: graph1.xml --- <wings country="EN" lang="en"> <ggroup> <gset width="800" height="500"> <title> Wings graph1 </title> <axes> <x-axis> <name> Year </name> <labels> <explicit> <n>1990</n> <n>winter1</n> <n>spring1</n> <n>summer1</n> <n>autumn1</n> <n>1991</n> <n>winter2</n> <n>spring2</n> <n>summer2</n> <n>autumn2</n> <n>1992</n> <n>winter3</n> <n>spring3</n> <n>summer3</n> <n>autumn3</n> <n>1993</n> <n>winter4</n> </explicit> <!-- Defaults: if no label is specified at a given point, use the default label. In fact, you can consider this as follows: - draw the default labels - draw the specified labels, overwriting the default one if necessary --> <default> <min> 1990 </min> <max> 1993 </max> <interval> <!-- provide a label every 5 datapoints --> 5 </interval> </default> </labels> </x-axis> <y-axis> <name> Income </name> <labels> <default> <min> 70 </min> <max> 120 </max> <interval> 10 </interval> </default> </labels> <position> left </position> </y-axis> </axes> <!-- combine is the way the datasets are placed together. I imagine "compare", "add" will be possible among others --> <graph combine="compare"> <style> <!-- Use the specified "style" sheet. Format of the url is yet to be specified. --> <config> linechart1.xml </config> </style> <dataset> <data> <!-- the location of the data. --> <location> data1.xml </location> </data> <!-- A name for the legend --> <name> North </name> <!-- We can remap the axes. Handy for those nifty 3d-graphs This example just gives the defaults. --> <axes> <x-axis>x</x-axis> <y-axis>y</y-axis> </axes> </dataset> <dataset> <data> <location> data2.xml </location> </data> <name> South </name> </dataset> </graph> <!-- The legend. FIXME: work this out --> <legend> <position> south </position> </legend> </gset> </ggroup> </wings> --- NEW FILE: graph2.xml --- <wings xmlns="http://wings.krysalis.org/2002" country="EN" lang="en"> <ggroup> <gset width="350" height="200"> <title> Wings graph2 </title> <axes> <x-axis> <name> Year </name> <labels> <explicit> <n>1990</n> <n>winter1</n> <n>spring1</n> <n>summer1</n> <n>autumn1</n> <n>1991</n> <n>winter2</n> <n>spring2</n> <n>summer2</n> <n>autumn2</n> <n>1992</n> <n>winter3</n> <n>spring3</n> <n>summer3</n> <n>autumn3</n> <n>1993</n> <n>winter4</n> </explicit> <!-- Defaults: if no label is specified at a given point, use the default label. In fact, you can consider this as follows: - draw the default labels - draw the specified labels, overwriting the default one if necessary --> <default> <min> 1990 </min> <max> 1993 </max> <interval> <!-- provide a label every 5 datapoints --> 5 </interval> </default> </labels> </x-axis> <y-axis> <name> Income </name> <labels> <default> <min> 70 </min> <max> 120 </max> <interval> 10 </interval> </default> </labels> <position> left </position> </y-axis> </axes> <!-- combine is the way the datasets are placed together. I imagine "compare", "add" will be possible among others --> <graph combine="compare"> <style> <!-- Use the specified "style" sheet. Format of the url is yet to be specified. --> <config> barchart1.xml </config> </style> <dataset> <data> <!-- the location of the data. --> <location> data1.xml </location> </data>data> <!-- A name for the legend --> <name> North </name> <!-- We can remap the axes. Handy for those nifty 3d-graphs This example just gives the defaults. --> <axes> <x-axis>x</x-axis> <y-axis>y</y-axis> </axes> </dataset> <dataset> <data> <location> data2.xml </location> </data> <name> South </name> </dataset> </graph> <!-- The legend. FIXME: work this out --> <legend> <position> south </position> </legend> </gset> </ggroup> </wings> --- NEW FILE: graph3.xml --- <wings xmlns="http://wings.krysalis.org/2002" country="EN" lang="en"> <ggroup> <gset width="700" height="400"> <title> Wings graph3 </title> <axes> <x-axis> <name> Year </name> <labels> <explicit> <n>1990</n> <n>winter1</n> <n>spring1</n> <n>summer1</n> <n>autumn1</n> <n>1991</n> <n>winter2</n> <n>spring2</n> <n>summer2</n> <n>autumn2</n> <n>1992</n> <n>winter3</n> <n>spring3</n> <n>summer3</n> <n>autumn3</n> <n>1993</n> <n>winter4</n> </explicit> <!-- Defaults: if no label is specified at a given point, use the default label. In fact, you can consider this as follows: - draw the default labels - draw the specified labels, overwriting the default one if necessary --> <default> <min> 1990 </min> <max> 1993 </max> <interval> <!-- provide a label every 5 datapoints --> 5 </interval> </default> </labels> </x-axis> <y-axis> <name> Income </name> <labels> <default> <min> 70 </min> <max> 120 </max> <interval> 10 </interval> </default> </labels> <position> left </position> </y-axis> </axes> <!-- combine is the way the datasets are placed together. I imagine "compare", "add" will be possible among others --> <graph combine="compare"> <style> <!-- Use the specified "style" sheet. Format of the url is yet to be specified. --> <config> barchart1.xml </config> </style> <dataset> <data> <!-- the location of the data. --> <location> data1.xml </location> </data>data> <!-- A name for the legend --> <name> North </name> <!-- We can remap the axes. Handy for those nifty 3d-graphs This example just gives the defaults. --> <axes> <x-axis>x</x-axis> <y-axis>y</y-axis> </axes> </dataset> <dataset> <data> <location> data2.xml </location> </data> <name> South </name> </dataset> </graph> <graph combine="compare"> <style> <!-- Use the specified "style" sheet. Format of the url is yet to be specified. --> <config> linechart1.xml </config> </style> <dataset> <data> <!-- the location of the data. --> <location> data1.xml </location> </data>data> <!-- A name for the legend --> <name> North </name> <!-- We can remap the axes. Handy for those nifty 3d-graphs This example just gives the defaults. --> <axes> <x-axis>x</x-axis> <y-axis>y</y-axis> </axes> </dataset> <dataset> <data> <location> data2.xml </location> </data> <name> South </name> </dataset> </graph> <!-- The legend. FIXME: work this out --> <legend> <position> south </position> </legend> </gset> </ggroup> </wings> --- NEW FILE: graph4.xml --- <wings country="EN" lang="en"> <ggroup> <gset width="800" height="500"> <title> Wings graph4 </title> <axes> <x-axis> <name> Year </name> <labels> <explicit> <n>1990</n> <n>winter1</n> <n>spring1</n> <n>summer1</n> <n>autumn1</n> <n>1991</n> <n>winter2</n> <n>spring2</n> <n>summer2</n> <n>autumn2</n> <n>1992</n> <n>winter3</n> <n>spring3</n> <n>summer3</n> <n>autumn3</n> <n>1993</n> <n>winter4</n> </explicit> <!-- Defaults: if no label is specified at a given point, use the default label. In fact, you can consider this as follows: - draw the default labels - draw the specified labels, overwriting the default one if necessary --> <default> <min> 1990 </min> <max> 1993 </max> <interval> <!-- provide a label every 5 datapoints --> 5 </interval> </default> </labels> </x-axis> <y-axis> <name> Income </name> <labels> <default> <min> 70 </min> <max> 120 </max> <interval> 10 </interval> </default> </labels> <position> left </position> </y-axis> </axes> <!-- combine is the way the datasets are placed together. I imagine "compare", "add" will be possible among others --> <graph combine="compare"> <style> <!-- Use the specified "style" sheet. Format of the url is yet to be specified. --> <config> piechart1.xml </config> </style> <dataset> <data> <!-- the location of the data. --> <location> data3.xml </location> </data> <!-- A name for the legend --> <name> North </name> <!-- We can remap the axes. Handy for those nifty 3d-graphs This example just gives the defaults. --> <axes> <x-axis>x</x-axis> <y-axis>y</y-axis> </axes> </dataset> </graph> <!-- The legend. FIXME: work this out --> <legend> <position> south </position> </legend> </gset> </ggroup> </wings> --- NEW FILE: graph5.xml --- <wings country="EN" lang="en"> <ggroup> <gset width="800" height="500"> <title> Wings graph1 </title> <axes> <x-axis> <name> Year </name> <labels> <explicit> <n>1990</n> <n>winter1</n> <n>spring1</n> <n>summer1</n> <n>autumn1</n> <n>1991</n> <n>winter2</n> <n>spring2</n> <n>summer2</n> <n>autumn2</n> <n>1992</n> <n>winter3</n> <n>spring3</n> <n>summer3</n> <n>autumn3</n> <n>1993</n> <n>winter4</n> </explicit> <!-- Defaults: if no label is specified at a given point, use the default label. In fact, you can consider this as follows: - draw the default labels - draw the specified labels, overwriting the default one if necessary --> <default> <min> 1990 </min> <max> 1993 </max> <interval> <!-- provide a label every 5 datapoints --> 5 </interval> </default> </labels> </x-axis> <y-axis> <name> Income </name> <labels> <default> <min> 70 </min> <max> 120 </max> <interval> 10 </interval> </default> </labels> <position> left </position> </y-axis> </axes> <!-- combine is the way the datasets are placed together. I imagine "compare", "add" will be possible among others --> <graph combine="compare"> <style> <!-- Use the specified "style" sheet. Format of the url is yet to be specified. --> <config> areachart1.xml </config> </style> <dataset> <data> <!-- the location of the data. --> <location> data1.xml </location> </data> <!-- A name for the legend --> <name> North </name> <!-- We can remap the axes. Handy for those nifty 3d-graphs This example just gives the defaults. --> <axes> <x-axis>x</x-axis> <y-axis>y</y-axis> </axes> </dataset> <dataset> <data> <location> data2.xml </location> </data> <name> South </name> </dataset> </graph> <!-- The legend. FIXME: work this out --> <legend> <position> south </position> </legend> </gset> </ggroup> </wings> --- NEW FILE: graph6.xml --- <wings country="EN" lang="en"> <ggroup> <gset width="800" height="500"> <title> Wings graph1 </title> <axes> <x-axis> <name> Year </name> <labels> <explicit> <n>1990</n> <n>winter1</n> <n>spring1</n> <n>summer1</n> <n>autumn1</n> <n>1991</n> <n>winter2</n> <n>spring2</n> <n>summer2</n> <n>autumn2</n> <n>1992</n> <n>winter3</n> <n>spring3</n> <n>summer3</n> <n>autumn3</n> <n>1993</n> <n>winter4</n> </explicit> <!-- Defaults: if no label is specified at a given point, use the default label. In fact, you can consider this as follows: - draw the default labels - draw the specified labels, overwriting the default one if necessary --> <default> <min> 1990 </min> <max> 1993 </max> <interval> <!-- provide a label every 5 datapoints --> 5 </interval> </default> </labels> </x-axis> <y-axis> <name> Income </name> <labels> <default> <min> 70 </min> <max> 120 </max> <interval> 10 </interval> </default> </labels> <position> left </position> </y-axis> </axes> <!-- combine is the way the datasets are placed together. I imagine "compare", "add" will be possible among others --> <graph combine="compare"> <style> <!-- Use the specified "style" sheet. Format of the url is yet to be specified. --> <config> radarchart1.xml </config> </style> <dataset> <data> <!-- the location of the data. --> <location> data1.xml </location> </data> <!-- A name for the legend --> <name> North </name> <!-- We can remap the axes. Handy for those nifty 3d-graphs This example just gives the defaults. --> <axes> <x-axis>x</x-axis> <y-axis>y</y-axis> </axes> </dataset> <dataset> <data> <location> data2.xml </location> </data> <name> South </name> </dataset> </graph> <!-- The legend. FIXME: work this out --> <legend> <position> south </position> </legend> </gset> </ggroup> </wings> --- NEW FILE: linechart1.xml --- <?xml version="1.0" ?> <!-- add the type to the root element, so the program can decide which interpreter to call to interpret the rest of the sheet It will of course also influence the renderer that is called. --> <chartstyle type="linechart"> <lines> <!-- The first line is for the first dataset in the graph The second line for the second one etc. (you get the picture ;) ) --> <line> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> CC6666 </stroke> <stroke-width> 1 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint --> <shape name="rectangle"> <width>10</width> <height>5</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </line> <line> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> CCCC66 </stroke> <stroke-width> 0.5 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape name="ellipse"> <width>5</width> <height>10</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </line> </lines> </chartstyle> --- NEW FILE: piechart1.xml --- <?xml version="1.0" ?> <!-- add the type to the root element, so the program can decide which interpreter to call to interpret the rest of the sheet It will of course also influence the renderer that is called. --> <chartstyle type="piechart2d"> <pies> <!-- The first line is for the first dataset in the graph The second line for the second one etc. (you get the picture ;) ) --> <pie> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> CC6666 </stroke> <stroke-width> 1 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint --> <shape name="rectangle"> <width>10</width> <height>5</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </pie> <pie> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> CCCC66 </stroke> <stroke-width> 0.5 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape name="ellipse"> <width>5</width> <height>10</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </pie> <pie> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> FF9966 </stroke> <stroke-width> 0.5 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape name="ellipse"> <width>5</width> <height>10</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </pie> <pie> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> FFCC66 </stroke> <stroke-width> 0.5 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape name="ellipse"> <width>5</width> <height>10</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </pie> </pies> </chartstyle> --- NEW FILE: radarchart1.xml --- <?xml version="1.0" ?> <!-- add the type to the root element, so the program can decide which interpreter to call to interpret the rest of the sheet It will of course also influence the renderer that is called. --> <chartstyle type="radarchart"> <radars> <!-- The first line is for the first dataset in the graph The second line for the second one etc. (you get the picture ;) ) --> <radar> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> CC6666 </stroke> <stroke-width> 1 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint --> <shape name="rectangle"> <width>10</width> <height>5</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </radar> <radar> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> CCCC66 </stroke> <stroke-width> 0.5 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape name="ellipse"> <width>5</width> <height>10</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </radar> <radar> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> FF9966 </stroke> <stroke-width> 0.5 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape name="ellipse"> <width>5</width> <height>10</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </radar> <radar> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB) --> <stroke> FFCC66 </stroke> <stroke-width> 0.5 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape name="ellipse"> <width>5</width> <height>10</height> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </radar> </radars> </chartstyle> |
|
From: <nic...@us...> - 2004-02-16 13:55:50
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/examples/charts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7596/charts Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/examples/charts added to the repository |
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/resources/formats In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7546 Added Files: dataformat-proposition.xml dataformat-proposition2.xml graphformat-proposition.xml linechart-proposition.xml Log Message: make whiteboard xml work --- NEW FILE: dataformat-proposition.xml --- <!-- The data --> <data> <!-- v is value (datapoint) --> <v> <!-- y is y-value x is x-value. If one of these is not specified, some default value can be calculated. If, for example, not one x value is specified for the whole dataset, they will be placed on regular intervals. x-values are necessary for defining scatterplots, for example. z-values might also be possible --> <y>80</y> <!-- c stands for "content". This can be used for defining tooltips, for example --> <c>(1990,North) = 80</c> <!-- l stands for "link". Format of the link should be investigated further (I suspect this format is too much html-oriented) --> <l>/1990/North</l> </v> <v> <y>77.6</y> <!-- Emphasize: if it's a pie chart, let this piece jump out. Other charts could provide other emphasizing mechanisms, maybe even dependent on the "style" sheet --> <emphasize /> </v> <v><y>75.7</y></v> <v><y>76.6</y></v> <v><y>76.6</y></v> <v><y>75.6</y></v> <v><y>75.6</y></v> <v><y>75.6</y></v> <v><y>74.6</y></v> <v><y>74.6</y></v> <v><y>74.6</y></v> <v><y>73.6</y></v> <v><y>73.6</y></v> <v><y>73.6</y></v> <v><y>73.6</y></v> <v><y>72.6</y></v> <v><y>72.6</y></v> </data> --- NEW FILE: dataformat-proposition2.xml --- <!-- The data --> <data> <!-- v is value (datapoint) --> <v> <!-- y is y-value x is x-value. If one of these is not specified, some default value can be calculated. If, for example, not one x value is specified for the whole dataset, they will be placed on regular intervals. x-values are necessary for defining scatterplots, for example. z-values might also be possible --> <y>80</y> <!-- c stands for "content". This can be used for defining tooltips, for example --> <c>(1990,North) = 80</c> <!-- l stands for "link". Format of the link should be investigated further (I suspect this format is too much html-oriented) --> <l>/1990/North</l> </v> <v> <y>77.6</y> <!-- Emphasize: if it's a pie chart, let this piece jump out. Other charts could provide other emphasizing mechanisms, maybe even dependent on the "style" sheet --> <emphasize /> </v> <v><y>40.7</y></v> <v><y>76.6</y></v> <v><y>77.6</y></v> <v><y>74.6</y></v> <v><y>74.6</y></v> <v><y>74.6</y></v> <v><y>77.6</y></v> <v><y>77.6</y></v> <v><y>76.6</y></v> <v><y>78.6</y></v> <v><y>70.6</y></v> <v><y>77.6</y></v> <v><y>73.6</y></v> <v><y>74.6</y></v> <v><y>76.6</y></v> </data> --- NEW FILE: graphformat-proposition.xml --- <wings xmlns="http://wings.krysalis.org/2002" country="EN" lang="en"> <ggroup> <gset width="350" height="200"> <title> Wings sample data </title> <axes> <x-axis> <name> Year </name> <labels> <explicit> <n>1990</n> <n>winter1</n> <n>spring1</n> <n>summer1</n> <n>autumn1</n> <n>1991</n> <n>winter2</n> <n>spring2</n> <n>summer2</n> <n>autumn2</n> <n>1992</n> <n>winter3</n> <n>spring3</n> <n>summer3</n> <n>autumn3</n> <n>1993</n> <n>winter4</n> </explicit> <!-- Defaults: if no label is specified at a given point, use the default label. In fact, you can consider this as follows: - draw the default labels - draw the specified labels, overwriting the default one if necessary --> <default> <min> 1990 </min> <max> 1993 </max> <interval> <!-- provide a label every 5 datapoints --> 5 </interval> </default> </labels> </x-axis> <y-axis> <name> Income </name> <labels> <default> <min> 70 </min> <max> 120 </max> <interval> 10 </interval> </default> </labels> <position> left </position> </y-axis> </axes> <!-- combine is the way the datasets are placed together. I imagine "compare", "add" will be possible among others --> <graph combine="compare"> <style> <!-- Use the specified "style" sheet. Format of the url is yet to be specified. --> <config> file:///home/tomk/cvsrep/krysalis-wings/formats/linechart-proposition.xml </config> </style> <dataset> <data> <!-- the location of the data. --> <location> file:///home/tomk/cvsrep/krysalis-wings/formats/dataformat-proposition.xml </location> </data>data> <!-- A name for the legend --> <name> North </name> <!-- We can remap the axes. Handy for those nifty 3d-graphs This example just gives the defaults. --> <axes> <x-axis>x</x-axis> <y-axis>y</y-axis> </axes> </dataset> <dataset> <data> <location> file:///home/tomk/cvsrep/krysalis-wings/formats/dataformat-proposition2.xml </location> </data> <name> South </name> </dataset> </graph> <!-- The legend. FIXME: work this out --> <legend> <position> south </position> </legend> </gset> </ggroup> </wings> --- NEW FILE: linechart-proposition.xml --- <?xml version="1.0" ?> <!-- add the type to the root element, so the program can decide which interpreter to call to interpret the rest of the sheet It will of course also influence the renderer that is called. --> <chartstyle type="linechart"> <lines> <!-- The first line is for the first dataset in the graph The second line for the second one etc. (you get the picture ;) ) --> <line> <!-- The style chapter - These elements are like the SVG style attributes. --> <style> <!-- The color (in RGB - FIXME: is it possible to define colors in RGB format in SVG? --> <stroke> 7575C3 </stroke> <stroke-width> 2 </stroke-width> <!-- etc ... all stroke-* of the SVG spec can be used here --> </style> <!-- attributes for a datapoint --> <point> <normal> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the actual datapoint on the chart. --> <shape> <circle style="fill:blue;stroke:white;" cx="0" cy="0" r="1"/> </shape> </normal> <!-- Which attributes to use for emphasized points --> <emphasized> <!-- shape of the datapoint: An svg shape definition The (0,0) point of this coordinate system will be translated to the datapoint of the chart. --> <shape> <circle style="fill:red;stroke:red;" cx="0" cy="0" r="1"/> </shape> </emphasized> </point> <region> <!-- Define the fill of the region - see also the "style" element for line --> <style> <fill> white </fill> <fillrule> nonzero </fillrule> <!-- etc --> </style> </region> </line> </lines> </chartstyle> |
|
From: <nic...@us...> - 2004-02-16 13:52:41
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/resources/formats In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6837/formats Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/resources/formats added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:51:46
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6679/resources Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/resources added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:51:23
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6643/java Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/java added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:50:42
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6502/examples Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src/examples added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:50:25
|
Update of /cvsroot/jcharts/krysalis-jcharts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6426 Modified Files: build.xml Log Message: use the canonical build dir Index: build.xml =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build.xml 1 Sep 2003 18:15:30 -0000 1.7 --- build.xml 16 Feb 2004 13:42:25 -0000 1.8 *************** *** 25,34 **** <property name="servletExamples.war" value="${servletExamples}.war"/> - <property name="dir.release" value="delete_me/${project.name}-${project.version}"/> - <property name="dir.src" value="src/java"/> ! <property name="dir.build" value="delete_me"/> <property name="dir.javadocs" value="${dir.release}/javadocs"/> <property name="batik.classpath" value="lib/batik-svggen.jar;lib/batik-dom.jar;lib/batik-awt-util.jar"/> --- 25,33 ---- <property name="servletExamples.war" value="${servletExamples}.war"/> <property name="dir.src" value="src/java"/> ! <property name="dir.build" location="./build"/> <property name="dir.javadocs" value="${dir.release}/javadocs"/> + <property name="dir.release" value="${dir.build}/${project.name}-${project.version}"/> <property name="batik.classpath" value="lib/batik-svggen.jar;lib/batik-dom.jar;lib/batik-awt-util.jar"/> |
|
From: <nic...@us...> - 2004-02-16 13:49:08
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6160/src Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/src added to the repository |
|
From: <nic...@us...> - 2004-02-16 13:48:20
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5794 Added Files: avalon-framework.jar cocoon.jar excalibur-pool-1.1.jar excalibur-sourceresolve-20020820.jar jaxen-core.jar jaxen-dom.jar log4j.jar logkit.jar saxpath.jar Log Message: make whiteboard xml work --- NEW FILE: avalon-framework.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cocoon.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: excalibur-pool-1.1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: excalibur-sourceresolve-20020820.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jaxen-core.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jaxen-dom.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: log4j.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logkit.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: saxpath.jar --- (This appears to be a binary file; contents omitted.) |
|
From: <nic...@us...> - 2004-02-16 13:47:22
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/legal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5715 Added Files: LICENSE LICENSE.apache LICENSE.avalon LICENSE.batik LICENSE.commons-logging LICENSE.jakarta-commons LICENSE.jakarta-regexp LICENSE.logkit LICENSE.resolver LICENSE.xalan LICENSE.xerces LICENSE.xml-apis Log Message: make whiteboard xml work --- NEW FILE: LICENSE --- /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 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 end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" and * "Apache POI" must not be used to endorse or promote products * derived from this software without prior written permission. For * written permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache", * "Apache POI", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION 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. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ --- NEW FILE: LICENSE.apache --- /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) @year@ The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 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 end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact ap...@ap.... 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, 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. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <st...@ap...>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ --- NEW FILE: LICENSE.avalon --- /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 2001 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 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 end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon Framework" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact ap...@ap.... 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, 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. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <st...@ap...>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ --- NEW FILE: LICENSE.batik --- ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 2000 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 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 end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Batik" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact ap...@ap.... 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, 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. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. --- NEW FILE: LICENSE.commons-logging --- /* * $Header: /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/legal/LICENSE.commons-logging,v 1.1 2004/02/16 13:39:21 nicolaken Exp $ * $Revision: 1.1 $ * $Date: 2004/02/16 13:39:21 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 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 end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Commons", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION 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. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * */ --- NEW FILE: LICENSE.jakarta-commons --- /* * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 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 end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Commons", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache", * "Velocity" nor may "Apache" appear in their names without prior * written permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION 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. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * */ --- NEW FILE: LICENSE.jakarta-regexp --- /* * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 1999 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 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 end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Jakarta-Regexp", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION 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. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * */ --- NEW FILE: LICENSE.logkit --- /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2001 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 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 end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "LogKit", "Jakarta" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact ap...@ap.... 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, 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. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <st...@ap...>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ --- NEW FILE: LICENSE.resolver --- Software License Agreement SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE XML ENTITY AND URI RESOLVERS, VERSION 1.0 SOFTWARE TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS LICENSE AGREEMENT ("AGREEMENT"). PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY INSTALLING THIS SOFTWARE, YOU ACCEPT THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY ITS TERMS, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE AND THE INSTALLATION PROCESS WILL NOT CONTINUE. 1.0 DEFINITIONS "Licensed Software" means the XML Entity and URI Resolvers, Version 1.0 Software and any other machine readable materials (including, but not limited to, libraries, source files, header files, and data files) and any user manuals, programming guides and other documentation provided to you by Sun under this Agreement. 2.0 LIMITED LICENSE 2.1 Sun grants to you, a non-exclusive, non-transferable, royalty-free and limited license to reproduce, modify, and create derivative works of the Licensed Software for the sole purpose of adding value and improving the Licensed Software for the development of applications ("Programs"). No license is granted to you for any other purpose. 2.2 In addition to the license granted in Section 2.1, Sun grants to you, a non-exclusive, non-transferable, royalty-free and limited license to distribute the Licensed Software modified by you as permitted in Section 2.1 ("Modified Software") in source or binary form, provided that; i) the Modified Software is only distributed bundled as a part of your Programs, ii) the Modified Software improves on and adds value to the Licensed Software, and iii) the Programs are only distributed subject to a license agreement that protects Sun's interests consistent with the terms and conditions contained in this Agreement. 3.0 LICENSE RESTRICTIONS 3.1 You agree to reproduce any copyright and other proprietary right notices on any such copy. 3.2 Except as otherwise provided by Section 2.0, you may not modify or create derivative works of the Licensed Software, or reverse engineer, disassemble or decompile binary portions of the Licensed Software, or otherwise attempt to derive the source code from such portions. 3.3 No right, title, or interest in or to Licensed Software, any trademarks, service marks, or trade names of Sun or Sun's licensors is granted under this Agreement. 4.0 NO SUPPORT Sun is under no obligation to support Licensed Software or to provide you with updates or error corrections (collectively "Software Updates"). If Sun at its sole option, supplies Software Updates to you, the Software Updates will be considered part of Licensed Software, and subject to the terms of this Agreement. 5.0 TERM AND TERMINATION OF AGREEMENT 5.1 You may terminate this Agreement at any time by destroying all copies of Software. 5.2 Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 5.3 This Agreement will terminate immediately without notice from Sun if the you fail to comply with any provision of this Agreement. 5.4 Upon termination or expiration of this Agreement, you shall immediately cease use of and destroy Licensed Software and any copies thereof. 5.5 Rights and obligations under this Agreement which by their nature should survive, will remain in effect after termination or expiration hereof. 6.0 DISCLAIMER OF WARRANTY 6.1 Licensee acknowledges that Licensed Software may contain errors and is not designed or intended for use in the design, construction, operation or maintenance of any nuclear facility ("High Risk Activities"). Sun disclaims any express or implied warranty of fitness for such uses. You represent and warrant to Sun that you will not use, distribute or license the Licensed Software for High Risk Activities. 6.2 LICENSED SOFTWARE IS PROVIDED "AS IS". ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS, AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 7.0 LIMITATION OF LIABILITY 7.1 You acknowledge that the Licensed Software is experimental. You acknowledge that the Licensed Software may have defects or deficiencies which cannot or will not be corrected by Sun. You will hold Sun harmless from any claims based on your use or inability to use the Licensed Software for any purpose, and from any claims that later versions or releases of any Licensed Software furnished to you are incompatible with the Licensed Software provided to you under this Agreement. 7.2 You shall have the sole responsibility to protect adequately and backup your data and/or equipment used in connection with the Licensed Software. You shall not claim against Sun for lost data, re-run time, inaccurate output, work delays or lost profits resulting from your use of the Licensed Software. 7.3 Neither party will be liable for any indirect, punitive, special, incidental or consequential damage in connection with or arising out of this Agreement (including loss of business, revenue, profits, use, data or other economic advantage), however it arises, whether for breach or in tort, even if that party has been previously advised of the possibility of such damage. 8.0 U.S. GOVERNMENT RIGHTS If this Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions). 9.0 GENERAL TERMS 9.1 Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply. 9.2 Licensed Software and technical data delivered under this Agreement are subject to U.S. export control laws and may be subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to you. 9.3 Neither party may assign or otherwise transfer any of its rights or obligations under this Agreement, without the prior written consent of the other party, except that Sun may assign this Agreement to an affiliated company. 9.4 This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party. For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California 94303 Copyright 2001 Sun Microsystems, Inc., All rights reserved. (LFI# 90748/FORMID#011801) --- NEW FILE: LICENSE.xalan --- /* * The Apache Software License, Version 1.1 * * Copyright (c) 1999 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 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 end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Xalan" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION 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. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation and was * originally based on software copyright (c) 1999, Lotus * Development Corporation., http://www.lotus.com. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ --- NEW FILE: LICENSE.xerces --- /* * The Apache Software License, Version 1.1 * * * Copyright (c) 1999 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 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 end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Xerces" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION 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. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation and was * originally based on software copyright (c) 1999, International * Business Machines, Inc., http://www.ibm.com. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ --- NEW FILE: LICENSE.xml-apis --- xml-apis is covered by The Apache Software License, Version 1.1 FIXME: Put license text in here once it is available at http://cvs.apache.org/viewcvs.cgi/xml-commons/ |
|
From: <nic...@us...> - 2004-02-16 13:46:06
|
Update of /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/lib Log Message: Directory /cvsroot/jcharts/krysalis-jcharts/whiteboard/xml/lib added to the repository |
