Changeset 653 for trunk/MagicSoft/Mars/mgui/MHexagon.cc

Timestamp:

03/01/01 15:42:32 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mgui/MHexagon.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -1 @@
-#include <stdlib.h>
-#include <fstream.h>
-#include <iostream.h>
-
-#include "TROOT.h" 
-#include "TVirtualPad.h" 
-#include "TMath.h" 
-
-#include "MHexagon.h" 
-
+//
+//  The class MHexagon is needed for the Event Display of
+//  MAGIC.
+//
+#include "MHexagon.h"
+
+#include <TVirtualPad.h>  // gPad
+
+#include "MGeomPix.h"     // GetX
 
 ClassImp(MHexagon) 
 
-  //
-  //  The class MHexagon is needed for the Event Display of
-  //  MAGIC.
-
-
-
-MHexagon::MHexagon() : TObject(), TAttLine(), TAttFill()
+MHexagon::MHexagon() 
 {
   //   default constructor for MHexagon 
@@ -24 +17 @@
 } 
 
-MHexagon::MHexagon(Float_t x, Float_t y, Float_t d ) : TObject(), TAttLine(), TAttFill(0, 1001)
+MHexagon::MHexagon(Float_t x, Float_t y, Float_t d )
+ : TAttFill(0, 1001), fX(x), fY(y), fD(d)
 { 
   //    normal constructor for MHexagon
-  fX = x ; 
-  fY = y ; 
-  fD = d ; 
-
-} 
+}
+
+MHexagon::MHexagon(MGeomPix &pix)
+ : TAttFill(0, 1001)
+{
+  //    normal constructor for MHexagon
+   fX = pix.GetX();
+   fY = pix.GetY();
+   fD = pix.GetR();
+}
+
 MHexagon::MHexagon( const MHexagon &hexagon)
 {
@@ -41 +41 @@
 { 
   //     default destructor for MHexagon
-
 }  
 
@@ -47 +46 @@
 { 
   //     copy this hexagon to hexagon 
-
-  TObject::Copy  ( obj ) ; 
-  TAttLine::Copy (((MHexagon&) obj ) ) ; 
-  TAttFill::Copy (((MHexagon&) obj ) ) ; 
- 
-  ((MHexagon&) obj).fX = fX ; 
-  ((MHexagon&) obj).fY = fY ; 
-  ((MHexagon&) obj).fD = fD ;     
-} 
-Int_t MHexagon::DistancetoPrimitive( Int_t px, Int_t py ) 
-{ 
-  //   compute the distance of a point (px,py) to the Hexagon 
-  //   this functions needed for graphical primitives, that
-  //   means without this function you are not able to interact
-  //   with the graphical primitive with the mouse!!!
-  //
-  //   All calcutations are running in pixel coordinates
-  
-  //       compute the distance of the Point to the center of the Hexagon
-
-  Int_t  pxhex = gPad->XtoAbsPixel( fX ) ; 
-  Int_t  pyhex = gPad->YtoAbsPixel( fY ) ; 
-
-  Double_t DistPointHexagon = TMath::Sqrt( Double_t ((pxhex-px)*(pxhex-px) + (pyhex-py)*(pyhex-py))) ; 
-  Double_t cosa = TMath::Abs(px-pxhex) / DistPointHexagon ; 
-  Double_t sina = TMath::Abs(py-pyhex) / DistPointHexagon ; 
+    TObject::Copy  ( obj ) ;
+    TAttLine::Copy (((MHexagon&) obj ) ) ;
+    TAttFill::Copy (((MHexagon&) obj ) ) ;
+
+    ((MHexagon&) obj).fX = fX ;
+    ((MHexagon&) obj).fY = fY ;
+    ((MHexagon&) obj).fD = fD ;
+}
+Int_t MHexagon::DistancetoPrimitive( Int_t px, Int_t py )
+{
+    //   compute the distance of a point (px,py) to the Hexagon
+    //   this functions needed for graphical primitives, that
+    //   means without this function you are not able to interact
+    //   with the graphical primitive with the mouse!!!
+    //
+    //   All calcutations are running in pixel coordinates
+
+    //       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 Double_t DistPointHexagon = TMath::Sqrt( Double_t ((pxhex-px)*(pxhex-px) + (pyhex-py)*(pyhex-py))) ; 
+  const Double_t cosa = TMath::Abs(px-pxhex) / DistPointHexagon ; 
+  const Double_t sina = TMath::Abs(py-pyhex) / DistPointHexagon ; 
 
   //       comput the distance to pixel border 
   
-  Double_t   dx = fD * cosa / 2 ; 
-  Double_t   dy = fD * sina / 2 ; 
-  
-  Double_t   xborder = fX + dx ; 
-  Double_t   yborder = fY + dy ; 
-
-  Int_t  pxborder = gPad->XtoAbsPixel( xborder ) ; 
-  Int_t  pyborder = gPad->YtoAbsPixel( yborder ) ; 
-  
-  Double_t DistBorderHexagon = TMath::Sqrt( Double_t ((pxborder-pxhex)*(pxborder-pxhex)+(pyborder-pyhex)*(pyborder-pyhex))) ;  
+  const Double_t   dx = fD * cosa / 2 ; 
+  const Double_t   dy = fD * sina / 2 ; 
+  
+  const Double_t   xborder = fX + dx ; 
+  const Double_t   yborder = fY + dy ; 
+
+  const Int_t  pxborder = gPad->XtoAbsPixel( xborder ) ; 
+  const Int_t  pyborder = gPad->YtoAbsPixel( yborder ) ; 
+  
+  const Double_t DistBorderHexagon = TMath::Sqrt( Double_t ((pxborder-pxhex)*(pxborder-pxhex)+(pyborder-pyhex)*(pyborder-pyhex))) ;  
   
  
@@ -91 +89 @@
   //       here in the first implementation is just circle inside
 
-  if ( DistBorderHexagon <  DistPointHexagon )
-    return 999999 ; 
-  else   
-    //  return Int_t ( DistBorderHexagon - DistPointHexagon ) ; 
-    return 0 ; 
+  return DistBorderHexagon <  DistPointHexagon ? 999999 : 0;
 } 
 
@@ -147 +141 @@
   //     list this hexagon with its attributes
   TROOT::IndentLevel() ; 
-  printf ("%s:  X= %f  Y= %f R= %f \n", GetName, fX, fY, fD ) ; 
+  printf ("%s:  X= %f  Y= %f R= %f \n", GetName(), fX, fY, fD ) ;
 } 
 
@@ -164 +158 @@
   const Int_t np =  6 ; 
   
-  Float_t dx[np+1] = { .5   , 0.    , -.5   , -.5   , 0.    ,  .5   , .5    } ; 
-  Float_t dy[np+1] = { .2886,  .5772,  .2886, -.2886, -.5772, -.2886, .2886 } ; 
+  const Float_t dx[np+1] = { .5   , 0.    , -.5   , -.5   , 0.    ,  .5   , .5    } ;
+  const Float_t dy[np+1] = { .2886,  .5772,  .2886, -.2886, -.5772, -.2886, .2886 } ;
 
   static Float_t x[np+1], y[np+1] ; 
@@ -189 +183 @@
 {
   //     print/dump this hexagon with its attributes
-  printf ("Ellipse:  X= %f  Y= %f R= %f ", fX, fY, fD ) ; 
+  printf ("Ellipse:  X= %f  Y= %f R= %f ", fX, fY, fD ) ;
   
   if ( GetLineColor() != 1 ) printf (" Color=%d", GetLineColor() ) ;