krysalis-jcharts/src/java/org/krysalis/jcharts/axisChart/axis Axis.java,1.3,1.4

[Chris M. <ki...@us...>]

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

Modified Files:
	Axis.java 
Log Message:
Dual Y axis changes

Index: Axis.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/axisChart/axis/Axis.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Axis.java	27 Aug 2003 04:37:44 -0000	1.3
--- Axis.java	1 Jul 2004 01:30:16 -0000	1.4
***************
*** 74,78 ****
  	private float titleWidth;
  
! 	private float minimumWidthNeeded;
  	private float minimumHeightNeeded;
  
--- 74,80 ----
  	private float titleWidth;
  
! //	private float minimumWidthNeeded;
! 	private float minimumLHSWidthNeeded; // width needed for Left Hand Side axis stuff
! 	private float minimumRHSWidthNeeded; // and the RHS if there
  	private float minimumHeightNeeded;
  
***************
*** 80,90 ****
  	private TextTagGroup axisLabelsGroup;
  
!         // Dual Y axis changes integrated CMC 25Aug03
!         // Variable to use to display the labels of the right Y axis
!         // the corresponding methods are also implemented
!         private TextTagGroup axisLabelsGroupRight;
  
  	//---this number of items to plot on the Axis. Note, if no labels are displayed, axisLabelsGroup will be NULL so we can not depend on that.
  	private int numberOfScaleItems;
  
  	//---pixel location of tick start needed for reference when start drawing charts.
--- 82,91 ----
  	private TextTagGroup axisLabelsGroup;
  
!     // Variable to use to display the labels of the right Y axis
!     private TextTagGroup axisLabelsGroupRight;
  
  	//---this number of items to plot on the Axis. Note, if no labels are displayed, axisLabelsGroup will be NULL so we can not depend on that.
  	private int numberOfScaleItems;
+ 	private int numberOfRightScaleItems;
  
  	//---pixel location of tick start needed for reference when start drawing charts.
***************
*** 99,102 ****
--- 100,104 ----
  
  	private ScaleCalculator scaleCalculator;
+ 	private ScaleCalculator rightScaleCalculator;
  
  
***************
*** 113,116 ****
--- 115,132 ----
  	}
  
+ 	/**************************************************************************************************
+ 	 * Constructor
+ 	 *
+ 	 * @param axisChart
+ 	 * @param numberOfScaleItems
+ 	 * @param numberOfRightScaleItems
+ 	 ***************************************************************************************************/
+ 	public Axis( AxisChart axisChart, int numberOfScaleItems, int numberOfRightScaleItems )
+ 	{
+ 		this.axisChart = axisChart;
+ 		this.numberOfScaleItems= numberOfScaleItems;
+ 		this.numberOfRightScaleItems= numberOfRightScaleItems;
+ 	}
+ 
  
  	/**************************************************************************************************
***************
*** 130,133 ****
--- 146,154 ----
  	}
  
+ 	public int getNumberOfRightScaleItems()
+ 	{
+ 		return numberOfRightScaleItems;
+ 	}
+ 
  
  	public TextTagGroup getAxisLabelsGroup()
***************
*** 143,148 ****
  
  
!         // Dual Y axis changes integrated CMC 25Aug03
!         public TextTagGroup getAxisLabelsGroupRight()
  	{
  		return axisLabelsGroupRight;
--- 164,168 ----
  
  
! 	public TextTagGroup getAxisLabelsGroupRight()
  	{
  		return axisLabelsGroupRight;
***************
*** 189,192 ****
--- 209,213 ----
  	}
  
+ /*
  
  	public final float getMinimumWidthNeeded()
***************
*** 195,202 ****
  	}
  
- 
  	public final void setMinimumWidthNeeded( float minimumWidthNeeded )
  	{
  		this.minimumWidthNeeded = minimumWidthNeeded;
  	}
  
--- 216,244 ----
  	}
  
  	public final void setMinimumWidthNeeded( float minimumWidthNeeded )
  	{
  		this.minimumWidthNeeded = minimumWidthNeeded;
+     }
+ */
+ 	public final float getMinimumLHSWidthNeeded()
+ 	{
+ 		return this.minimumLHSWidthNeeded;
+ 	}
+ 
+ 
+ 	public final void setMinimumLHSWidthNeeded( float minimumWidthNeeded )
+ 	{
+ 		this.minimumLHSWidthNeeded = minimumWidthNeeded;
+ 	}
+ 
+ 	public final float getMinimumRHSWidthNeeded()
+ 	{
+ 		return this.minimumRHSWidthNeeded;
+ 	}
+ 
+ 
+ 	public final void setMinimumRHSWidthNeeded( float minimumWidthNeeded )
+ 	{
+ 		this.minimumRHSWidthNeeded = minimumWidthNeeded;
  	}
  
***************
*** 243,246 ****
--- 285,293 ----
  	}
  
+ 	public ScaleCalculator getRightScaleCalculator()
+ 	{
+ 		return rightScaleCalculator;
+ 	}
+ 
  
  	public void setScaleCalculator( ScaleCalculator scaleCalculator )
***************
*** 249,252 ****
--- 296,304 ----
  	}
  
+ 	public void setRightScaleCalculator( ScaleCalculator scaleCalculator )
+ 	{
+ 		this.rightScaleCalculator = scaleCalculator;
+ 	}
+ 
  
  	/*********************************************************************************************