Changeset 1406

Timestamp:

07/16/02 09:26:09 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Makefile (modified) (1 diff)
• mgui/MCamDisplay.cc (modified) (1 diff)
• mgui/MCamDisplay.h (modified) (2 diffs)
• mgui/MineSweeper.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Makefile

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

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -584 +584 @@
 // 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;
-}
+/*
+ void MCamDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
+ {
+ cout << "Execute Event Camera " << event << " @ " << px << " " << py << endl;
+ }
+ */

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);
@@ -62 +65 @@
     void DrawPixelNumbers();
 
-    void Reset();
-    void Draw(Option_t *option="");
-    void SavePrimitive(ofstream &out, Option_t *);
+    virtual void Reset();
+    virtual void Draw(Option_t *option="");
+    virtual void SavePrimitive(ofstream &out, Option_t *);
 
     void SetPalette(Int_t ncolors, Int_t *colors);

trunk/MagicSoft/Mars/mgui/MineSweeper.cc

@@ -474 +474 @@
     Update(flg);
 
-    if (vis==fNumPixels)
+    if (vis==fNumPixels && !fDone)
         Done("Great! Congratulations, you did it!", 3);