thplot-cvs

[Tony P. <ap...@us...>]

Update of /cvsroot/thplot/thplot/src/Util
In directory usw-pr-cvs1:/tmp/cvs-serv4831/src/Util

Modified Files:
	Autoscale.cpp 
Log Message:
Removed couts


Index: Autoscale.cpp
===================================================================
RCS file: /cvsroot/thplot/thplot/src/Util/Autoscale.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Autoscale.cpp	25 Jun 2002 11:16:38 -0000	1.3
--- Autoscale.cpp	3 Jul 2002 16:13:59 -0000	1.4
***************
*** 66,70 ****
      int asmag,iMax,iMin,iRange,rem,rcorr;
      int magnitude = int( log10(dataMax) );
!     cout << "Max: " << dataMax << " Min: " << dataMin << " Ndiv: " << Ndiv << endl;
      //cout << "Magnitude of min: " << magnitude << endl;
      if( magnitude < 0 ) {
--- 66,70 ----
      int asmag,iMax,iMin,iRange,rem,rcorr;
      int magnitude = int( log10(dataMax) );
!     //cout << "Max: " << dataMax << " Min: " << dataMin << " Ndiv: " << Ndiv << endl;
      //cout << "Magnitude of min: " << magnitude << endl;
      if( magnitude < 0 ) {
***************
*** 93,97 ****
      asmin = iMin*pow(10,-1*asmag);
      asdelta = (asmax - asmin) / Ndiv;
!     cout << "ASMax: " << asmax << " ASMin: " << asmin <<  " ASDelta: " << asdelta << endl;
      needCalc = false;
  }
--- 93,97 ----
      asmin = iMin*pow(10,-1*asmag);
      asdelta = (asmax - asmin) / Ndiv;
!     //cout << "ASMax: " << asmax << " ASMin: " << asmin <<  " ASDelta: " << asdelta << endl;
      needCalc = false;
  }
***************
*** 101,105 ****
      int asmag,iDelta,iMin,iMax,magnitude;
      int tmpMax, tmpMin, tmpMin2, tmpMin5;
!     cout << "Max: " << dataMax << " Min: " << dataMin << " Ndiv: " << Ndiv << endl;
      if( dataMax-dataMin == 0 ) {
        asdelta=0.1;
--- 101,105 ----
      int asmag,iDelta,iMin,iMax,magnitude;
      int tmpMax, tmpMin, tmpMin2, tmpMin5;
!     //cout << "Max: " << dataMax << " Min: " << dataMin << " Ndiv: " << Ndiv << endl;
      if( dataMax-dataMin == 0 ) {
        asdelta=0.1;
***************
*** 121,128 ****
        tmpMin5=makeMultipleOf(iMin,5,false);
        tmpMin2=makeMultipleOf(iMin,2,false);
!       tmpMax;
!       //if ( dataMin == 0 ) magnitude=0;
!       //else magnitude = int( log10(fabs(dataMin)) )-1;
!       magnitude=0;
        int i=0;   
        while( i < 10 ) {
--- 121,125 ----
        tmpMin5=makeMultipleOf(iMin,5,false);
        tmpMin2=makeMultipleOf(iMin,2,false);
!       magnitude=iDelta=tmpMax=0;
        int i=0;   
        while( i < 10 ) {
***************
*** 150,155 ****
          i++;
        }
!       cout << "Corrected iMax: " << iMax << "  iMin: " << iMin << endl;
!       cout << "tmpMax: " << tmpMax << endl;
        i=1;
        while(1) {
--- 147,152 ----
          i++;
        }
!       //cout << "Corrected iMax: " << iMax << "  iMin: " << iMin << endl;
!       //cout << "tmpMax: " << tmpMax << endl;
        i=1;
        while(1) {
***************
*** 157,161 ****
          if( tmpMax-(iMin-tmpMin) > iMax && i < 10 ) {
            tmpMax=tmpMax-(iMin-tmpMin);
-           
            iMin=tmpMin;
          } else {  
--- 154,157 ----
***************
*** 165,173 ****
          i++;
        }    
!       cout << "Corrected iMax: " << iMax << "  iMin: " << iMin << endl;
        asmax = iMax*pow(10,-1*asmag);
        asmin = iMin*pow(10,-1*asmag);
        asdelta = iDelta*pow(10,-1*asmag);
!       cout << "ASMax: " << asmax << " ASMin: " << asmin <<  " ASDelta: " << asdelta << endl;
        needCalc = false;
     }   
--- 161,169 ----
          i++;
        }    
!       //cout << "Corrected iMax: " << iMax << "  iMin: " << iMin << endl;
        asmax = iMax*pow(10,-1*asmag);
        asmin = iMin*pow(10,-1*asmag);
        asdelta = iDelta*pow(10,-1*asmag);
!       //cout << "ASMax: " << asmax << " ASMin: " << asmin <<  " ASDelta: " << asdelta << endl;
        needCalc = false;
     }