Changeset 2119 in Sophya for trunk/SophyaPI

Timestamp:

Jul 19, 2002, 1:37:30 AM (23 years ago)

Author:

ansari

Message:

Amelioration/debud decodage options ds pieldrw.cc piimage.cc , dbg prise en change de l'option AxeLog lors de UpdateLimit par PIScDrawWdg, MAJ numero de version - Reza 18/7/2002

Location:

trunk/SophyaPI/PI

Files:

• piaxes.cc (modified) (2 diffs)
• picons.cc (modified) (1 diff)
• pieldrw.cc (modified) (3 diffs)
• piimage.cc (modified) (2 diffs)
• piscdrawwdg.cc (modified) (1 diff)
• piversion.h (modified) (1 diff)

trunk/SophyaPI/PI/piaxes.cc

@@ -319 +319 @@
 {
  if(garde<0. || garde>=1.) garde = 0.025;
- cout<<"ReSizeMinMax[log="<<axelog<<",garde="<<garde<<"] vmin="<<vmin<<" vmax="<<vmax<<endl;
+ // cout<<"ReSizeMinMax[log="<<axelog<<",garde="<<garde<<"] vmin="<<vmin<<" vmax="<<vmax<<endl;
  // Cas d'une echelle lineaire
  if(!axelog || vmax<=0.) {
@@ -342 +342 @@
  }
 
- cout<<"           vmin="<<vmin<<" vmax="<<vmax<<endl;
+ // cout<<"           vmin="<<vmin<<" vmax="<<vmax<<endl;
 }
 

trunk/SophyaPI/PI/picons.cc

@@ -930 +930 @@
       mCPBuffer[k] = mText[mLPo[j]+i]; k++; 
       }
-    mCPBuffer[k] = '\n'; k++;
+    if (j<mCPendL-1) mCPBuffer[k] = '\n'; k++;
     }
   mCPBuffer[l] = '\0';

trunk/SophyaPI/PI/pieldrw.cc

@@ -77 +77 @@
 int PIElDrawer::DecodeOptionString(vector<string> & opt, bool rmdecopt)
 {
-  if (opt.size() < 1)  return(0);  
+  int nopt0 = opt.size();
+  if (nopt0 < 1)  return(0);  
   int ndec1 = PIDrawer::DecodeOptionString(opt, rmdecopt);
-  if ((opt.size() - ndec1) < 1) return(ndec1);  // si tout a ete decode
+  if ((nopt0 - ndec1) < 1) return(ndec1);  // si tout a ete decode
   vector<string> udopt;
   unsigned int k = 0;
@@ -87 +88 @@
     if ( (opts == "stdaxes") || (opts == "defaxes") || (opts == "boxaxes") )
       SetAxesFlags(kBoxAxes | kExtTicks | kLabels);
-    else if (opts == "simpleaxes")
-      SetAxesFlags(kAxesDflt);
-    else if (opts == "finesimpleaxes")
-      SetAxesFlags(kAxesDflt | kMinTicks);
     else if (opts == "boxaxesgrid")
       SetAxesFlags(kBoxAxes | kExtTicks | kLabels | kGridOn);
@@ -97 +94 @@
     else if ((opts == "grid") || (opts == "fineaxesgrid"))
       SetAxesFlags(kBoxAxes | kTicks | kLabels | kMinTicks | kMajTicks | kGridOn);
-    else if (opts == "simpleaxesgrid")
-      SetAxesFlags(kAxesDflt | kGridOn);
-    else if (opts == "finesimpleaxesgrid")
-      SetAxesFlags(kAxesDflt | kMinTicks | kGridOn);
+    else if (opts == "centeredaxes")
+      SetAxesFlags(kStdAxes | kMajTicks | kLabels);
+    else if (opts == "finecenteredaxes")
+      SetAxesFlags(kStdAxes | kMajTicks | kMinTicks | kLabels);
+    else if (opts == "centeredaxesgrid")
+      SetAxesFlags(kStdAxes | kMajTicks | kLabels | kGridOn);
+    else if (opts == "finecenteredaxesgrid")
+      SetAxesFlags(kStdAxes | kMajTicks | kMinTicks | kLabels | kGridOn);
     else if (opts == "autofontsize")
       SetAxesAutoFontSize(true);

trunk/SophyaPI/PI/piimage.cc

@@ -527 +527 @@
     bool fgcmap = false;
     for(int kcc=0; kcc<PIColorMap::NumberStandardColorMaps(); kcc++) {
-      if (opts == PIColorMap::GetStandardColorMapName(kcc)) {
+      string colname = PIColorMap::GetStandardColorMapName(kcc);
+      for(unsigned int jll=0; jll<colname.length(); jll++)
+        colname[jll] = tolower(colname[jll]);
+      if (opts == colname) {
         SetColMapId(PIColorMap::GetStandardColorMapId(kcc), false);
         fgcmap = true;
@@ -649 +652 @@
 void PIImage::Resize()
 {
-// printf("PIImage::Resize\n");
+//printf("PIImage::Resize\n");
 // On bascule sur la fenetre transient pour l'affichage des valeurs si fenetre trop petite
 if ((XSize() < 300) || (YSize() < 150) ) atrtw = true;  

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -299 +299 @@
   if (d == NULL)  return(-1);
   if (! LimitsFixed() ) {  //  On met a jour les limites 
+    // Le calcul de limites peut dependre du flag AxeLog Yes/No
+    // pour le calcul de la marge de garde en particulier. On met 
+    // donc les flags AxeLog a jour avant UpdateLimits() Reza+CMV 07/2002
+    d->SetLogScale(isDefaultDrawerLogScaleX(), isDefaultDrawerLogScaleY());
     d->UpdateLimits();
     SetLimits(d->XMin(), d->XMax(), d->YMin(), d->YMax(), mDXdir, mDYdir);

trunk/SophyaPI/PI/piversion.h

@@ -2 +2 @@
 #define PIVERSION_H_SEEN
 
-#define PI_VERSIONNUMBER  3.70
+#define PI_VERSIONNUMBER  3.75
 
 #endif