Changeset 1426 for trunk/MagicSoft/Mars/mgui

Timestamp:

07/23/02 11:16:13 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgui

Files:

• MCamDisplay.cc (modified) (1 diff)
• MCamDisplay.h (modified) (2 diffs)
• MHexagon.cc (modified) (2 diffs)
• MineSweeper.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -126 +126 @@
     // delete fGeomCam;
 
-    //    if (fIsAllocated)
-    //        delete fDrawingPad;
+    if (fDrawingPad->GetListOfPrimitives()->FindObject(this)==this &&
+        fIsAllocated)
+    {
+        fDrawingPad->RecursiveRemove(this);
+        delete fDrawingPad;
+    }
 }
 

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -57 +57 @@
     ~MCamDisplay();
 
-    virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
-    //virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py);
-
     void SetAutoScale(Bool_t input=kTRUE) { fAutoScale = input; }
     void DrawPhotNum(const MCerPhotEvt *event);
@@ -65 +62 @@
     void DrawPixelNumbers();
 
-    virtual void Reset();
-    virtual void Draw(Option_t *option="");
-    virtual void SavePrimitive(ofstream &out, Option_t *);
+    virtual void  Reset();
+    virtual void  Draw(Option_t *option="");
+    virtual void  SavePrimitive(ofstream &out, Option_t *);
+    virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
+    //virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py);
 
     void SetPalette(Int_t ncolors, Int_t *colors);

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -121 +121 @@
     const Int_t pyhex = gPad->YtoAbsPixel(fY);
 
-    const Double_t disthex = TMath::Sqrt((Double_t)((pxhex-px)*(pxhex-px) + (pyhex-py)*(pyhex-py)));
+    const Double_t x = TMath::Abs(px-pxhex);
+    const Double_t y = TMath::Abs(py-pyhex);
+
+    const Double_t disthex = TMath::Sqrt(x*x + y*y);
 
     if (disthex==0)
         return 0;
 
-    const Double_t cosa = TMath::Abs(px-pxhex) / disthex;
-    const Double_t sina = TMath::Abs(py-pyhex) / disthex;
-
-    //
-    // comput the distance to pixel border
+    const Double_t cosa = x / disthex;
+    const Double_t sina = y / disthex;
+
+    //
+    // comput the distance of hexagon center to pixel border
     //
     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 distborder = TMath::Sqrt((Double_t)((pxborder-pxhex)*(pxborder-pxhex)+(pyborder-pyhex)*(pyborder-pyhex)));
+    const Int_t pxborder = gPad->XtoAbsPixel(fX + dx);
+    const Int_t pyborder = gPad->YtoAbsPixel(fY + dy);
+
+    const Double_t bx = pxhex-pxborder;
+    const Double_t by = pyhex-pyborder;
+
+    const Double_t distborder = TMath::Sqrt(bx*bx + by*by);
 
     //
@@ -147 +150 @@
     //  here in the first implementation is just circle inside
     //
-    return distborder < disthex ? 999999 : 0;
+    return distborder < disthex ? (int)(disthex-distborder+1) : 0;
 }
 

trunk/MagicSoft/Mars/mgui/MineSweeper.cc

@@ -206 +206 @@
         delete fDone;
 
-    //    if (fIsAllocated)
-    //        delete fDrawingPad;
+    if (fDrawingPad->GetListOfPrimitives()->FindObject(this)==this)
+    {
+        fDrawingPad->RecursiveRemove(this);
+        delete fDrawingPad;
+    }
 }