Changeset 4071 in Sophya for trunk/SophyaPI/PIext/pintuple.cc

Timestamp:

May 9, 2012, 11:36:04 PM (13 years ago)

Author:

ansari

Message:

Trace en coordonnees polaires (2D avec barres d'erreur) classe PINTuple

et introduction des attributs graphiques polarplot, polaraxes ...

Reza, 9 Mai 2012

File:

• trunk/SophyaPI/PIext/pintuple.cc (modified) (11 diffs)

trunk/SophyaPI/PIext/pintuple.cc

@@ -60 +60 @@
   SelectColorByName(NULL);
   SelectColorByIndex(NULL);
+  SelectPolar(NULL,NULL);
   SetName("NTupleDrw");
-  NptDraw = 0;
-
+  NptDraw=0;
+  polarPlot=false;
 }
 
@@ -85 +86 @@
 // void  SelectLabel(const char* plabel=NULL)
 //      Choix du nom de colonne correspondant à l'étiquette.
+// void  SelectPolar(const char* pradius, const char* pangle, double angconv=1., double angoffser=0.)
+//      Choix des noms de colonnes rayon/angle pour un trace en coordonnees polaires
 //--
 
@@ -96 +99 @@
 if (py == NULL) yK = -1;
 else { name = py; yK = mNT->ColumnIndex(name); }
+polarPlot=false;
 }
 
@@ -143 +147 @@
 }
 
+/* --Methode-- */
+void  PINTuple::SelectPolar(const char* pangle, const char* pradius, double angconv, double angoff)
+{
+string name;
+if (mNT == NULL)  xK = yK = -1;
+if (pangle == NULL) xK = -1;
+else { name = pangle; xK = mNT->ColumnIndex(name); }
+if (pradius == NULL) yK = -1;
+else { name = pradius; yK = mNT->ColumnIndex(name); }
+polarPlot=true;
+angConvFactor=angconv;
+angOffset=angoff;
+}
 
 /* --Methode-- */
@@ -153 +170 @@
   // Commencer par trouver nos limites
   double xmin, xmax, ymin, ymax;
-  xmin = ymin = 9.e19;
-  xmax = ymax = -9.e19;
-  mNT->GetMinMax(xK, xmin, xmax);
-  mNT->GetMinMax(yK, ymin, ymax);
-  PIAxes::ReSizeMinMax(isLogScaleX(),xmin,xmax);
-  PIAxes::ReSizeMinMax(isLogScaleY(),ymin,ymax);
+  if (polarPlot) {
+    double rmin,rmax;
+    mNT->GetMinMax(yK, rmin, rmax);
+    if (rmax<=0.)  rmax=1.;
+    xmin=ymin=-rmax;
+    xmax=ymax=rmax; 
+  }
+  else {
+    xmin = ymin = 9.e19;
+    xmax = ymax = -9.e19;
+    mNT->GetMinMax(xK, xmin, xmax);
+    mNT->GetMinMax(yK, ymin, ymax);
+    PIAxes::ReSizeMinMax(isLogScaleX(),xmin,xmax);
+    PIAxes::ReSizeMinMax(isLogScaleY(),ymin,ymax);
+  }
   SetLimits(xmin,xmax,ymin,ymax);
 //  SetAxesFlags(kBoxAxes | kExtTicks | kLabels);  Ne pas faire - Reza 11/99
@@ -169 +195 @@
 {
 double xp,yp,xer,yer,wp;
+double ray,ang;
 double xl,yl;
 long nok;
@@ -228 +255 @@
 for (long i=0; i<(long)mNT->NbLines(); i++) {
   xl = xp;  yl = yp; fgoklastpt = fgokcurpt;
-
-  xp = mNT->GetCell(i, xK);
-  yp = mNT->GetCell(i, yK);
-
+  if (polarPlot) {
+    ang = mNT->GetCell(i, xK)*angConvFactor+angOffset;
+    ray = mNT->GetCell(i, yK);
+    xp=cos(ang)*ray;
+    yp=sin(ang)*ray;
+  }
+  else {
+    xp = mNT->GetCell(i, xK);
+    yp = mNT->GetCell(i, yK);
+  }
   // Comptage du nombre de pts dans la zone graphique du widget
   if ( !((xp < xmin2) || (xp > xmax2) || (yp < ymin2) || (yp > ymax2)) )  nok++;
@@ -287 +320 @@
   if (xebK >= 0) {
     xer = mNT->GetCell(i, xebK);
-    if(xer>0.) g->DrawLine(xp-xer, yp, xp+xer, yp);
+    if(xer>0.) { 
+      if (polarPlot) {
+        g->DrawLine(xp,yp,ray*cos(ang-yer*angConvFactor),ray*sin(ang-yer*angConvFactor));
+        g->DrawLine(xp,yp,ray*cos(ang+yer*angConvFactor),ray*sin(ang+yer*angConvFactor));
+      }
+      else g->DrawLine(xp-xer, yp, xp+xer, yp);
+    }
   }
   if (yebK >= 0) {
     yer = mNT->GetCell(i, yebK);
-    if(yer>0.) g->DrawLine(xp, yp-yer, xp, yp+yer);
+    if(yer>0.) { 
+      if (polarPlot) {
+        double ray1=ray-xer;  if (ray1<0.) ray1=0.;
+        double ray2=ray+xer;  if (ray2<0.) ray2=0.;
+        g->DrawLine(ray1*cos(ang), ray1*sin(ang), ray2*cos(ang), ray2*sin(ang));
+      }
+      else g->DrawLine(xp, yp-yer, xp, yp+yer);
+    }
   }
 
@@ -418 +464 @@
       UseSizeScale(true, nbn);
     }
-
+    // gestion trace en coordonnees polaires 
+    else if (opts == "polarplot") { polarPlot=true; }
+    else if (opts == "polarangledeg") { angConvFactor=M_PI/180.; }  
+    else if (opts.substr(0,11) == "polarangle=") {
+      double aconv=1., aoff=0.;
+      sscanf(opts.substr(11).c_str(),"%lf,%lf",&aconv, &aoff);
+      angConvFactor=aconv; angOffset=aoff; 
+    }
     else {
       // Si option non decode
@@ -453 +506 @@
  } else opt.push_back("nosizescale");
 
+ if (polarPlot) {
+   sprintf(str,"polarplot polarangle==%g,%g",angConvFactor,angOffset); opt.push_back(str);
+ }
+
  return 1;
 }
@@ -474 +531 @@
 info += "  colorscale/nocolorscale (Use color scale for weight) \n";
 info += "  sizescale/sizescale=nbins/nosizescale (Use marker size for weight) \n";
+info += "  polarplot: select plot in polar coordinates \n";
+info += "  polarangle=ConvFactorToRadian,AngOffsetinRadian Polar angle conversion \n";
+info += "  polarangledeg: set ConvFactorToRadian for input angles in degree \n";
 info += "   (and usual color/line/marker/... attribute decoding)  \n";
 // On recupere ensuite la chaine info de la classe de base