Changeset 2517 in Sophya for trunk/SophyaPI/PIext/pihisto.cc

Timestamp:

Mar 17, 2004, 7:04:57 PM (22 years ago)

Author:

cmv

Message:

GetDistanceToPoint cmv 17/03/04

File:

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

trunk/SophyaPI/PIext/pihisto.cc

@@ -3 +3 @@
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <iostream>
+#include <math.h>
 #include <typeinfo>
 
@@ -39 +42 @@
   SetStats();
   SetError();
+  SetFilled();
   SetStatPosOffset();
   SetName("HistoDrw");
@@ -80 +84 @@
 
   bool oktrace=false;
+  // Tracer d'une polyline si demandee
+  bool drawpline=false;
+  if(GetGraphicAtt().GetLineAtt() != PI_NotDefLineAtt) drawpline=true;
   // Tracer des marqueurs si demande ou si HProf
   bool drawmarker=false;
@@ -94 +101 @@
   else if(error>0) drawerr=true;
   else if(error<0) drawerr=false;
+  // Fill de l'histo ?
+  bool drawfill=false;
+  if(filled) drawfill=true; else drawfill=false;
+  // Et aussi si on ne demande ni ligne ni marqueur ?
+  if( !drawmarker && !drawpline && !drawerr ) drawfill=true;
+
+  // Remplissage des bins avec la couleur courante (trace en premier)
+  if(drawfill) {
+    oktrace = true;
+    for(int i=0; i<mHisto->NBins(); i++) {
+      double left   = mHisto->BinLowEdge(i);
+      double width  = mHisto->BinWidth();
+      double bottom = 0;
+      double height = (*mHisto)(i);
+      g->DrawFBox(left,bottom,width,height);
+    }
+  }
 
   // Trace des marqeurs
@@ -125 +149 @@
   }
 
-  // Trace de la ligne continue
-  // Si on ne demande pas de ligne (PI_NotDefLineAtt)
-  // et que l'on a rien trace auparavent, on trace un FPolygon
-  if(GetGraphicAtt().GetLineAtt() != PI_NotDefLineAtt || !oktrace) {
+  // Trace de la ligne continue si demandee
+  if(drawpline) {
     PIGrCoord* x1 = new PIGrCoord[2*mHisto->NBins()+2];
     PIGrCoord* y1 = new PIGrCoord[2*mHisto->NBins()+2];
@@ -147 +169 @@
     y1[npt] = 0;
     npt++;
-    if(GetGraphicAtt().GetLineAtt() != PI_NotDefLineAtt) {
-      g->DrawPolygon(x1,y1,npt,false);
-      oktrace = true;
-    }
-    if(!oktrace) g->DrawFPolygon(x1,y1,npt,false);
-    delete[] x1;  delete[] y1;
+    g->DrawPolygon(x1,y1,npt,false);
+    delete [] x1; delete [] y1;
+    oktrace = true;
   }
 
@@ -179 +198 @@
     else if(opts=="noerr")    SetError(-1);
     else if(opts=="autoerr")  SetError(0);
+    else if(opts=="fill")     SetFilled(true);
+    else if(opts=="nofill")   SetFilled(false);
     else if(opts.substr(0,11) == "statposoff=") {
       float xo=0., yo=0.;
@@ -204 +225 @@
 info += "  err / nerr : draw, do not draw error bars\n";
 info += "  autoerr : draw error bars if Marker drawing requested OR Profile histo\n";
+info += "  fill / nofill : fill, do not fill bars with selected color\n";
 info += "  statposoff=OffsetX,OffsetY : Position offset for Stats drawing \n";
 info += "       as a fraction of total size \n";
@@ -262 +284 @@
                        
 }
+
+
+
+/* --Methode-- */
+double PIHisto::GetDistanceToPoint(double x, double y)
+{
+ if (!mHisto) return 1.e+9;
+
+ double dist = -1.e+18;
+ for(int i=0; i<mHisto->NBins(); i++) {
+   double xp=mHisto->BinCenter(i);
+   double yp=(*mHisto)(i);
+   xp = (xp-x)/(XMax()-XMin())/0.5;
+   yp = (yp-y)/(YMax()-YMin())/0.5;
+   xp = xp*xp+yp*yp;
+   if(dist<0. || xp<dist) dist = xp;
+ }
+ dist=sqrt(fabs(dist));
+ //cout<<dist<<"PIHisto: xlim="<<XMin()<<","<<XMax()<<" ylim="<<YMin()<<","<<YMax()
+ //    <<" NBins="<<mHisto->NBins()<<endl;
+ //cout<<"....d="<<dist<<" x="<<x<<" y="<<y<<endl;
+
+ return dist;
+}