Changeset 2122 in Sophya for trunk/SophyaPI

Timestamp:

Jul 19, 2002, 5:32:52 PM (23 years ago)

Author:

cmv

Message:

pb int i ds for -> {for(int i...}} cmv 19/7/2002

File:

• trunk/SophyaPI/PI/piaxes.cc (modified) (9 diffs)

trunk/SophyaPI/PI/piaxes.cc

@@ -395 +395 @@
 // *** Calcul des ticks pour un axe logarithmique
 {
- long i;
  if(nticks<=0) nticks = 1;
  //cout<<"BestTicksLog: xmin="<<xmin<<" xmax="<<xmax<<" nticks="<<nticks<<endl;
@@ -424 +423 @@
 
  majticks.resize(0);
- for(i=dmin;i<=dmax;i+=inc) {
+ {for(int i=dmin;i<=dmax;i+=inc) {
    double x = pow(10.,(double)i);
    if(x<xmin || x>xmax) continue;
    majticks.push_back(x);
- }
+ }}
  //cout<<"majticks.size()="<<majticks.size()<<endl;
 
@@ -451 +450 @@
    if(nins>4) nins=4;
    vector<double> tmp;
-   for(i=0;i<=(long)majticks.size();i++) {
+   {for(unsigned int i=0;i<=majticks.size();i++) {
      double xt;
-     if(i<(long)majticks.size()) xt = majticks[i]/10.;
-       else                      xt = majticks[i-1];
+     if(i<majticks.size()) xt = majticks[i]/10.;
+       else                xt = majticks[i-1];
      for(int n=0;n<nins;n++) {
        double xins = seqmaj[nins-1][n]*xt;
@@ -460 +459 @@
        tmp.push_back(xins);
      }
-     if(i<(long)majticks.size()) tmp.push_back(majticks[i]);
-   }
+     if(i<majticks.size()) tmp.push_back(majticks[i]);
+   }}
    majticks = tmp;
  }
@@ -468 +467 @@
  // Les ticks mineurs
  minticks.resize(0);
- for(i=0;i<(long)majticks.size()-1;i++) {
+ {for(unsigned int i=0;i<majticks.size()-1;i++) {
    double dx = (majticks[i+1]-majticks[i])/10.;
    minticks.push_back(majticks[i]);
@@ -476 +475 @@
      minticks.push_back(x);
    }
- }
+ }}
  minticks.push_back(majticks[majticks.size()-1]);
  //cout<<"...minticks.size()="<<minticks.size()<<endl;
@@ -484 +483 @@
    vector<double> tmp = majticks;
    majticks.resize(0); majticks.push_back(0.);
-   for(i=0;i<(long)tmp.size();i++) majticks.push_back(tmp[i]);
+   for(unsigned int i=0;i<tmp.size();i++) majticks.push_back(tmp[i]);
    //cout<<"...xmin="<<xmin<<"<=0. add majticks[0]="<<majticks[0]<<endl;
  }
@@ -670 +669 @@
  string stre;
  if(e) {if(e==label) return; stre=e; *e='\0'; lenl=strlen(label);}
- for(int i=lenl-1;i>=0;i--) {
+ {for(int i=lenl-1;i>=0;i--) {
    if(label[i]=='0') label[i]='\0';
    else if(label[i]=='.') {
@@ -681 +680 @@
    }
    else break;  // Ni un point ni un zero
- }
+ }}
  if(e) {
    if(strlen(label)==1) if(label[0]=='0') return;