krysalis-jcharts/src/java/org/krysalis/jcharts/chartData AxisChartDataSet.java,1.3,1.4 ScatterPlotDataSet.java,1.3,1.4 StockChartDataSet.java,1.2,1.3

Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/chartData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22151/src/java/org/krysalis/jcharts/chartData

Modified Files:
	AxisChartDataSet.java ScatterPlotDataSet.java 
	StockChartDataSet.java 
Log Message:
Final fixes for truely independant dual Y axis

Index: StockChartDataSet.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/chartData/StockChartDataSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StockChartDataSet.java	1 Jul 2004 02:05:47 -0000	1.2
--- StockChartDataSet.java	21 Sep 2004 03:49:50 -0000	1.3
***************
*** 66,70 ****
  	private Paint[] paints;
  	private StockChartProperties stockChartProperties;
- 	private boolean plotAgainstRHS = false;
  
  
--- 66,69 ----
***************
*** 348,354 ****
  	 * @see ChartType
  	 *******************************************************************************************/
! 	public final boolean getPlotAgainstRHS()
  	{
! 		return this.plotAgainstRHS;
  	}
  
--- 347,353 ----
  	 * @see ChartType
  	 *******************************************************************************************/
! 	public final boolean isPlottedAgainstRHS()
  	{
! 		return this.chartType.isPlottedAgainstRHS();
  	}
  

Index: AxisChartDataSet.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/chartData/AxisChartDataSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AxisChartDataSet.java	1 Jul 2004 02:04:12 -0000	1.3
--- AxisChartDataSet.java	21 Sep 2004 03:49:50 -0000	1.4
***************
*** 53,57 ****
  {
  	private ChartType chartType;
- 	private boolean plotAgainstRHS = false;
  
  
--- 53,56 ----
***************
*** 78,106 ****
  	}
  
- 
- 	/******************************************************************************************
- 	 * Constructor
- 	 *
- 	 * @param data the data sets to be displayed in the chart.
- 	 * @param plotAgainstRHS whether to plot the data set against the right hand Y Axis
- 	 * @param legendLabels if this is: NULL there will be no Legend. Otherwise, there must be an
- 	 *           one to one mapping of labels to data sets.
- 	 * @param paints paints to use for the data sets. There must be an one to one mapping of
- 	 *           labels to data sets.
- 	 * @param chartType constant defining how this data should be rendered
- 	 * @param chartTypeProperties properties Object specific to the type of chart you are rendering.
- 	 * @throws ChartDataException if data is not in correct form.
- 	 *******************************************************************************************/
- 	public AxisChartDataSet( double[][] data, boolean plotAgainstRHS, 
- 									 String[] legendLabels,
- 									 Paint[] paints,
- 									 ChartType chartType,
- 									 ChartTypeProperties chartTypeProperties ) throws ChartDataException
- 	{
- 		super( data, legendLabels, paints, chartTypeProperties );
- 		this.chartType=chartType;
- 		this.plotAgainstRHS = plotAgainstRHS;
- 	}
- 
  	/************************************************************************************************
  	 * Performs a limited validation of data. This is static and not called by the rendering engine
--- 77,80 ----
***************
*** 157,163 ****
  	 * @see ChartType
  	 *******************************************************************************************/
! 	public final boolean getPlotAgainstRHS()
  	{
! 		return this.plotAgainstRHS;
  	}
  
--- 131,137 ----
  	 * @see ChartType
  	 *******************************************************************************************/
! 	public final boolean isPlottedAgainstRHS()
  	{
! 		return this.chartType.isPlottedAgainstRHS();
  	}
  

Index: ScatterPlotDataSet.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/chartData/ScatterPlotDataSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScatterPlotDataSet.java	1 Jul 2004 02:05:47 -0000	1.3
--- ScatterPlotDataSet.java	21 Sep 2004 03:49:50 -0000	1.4
***************
*** 64,68 ****
  
  	private int numDataItems= -1;
- 	private boolean plotAgainstRHS = false;
  
  
--- 64,67 ----
***************
*** 248,258 ****
  	/******************************************************************************************
  	 * Returns whether the data set should be plotted against the right hand Y axis
  	 *
! 	 * @return plotAgainstRHS
  	 * @see ChartType
  	 *******************************************************************************************/
! 	public final boolean getPlotAgainstRHS()
  	{
! 		return this.plotAgainstRHS;
  	}
  
--- 247,258 ----
  	/******************************************************************************************
  	 * Returns whether the data set should be plotted against the right hand Y axis
+ 	 * Always false as ChartType hardcoded to SCATTER_PLOT
  	 *
! 	 * @return false
  	 * @see ChartType
  	 *******************************************************************************************/
! 	public final boolean isPlottedAgainstRHS()
  	{
! 		return false;
  	}
  



-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php