Changeset 3514 for trunk/MagicSoft/Mars/mgui

Timestamp:

03/15/04 19:51:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgui

Files:

• MHexagon.cc (modified) (3 diffs)
• MHexagon.h (modified) (1 diff)

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -112 +112 @@
 // All calcutations are running in pixel coordinates
 //
-Int_t MHexagon::DistancetoPrimitive(Int_t px, Int_t py)
+Int_t MHexagon::DistancetoPrimitive(Int_t px, Int_t py, Float_t conv)
 {
     //
     //  compute the distance of the Point to the center of the Hexagon
     //
-    const Int_t pxhex = gPad->XtoAbsPixel(fX);
-    const Int_t pyhex = gPad->YtoAbsPixel(fY);
+    const Int_t pxhex = gPad->XtoAbsPixel(fX*conv);
+    const Int_t pyhex = gPad->YtoAbsPixel(fY*conv);
 
     const Double_t x = TMath::Abs(px-pxhex);
@@ -137 +137 @@
     const Double_t dy = fD/2 * sina;
 
-    const Int_t pxborder = gPad->XtoAbsPixel(fX + dx);
-    const Int_t pyborder = gPad->YtoAbsPixel(fY + dy);
+    const Int_t pxborder = gPad->XtoAbsPixel((fX + dx)*conv);
+    const Int_t pyborder = gPad->YtoAbsPixel((fY + dy)*conv);
 
     const Double_t bx = pxhex-pxborder;
@@ -149 +149 @@
     //  here in the first implementation is just circle inside
     //
-    return distborder < disthex ? (int)(disthex-distborder+1) : 0;
+    return distborder < disthex ? (int)((disthex-distborder)/conv+1) : 0;
 }
 

trunk/MagicSoft/Mars/mgui/MHexagon.h

@@ -49 +49 @@
         ;
 
-    virtual Int_t   DistancetoPrimitive(Int_t px, Int_t py);
+    Int_t DistancetoPrimitive(Int_t px, Int_t py, Float_t conv);
+    virtual Int_t DistancetoPrimitive(Int_t px, Int_t py)
+    {
+        return DistancetoPrimitive(px, py, 1);
+    }
     virtual Float_t DistanceToPrimitive(Float_t px, Float_t py);
     virtual void  DrawHexagon(Float_t x, Float_t y, Float_t d);