[Jfreechart-commit] jfreechart/source/org/jfree/chart/block ACIUtilities.java,1.3,1.4

[David G. <mu...@us...>]

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23102/source/org/jfree/chart/block

Modified Files:
	ACIUtilities.java 
Log Message:
28-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/block/ACIUtilities.java
	(superscriptScaleFactor): new field,
	(subscriptScaleFactor): new field,
	(superscriptOffset): new field,
	(subscriptOffset): new field,
	(getSuperscriptScaleFactor): new method,
	(setSuperscriptScaleFactor): new method,
	(getSubscriptScaleFactor): new method,
	(setSubscriptScaleFactor): new method,
	(getSuperscriptOffset): new method,
	(setSuperscriptOffset): new method,
	(getSubscriptOffset): new method,
	(setSubscriptOffset): new method.



Index: ACIUtilities.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/block/ACIUtilities.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ACIUtilities.java	28 Oct 2005 13:36:13 -0000	1.3
--- ACIUtilities.java	28 Oct 2005 14:07:35 -0000	1.4
***************
*** 69,72 ****
--- 69,84 ----
  public class ACIUtilities {
  
+     /** The scale factor for deriving a superscript font. */
+     private static double superscriptScaleFactor = 0.666;
+     
+     /** The scale factor for deriving a subscript font. */
+     private static double subscriptScaleFactor = 0.666;
+     
+     /** The superscript offset. */
+     private static float superscriptOffset = 0.25f;
+     
+     /** The subscript offset. */
+     private static float subscriptOffset = 0.20f;
+     
      /**
       * Private constructor prevents object creation.
***************
*** 76,79 ****
--- 88,179 ----
  
      /**
+      * Returns the scale factor for deriving a superscript font.
+      * 
+      * @return The scale factor for deriving a superscript font.
+      * 
+      * @see #createTextLine(AttributedCharacterIterator, Font, Paint)
+      */
+     public static double getSuperscriptScaleFactor() {
+         return superscriptScaleFactor;
+     }
+     
+     /**
+      * Sets the scale factor for deriving a superscript font.
+      * 
+      * @param scale  the scale factor for deriving a superscript font.
+      * 
+      * @see #createTextLine(AttributedCharacterIterator, Font, Paint)
+      */
+     public static void setSuperscriptScaleFactor(double scale) {
+         superscriptScaleFactor = scale;
+     }
+     
+     /**
+      * Returns the scale factor for deriving a subscript font.
+      * 
+      * @return The scale factor for deriving a subscript font.
+      * 
+      * @see #createTextLine(AttributedCharacterIterator, Font, Paint)
+      */
+     public static double getSubscriptScaleFactor() {
+         return subscriptScaleFactor;
+     }
+     
+     /**
+      * Sets the scale factor for deriving a subscript font.
+      * 
+      * @param scale  the scale factor for deriving a subscript font.
+      * 
+      * @see #createTextLine(AttributedCharacterIterator, Font, Paint)
+      */
+     public static void setSubscriptScaleFactor(double scale) {
+         subscriptScaleFactor = scale;
+     }
+     
+     /**
+      * Returns the superscript offset.  The default value is 0.25f.
+      * 
+      * @return The superscript offset.
+      * 
+      * @see #createTextLine(AttributedCharacterIterator, Font, Paint)
+      */
+     public static float getSuperscriptOffset() {
+         return superscriptOffset;
+     }
+     
+     /**
+      * Sets the superscript offset as a fraction of the font ascent.
+      * 
+      * @param offset  the offset.
+      * 
+      * @see #createTextLine(AttributedCharacterIterator, Font, Paint)
+      */
+     public static void setSuperscriptOffset(float offset) {
+         superscriptOffset = offset;
+     }
+     
+     /**
+      * Returns the subscript offset.  The default value is 0.20f.
+      * 
+      * @return The subscript offset.
+      * 
+      * @see #createTextLine(AttributedCharacterIterator, Font, Paint)
+      */
+     public static float getSubscriptOffset() {
+         return subscriptOffset;
+     }
+     
+     /**
+      * Sets the subscript offset as a fraction of the font ascent.
+      * 
+      * @param offset  the offset.
+      * 
+      * @see #createTextLine(AttributedCharacterIterator, Font, Paint)
+      */
+     public static void setSubscriptOffset(float offset) {
+         subscriptOffset = offset;
+     }
+         
+     /**
       * Returns the bounds for the specified text.
       * 
***************
*** 644,655 ****
              float offset = -(ascent * superscript.floatValue());
              if (superscript.intValue() > 0) {
!                 font = font.deriveFont(AffineTransform.getScaleInstance(0.666, 
!                         0.666));   
!                 offset = offset * 0.25f;
              }
              else if (superscript.intValue() < 0) {
!                 font = font.deriveFont(AffineTransform.getScaleInstance(0.666, 
!                         0.666));   
!                 offset = offset * 0.20f;                
              }
              result.addFragment(new TextFragment(sb.toString(), font, paint, 
--- 744,755 ----
              float offset = -(ascent * superscript.floatValue());
              if (superscript.intValue() > 0) {
!                 font = font.deriveFont(AffineTransform.getScaleInstance(
!                         superscriptScaleFactor, superscriptScaleFactor));   
!                 offset = offset * superscriptOffset;
              }
              else if (superscript.intValue() < 0) {
!                 font = font.deriveFont(AffineTransform.getScaleInstance(
!                         subscriptScaleFactor, subscriptScaleFactor));   
!                 offset = offset * subscriptOffset;                
              }
              result.addFragment(new TextFragment(sb.toString(), font, paint,