Changeset 1884 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Jan 22, 2002, 4:56:12 PM (24 years ago)

Author:

cmv

Message:

correct pour le getclickinfo() cmv 22/01/02

Location:

trunk/SophyaPI/PIext

Files:

• pihisto2d.cc (modified) (1 diff)
• pihisto2d.h (modified) (1 diff)

trunk/SophyaPI/PIext/pihisto2d.cc

@@ -351 +351 @@
 
 //++
-void PIHisto2D::GetClickInfo(string& info, double x, double y)
+void PIHisto2D::GetClickInfo(string& info,double x,double y,double x0,double y0,bool fgdiff)
 //
 //      Info specifique du drawer pour la position x,y
 //--
 {
-  Histo2D* h = Histogram();
-  if (h == NULL) return;
-  int i,j;
-  char str[128];
-
-  h->FindBin(x,y,i,j);
-  if(i<0 || i>=h->NBinX() || j<0 || j>=h->NBinY()) info += " ???";
-  else {
-    sprintf(str," v= %g",(*h)(i,j));
-    info += str;
+Histo2D* h = Histogram();
+if(h == NULL) return;
+
+int i,j;
+h->FindBin(x,y,i,j);
+if(i>=0 && i<h->NBinX() && j>=0 && j<h->NBinY()) {
+  char str[64];
+  if(fgdiff) {
+    int i0,j0;
+    h->FindBin(x0,y0,i0,j0);
+    if(i0>=0 && i0<h->NBinX() && j0>=0 && j0<h->NBinY()) {
+      sprintf(str," DV=%g",(*h)(i,j)-(*h)(i0,j0));
+      info += str;
+    } else {
+      info += " DV=?";
+    }
   }
-  return;
+  sprintf(str," V=%g",(*h)(i,j));
+  info += str;
+} else {
+  info += " V=?";
+}
+
+return;
 }
 

trunk/SophyaPI/PIext/pihisto2d.h

@@ -32 +32 @@
   //   AppendTextInfo a faire un jour - Reza 21/01/2002 
   //  virtual void AppendTextInfo(string& info, double xmin, double ymin, double xmax, double ymax);
-  virtual void GetClickInfo(string& info, double x, double y); // Info pour position X,Y
+
+  virtual void GetClickInfo(string& info, double x, double y
+                           ,double x0=0.,double y0=0.,bool fgdiff=false); 
 
   virtual void UpdateLimits();