Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/axisChart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21917/src/java/org/krysalis/jcharts/axisChart
Modified Files:
AxisChart.java LineChart.java
Log Message:
Final fixes for truely independant dual Y axis
Index: LineChart.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/axisChart/LineChart.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LineChart.java 1 Jul 2004 01:26:20 -0000 1.4
--- LineChart.java 21 Sep 2004 03:48:07 -0000 1.5
***************
*** 70,74 ****
float minRHSValue = 0;
float minLHSValue = 0;
! if (iAxisChartDataSet.getPlotAgainstRHS() == true) {
float maxLHSValue = (float)axisChart.getYAxis().getScaleCalculator().getMaxValue();
float maxRHSValue = (float)axisChart.getYAxis().getRightScaleCalculator().getMaxValue();
--- 70,74 ----
float minRHSValue = 0;
float minLHSValue = 0;
! if (iAxisChartDataSet.isPlottedAgainstRHS()) {
float maxLHSValue = (float)axisChart.getYAxis().getScaleCalculator().getMaxValue();
float maxRHSValue = (float)axisChart.getYAxis().getRightScaleCalculator().getMaxValue();
Index: AxisChart.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/axisChart/AxisChart.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AxisChart.java 13 Aug 2004 01:47:01 -0000 1.11
--- AxisChart.java 21 Sep 2004 03:48:07 -0000 1.12
***************
*** 534,537 ****
--- 534,544 ----
StackedAreaChart.render( this, ( IAxisChartDataSet ) iAxisPlotDataSet );
}
+ if ( this.axisProperties.getRightYAxisProperties().getShowAxis() ) {
+ iAxisPlotDataSet = this.iAxisDataSeries.getIAxisPlotDataSet( ChartType.AREA_STACKED_RHS );
+ if( iAxisPlotDataSet != null )
+ {
+ StackedAreaChart.render( this, ( IAxisChartDataSet ) iAxisPlotDataSet );
+ }
+ }
iAxisPlotDataSet = this.iAxisDataSeries.getIAxisPlotDataSet( ChartType.AREA );
if( iAxisPlotDataSet != null )
***************
*** 576,579 ****
--- 583,591 ----
LineChart.render( this, ( IAxisChartDataSet ) iAxisPlotDataSet );
}
+ iAxisPlotDataSet = this.iAxisDataSeries.getIAxisPlotDataSet( ChartType.LINE_RHS );
+ if( iAxisPlotDataSet != null )
+ {
+ LineChart.render( this, ( IAxisChartDataSet ) iAxisPlotDataSet );
+ }
iAxisPlotDataSet = this.iAxisDataSeries.getIAxisPlotDataSet( ChartType.POINT );
|