Changeset 1405 for trunk/MagicSoft

Timestamp:

07/16/02 09:21:24 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Makefile (modified) (1 diff)
• mgui/MCamDisplay.cc (modified) (4 diffs)
• mgui/MHexagon.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Makefile

@@ -38 +38 @@
           mmc         \
           mgui        \
+          mfileio     \
           manalysis   \
           mfileio     \

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -316 +316 @@
     }
 
+    //
+    // Setup the correct environment
+    //
     fDrawingPad->SetBorderMode(0);
     fDrawingPad->SetFillColor(22);
 
     //
-    // Append this object, so that the aspect ratio is maintained
-    // (Paint-function is called)
-    //
-    AppendPad(option);
+    // Set the initial coordinate range
+    //
+    Paint();
 
     //
@@ -384 +386 @@
     }
 
+    //
+    // Append this object, so that the aspect ratio is maintained
+    // (Paint-function is called)
+    // Add it here so that root will have it first in the internal list:
+    // This means, that root 'sees' the whole camera instead of all the
+    // single hexagons.
+    //
+    AppendPad(option);
+
     //fDrawingPad->SetEditable(kFALSE);
 }
@@ -403 +414 @@
         num += i;
 
-        const MHexagon &h = (MHexagon&)*(*fPixels)[i];
+        const MHexagon &h = (*this)[i];
         TText *nt = txt.DrawText(h.GetX(), h.GetY(), num);
         nt->SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius());
@@ -545 +556 @@
     out << fDrawingPad->GetWw() << "," << fDrawingPad->GetWh() << ");" << endl;
 }
+
+// ------------------------------------------------------------------------
+//
+// compute the distance of a point (px,py) to the Camera
+// 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
+//
+Int_t MCamDisplay::DistancetoPrimitive(Int_t px, Int_t py)
+{
+    Int_t dist = 999999;
+
+    for (UInt_t i=0; i<fNumPixels; i++)
+    {
+        Int_t d = (*fPixels)[i]->DistancetoPrimitive(px, py);
+
+        if (d<dist)
+            dist=d;
+    }
+    return dist==0?0:999999;
+}
+
+// ------------------------------------------------------------------------
+//
+// Execute a mouse event on the camera
+//
+void MCamDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
+{
+    cout << "Execute Event Camera " << event << " @ " << px << " " << py << endl;
+}

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -123 +123 @@
     const Double_t disthex = TMath::Sqrt((Double_t)((pxhex-px)*(pxhex-px) + (pyhex-py)*(pyhex-py)));
 
+    if (disthex==0)
+        return 0;
+
     const Double_t cosa = TMath::Abs(px-pxhex) / disthex;
     const Double_t sina = TMath::Abs(py-pyhex) / disthex;
@@ -280 +283 @@
     out << "   hexagon->Draw();" << endl;
 }
+