[Jrobin-commits] src/org/jrobin/graph ValueFormatter.java,1.1,1.2

[<cob...@us...>]

Update of /cvsroot/jrobin/src/org/jrobin/graph
In directory sc8-pr-cvs1:/tmp/cvs-serv7373/src/org/jrobin/graph

Modified Files:
	ValueFormatter.java 
Log Message:
fixed uniform value scaling

Index: ValueFormatter.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/ValueFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ValueFormatter.java	7 Nov 2003 08:23:19 -0000	1.1
--- ValueFormatter.java	7 Nov 2003 14:42:02 -0000	1.2
***************
*** 110,113 ****
--- 110,116 ----
  	void setScaling( boolean normalScale, boolean uniformScale )
  	{
+ 		if ( !uniformScale ) 
+ 			scaleIndex = NO_SCALE;
+ 		
  		if ( fixedIndex >= 0 ) {
  			scale 		= true;
***************
*** 116,121 ****
  		else {
  			scale = (normalScale || uniformScale);
- 			if ( !uniformScale ) 
- 				scaleIndex = NO_SCALE;
  		}
  	}
--- 119,122 ----
***************
*** 156,162 ****
  	String getScaledValue()
  	{
! 		scaleValue( scaleIndex );
  		long intVal = new Double( scaledValue ).longValue();
  		
  		if ( intVal == scaledValue )
  			return "" + intVal;
--- 157,166 ----
  	String getScaledValue()
  	{
! 		int tsv 	= scaleIndex;
! 		scaleValue( tsv );
  		long intVal = new Double( scaledValue ).longValue();
  		
+ 		scaleIndex	= tsv;
+ 		
  		if ( intVal == scaledValue )
  			return "" + intVal;
***************
*** 219,222 ****
--- 223,227 ----
  						this.prefix 		= PREFIXES[i];
  						this.scaledValue 	= value / scaleValues[i];
+ 						this.scaleIndex		= i;
  						return;
  					}