Changeset 1549 in Sophya

Timestamp:

Jun 27, 2001, 10:11:31 AM (24 years ago)

Author:

ansari

Message:

Introduction de la possibilite d'afficher des informations complementaires en fonction de la position souris ds PIImage - (Extension de l'interface P2DArrayAdapter) - Reza 27/6/2001

Location:

trunk/SophyaPI/PI

Files:

• parradapter.cc (modified) (2 diffs)
• parradapter.h (modified) (3 diffs)
• piimage.cc (modified) (4 diffs)

trunk/SophyaPI/PI/parradapter.cc

@@ -113 +113 @@
 invX = invY = eXY = false;
 DefineXYCoordinates(0.,0.,1.,1.);
+SetInfoStringFunction(NULL);
 }
 
@@ -143 +144 @@
 x = mOx+ix*mDx;
 y = mOy+iy*mDy; 
+}
+
+static char ibuff[256];
+
+/* --Methode-- */
+char * P2DArrayAdapter::InfoString(int ix, int iy)
+{
+  double x,y;
+  this->Coord(ix, iy, x, y);
+  char * isr = "";
+  if (ISFunc)  isr = ISFunc(this, ix, iy);
+  sprintf(ibuff,"X= %g Y= %g  Pix= %8g %s        ", 
+          x, y , this->Value(ix, iy), isr );
+  return (ibuff);
 }
 

trunk/SophyaPI/PI/parradapter.h

@@ -28 +28 @@
 // autres classes de PI qui operent sur des structures 
 // de type Tableaux 2-D (images, ...) 
+class P2DArrayAdapter;
 
+typedef char * (* P2DAA_InfoStringFunc) (P2DArrayAdapter * aa, int ix, int iy);
+/* Longueur de retour de P2DAA_InfoString : 128 char */
+ 
 class P2DArrayAdapter {
 public :
@@ -45 +49 @@
 
   virtual void    XYfromxy(int ix, int iy, double& x, double& y);
+
+  virtual char *  InfoString(int ix, int iy);
+
+  inline  void    SetInfoStringFunction(P2DAA_InfoStringFunc isf)
+                  { ISFunc = isf; }
 
   inline  int     XSize() { return ( eXY ? sY : sX ) ; }
@@ -78 +87 @@
   int offX, offY;
   bool invX, invY, eXY;
+
+  P2DAA_InfoStringFunc ISFunc;
+
 };
 

trunk/SophyaPI/PI/piimage.cc

@@ -310 +310 @@
 showinfo = si;
 if (showinfo && img)  { 
-  char buff[256];
-  double x,y;
-  img->Coord(xpav, ypav, x, y);
-  sprintf(buff," X= %g , Y= %g  Pix= %g (%d,%d)      ", 
-          x, y , (*img)(xpav, ypav), xpav, ypav );
-  DrawInfo(mWGrC, buff);
+  char * ibuff = img->InfoString(xpav, ypav);
+  DrawInfo(mWGrC, ibuff);
   }
 else DrawInfo(mWGrC, NULL);
@@ -572 +568 @@
   }
 else {
-  char buff[256];
-  double x,y;
-  img->Coord(xpav, ypav, x, y);
-  sprintf(buff," X= %g , Y= %g  Pix= %g (%d,%d)      ", 
-          x, y , (*img)(xpav, ypav), xpav, ypav );
-  if (ustrtw || atrtw)  trtlb->SetLabel((string)buff);
-  else DrawInfo(mWGrC, buff);
+  char * ibuff = img->InfoString(xpav, ypav);
+  if (ustrtw || atrtw)  trtlb->SetLabel((string)ibuff);
+  else DrawInfo(mWGrC, ibuff);
   }
 if (zow != NULL)   ComputeZoomPixmap();
@@ -616 +608 @@
 
 if (showinfo && img) {
-  char buff[256];
-  double x,y;
-  img->Coord(xpav, ypav, x, y);
-  sprintf(buff," X= %g , Y= %g  Pix= %g (%d,%d)      ", 
-        x, y , (*img)(xpav, ypav), xpav, ypav );
-  DrawInfo(mWGrC, buff); 
+  char * ibuff = img->InfoString(xpav, ypav);
+  DrawInfo(mWGrC, ibuff); 
   }
 
@@ -773 +761 @@
 
  {
- char buff[256];  
- double x,y;
- img->Coord(xp, yp, x, y);
- sprintf(buff," X= %g , Y= %g  Pix= %g  (C= %d,%d)   ", 
-         x, y , (*img)(xp, yp),  (xp+xpv0)/2, (yp+ypv0)/2 );
- if (ustrtw || atrtw) trtlb->SetLabel((string)buff);
- else DrawInfo(mWGrC, buff);
+  char * ibuff = img->InfoString((xp+xpv0)/2, (yp+ypv0)/2 );
+ if (ustrtw || atrtw) trtlb->SetLabel((string)ibuff);
+ else DrawInfo(mWGrC, ibuff);
  }