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

Timestamp:

Jun 23, 1999, 4:41:47 PM (26 years ago)

Author:

ercodmgr

Message:

1/ NTupleInterface mis ds Outils++ et complete -
2/ Les PINtuple et PINtup3D utilisent maintenant NTupleInterface
3/ Debut modification interface NObjMgr - Reza 23/6/99

File:

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

trunk/SophyaPI/PIext/pintuple.cc

@@ -4 +4 @@
  
 /* --Methode-- */
-PINTuple::PINTuple(NTuple* nt, bool ad)
+PINTuple::PINTuple(NTupleInterface* nt, bool ad)
 : PIDrawer()
 {
@@ -21 +21 @@
 void  PINTuple::SelectXY(const char* px, const char* py)
 {
+string name;
 if (mNT == NULL)  xK = yK = -1;
 if (px == NULL) xK = -1;
-else xK = mNT->IndexNom(px);
+else { name = px; xK = mNT->ColumnIndex(name); }
 if (py == NULL) yK = -1;
-else yK = mNT->IndexNom(py);
+else { name = py; yK = mNT->ColumnIndex(name); }
 }
 
@@ -31 +32 @@
 void  PINTuple::SelectErrBar(const char* erbx, const char* erby)
 {
+string name;
 if (mNT == NULL)  xebK = yebK = -1;
 if (erbx == NULL) xebK = -1;
-else xebK = mNT->IndexNom(erbx);
+else { name = erbx;  xebK = mNT->ColumnIndex(name); }
 if (erby == NULL) yebK = -1;
-else yebK = mNT->IndexNom(erby);
+else { name = erby;  yebK = mNT->ColumnIndex(name); }
 }
 
@@ -43 +45 @@
 {
   if (!mNT) return;
-  if (mNT->NEntry() <= 0)  return;
+  if (mNT->NbLines() <= 0)  return;
   if ( (xK < 0) || (yK < 0) )   return;
 
   // Commencer par trouver nos limites
-  float dx, dy;
-  float xmin, xmax, ymin, ymax;
+  double dx, dy;
+  double xmin, xmax, ymin, ymax;
   xmin = ymin = 9.e19;
   xmax = ymax = -9.e19;
@@ -66 +68 @@
 {
 double xp,yp,xer,yer;
+double xl,yl;
 int nok;
 
@@ -71 +74 @@
 if ( (xK < 0) || (yK < 0) )  return;
 if (mLAtt == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
+
 nok = 0;  
-for (int i=0; i<mNT->NEntry(); i++) {
-  xp = mNT->GetVal(i, xK);
-  yp = mNT->GetVal(i, yK);
+xp = yp = xl = yl = 0;
+for (int i=0; i<mNT->NbLines(); i++) {
+  xl = xp;  yl = yp; 
+  xp = mNT->GetCell(i, xK);
+  yp = mNT->GetCell(i, yK);
   if ( (xp < xmin) || (xp > xmax) || (yp < ymin) || (yp > ymax) )  continue;
+  if ( (i > 0) && (mLAtt != PI_NotDefLineAtt) )   // On relie les points ...
+    g->DrawLine(xl, yl, xp, yp);
   nok++;
   if ( xebK >= 0 ) {
-    xer = mNT->GetVal(i, xebK);
+    xer = mNT->GetCell(i, xebK);
     if(xer>0.) g->DrawLine(xp-xer, yp, xp+xer, yp);
   }
   if ( yebK >= 0 ) {
-    yer = mNT->GetVal(i, yebK);
+    yer = mNT->GetCell(i, yebK);
     if(yer>0.) g->DrawLine(xp, yp-yer, xp, yp+yer);
   }