Changeset 205 in Sophya for trunk/SophyaPI/PIext/pihisto2d.cc

Timestamp:

Mar 1, 1999, 6:05:59 PM (27 years ago)

Author:

ercodmgr

Message:

1/ Adaptation pour passage en double de trace en coordonnees graphiques
User (UC) (float -> double)
2/ Adaptation pour passage en double pour les ArrayAdapter

Reza 1/03/99

File:

• trunk/SophyaPI/PIext/pihisto2d.cc (modified) (9 diffs)

trunk/SophyaPI/PIext/pihisto2d.cc

@@ -157 +157 @@
 
 //++
-void PIHisto2D::Draw(PIGraphicUC* g,float,float, float, float)
+void PIHisto2D::Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax)
 //
 //      Dessin de l'histogramme.
@@ -164 +164 @@
 if(!mHisto) return;
 // Caracteristiques histogramme
-float dx = mHisto->WBinX(),dy = mHisto->WBinY();
-float p1dx,p1dy;
+double dx = mHisto->WBinX(),dy = mHisto->WBinY();
+double p1dx,p1dy;
 g->DGrC2UC(1.f,1.f,p1dx,p1dy);
 
@@ -197 +197 @@
 int FontSize = g->GetFontSize();
 if(mTypDisp==2) {
-  float dxg,dyg,dg;
+  double dxg,dyg,dg;
   g->DUC2GrC(dx,dy,dxg,dyg);
   dg =(dxg<dyg) ? dxg : dyg;
@@ -235 +235 @@
   }
 
+// Pour ne pas dessiner en dehors des axes 
+  if ( (left0+dx/2. < xmin) || (left0+dx/2. > xmax) || 
+         (bottom0+dy/2. < ymin) || (bottom0+dy/2. > ymax) ) continue;
+
   // Dessin proprement dit selon le choix graphique.
   if(mTypDisp==0) {
     //..... carres de tailles variables
-    float left   = left0   + 0.5*(1.-fracred)*dx, width  = fracred*dx;
-    float bottom = bottom0 + 0.5*(1.-fracred)*dy, height = fracred*dy;
+    double left   = left0   + 0.5*(1.-fracred)*dx, width  = fracred*dx;
+    double bottom = bottom0 + 0.5*(1.-fracred)*dy, height = fracred*dy;
     if (cmap) g->DrawFBox(left,bottom,width,height);
     else      g->DrawBox(left,bottom,width,height);
@@ -246 +250 @@
     int ipt  = int( (float) npt *frac );
     for(int k=0;k<ipt;k++) {
-      float x = left0 + frand01()*dx;
-      float y = bottom0 + frand01()*dy;
+      double x = left0 + frand01()*dx;
+      double y = bottom0 + frand01()*dy;
       g->DrawMarker(x,y);
     }
@@ -254 +258 @@
     char c[2];
     c[0] = HPrint2(frac); c[1]='\0';
-    float x = left0 + dx/2.;
-    float y = bottom0 + dy/2.;
+    double x = left0 + dx/2.;
+    double y = bottom0 + dy/2.;
     g->DrawString(x,y,c);
   } else if(mTypDisp==3) {
@@ -283 +287 @@
   // Une boite dans le coin superieur droit
   if (mLAtt == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
-  float cellHeight = (YMax() - YMin()) * 0.05;
-  float cellWidth  = (XMax() - XMin()) * 0.23;
+  double cellHeight = (YMax() - YMin()) * 0.05;
+  double cellWidth  = (XMax() - XMin()) * 0.23;
   g->DrawLine(XMax() - cellWidth, YMax(),
                        XMax() - cellWidth, YMax() - cellHeight);
@@ -331 +335 @@
 //--
 {
-float dx = mHisto->WBinX(),dy = mHisto->WBinY();
-float dxg,dyg;
+double dx = mHisto->WBinX(),dy = mHisto->WBinY();
+double dxg,dyg;
 g->DUC2GrC(dx,dy,dxg,dyg);
 int np = (int) dxg * (int) dyg;
@@ -413 +417 @@
 
 //++
-string  PIH2DWdg::GetClickText(float x, float y)
+string  PIH2DWdg::GetClickText(double x, double y)
 //
 //      Quand on click (and drag) le bouton-1, affichage