Changeset 1922 in Sophya for trunk/SophyaPI

Timestamp:

Mar 6, 2002, 6:17:09 PM (24 years ago)

Author:

ansari

Message:

suite implementation DecodeOptionString - Reza 06/03/2002

Location:

trunk/SophyaPI/PI

Files:

• pieldrw.cc (modified) (1 diff)
• piimage.cc (modified) (1 diff)
• piscdrawwdg.cc (modified) (1 diff)

trunk/SophyaPI/PI/pieldrw.cc

@@ -103 +103 @@
       continue;      
     }
-    if (opts == "axelabelautofontsize") {
+    if (opts == "autofontsize") {
       SetAxesAutoFontSize(true);
       continue;      
     }
-    if (opts == "axelabelfixedfontsize") {
+    if (opts == "fixedfontsize") {
       SetAxesAutoFontSize(false);
       continue;      

trunk/SophyaPI/PI/piimage.cc

@@ -535 +535 @@
     // Position du centre d'image
     if (opts.substr(0,12) == "imagecenter=") {
-      int xc,yc;
+      int xc = XPave();  
+      int yc = YPave();
       sscanf(opts.substr(12).c_str(),"%d,%d",&xc, &yc);
       SetPave(xc, yc, false, true);
+      continue;
+    }
+    // lut lineaire
+    if (opts.substr(0,4) == "lut=") {
+      double min = Lut()->Min();
+      double max = Lut()->Max();
+      size_t q = opts.find(',');
+      if (q < opts.length()-1)
+        sscanf(opts.substr(q+1).c_str(),"%lg,%lg",&min, &max);
+      int typlut=kLutType_Lin;      ;
+      if (opts.substr(4,3) == "lin")  typlut=kLutType_Lin;
+      else if (opts.substr(4,3) == "log")  typlut=kLutType_Log;
+      else if (opts.substr(4,4) == "sqrt")  typlut=kLutType_Sqrt;
+      else if (opts.substr(4,6) == "square")  typlut=kLutType_Square;
+      SetLut(min, max, typlut, 0, false);
       continue;
     }

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -203 +203 @@
 PIScDrawWdg::DecodeOptionString(vector<string> & opt, bool rmdecopt)
 {
-  // AFAIRE - Reza 01/03/2002 
-  return(0);
+  if (opt.size() == 0)  return(0);  
+  int ndec1 = BaseDrawer()->DecodeOptionString(opt, rmdecopt);
+  vector<string> udopt;
+  unsigned int k = 0;
+  int ndec = opt.size();
+  bool fglinlog = false;
+  bool fglogx = isLogScaleX();
+  bool fglogy = isLogScaleY();
+
+  for( k=0; k<opt.size(); k++ ) {
+    string opts = opt[k];
+    // Limites en x,y
+    if (opts.substr(0,9) == "xylimits=") {
+      double xmin = XMin();
+      double ymin = YMin();
+      double xmax = XMax();
+      double ymax = YMax();
+      sscanf(opts.substr(9).c_str(),"%lg,%lg,%lg,%lg",&xmin, &xmax,&ymin,&ymax);
+      SetLimits(xmin, xmax, ymin, ymax);
+      continue;
+    }
+    if (opts == "linx") {
+      fglinlog = true;  fglogx = false;
+      continue;
+    }
+    if (opts == "logx") {
+      fglinlog = true;  fglogx = true;
+      continue;
+    }
+    if (opts == "liny") {
+      fglinlog = true;  fglogy = false;
+      continue;
+    }
+    if (opts == "logy") {
+      fglinlog = true;  fglogy = true;
+      continue;
+    }
+
+    ndec--;
+    if (rmdecopt)  udopt.push_back(opts);
+  }  
+
+  if (fglinlog) SetLogScale(fglogx, fglogy);
+
+  if (rmdecopt)  opt = udopt;
+  return(ndec+ndec1);
 }