Changeset 8755

Timestamp:

10/10/07 19:59:43 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mtools/MagicDomino.cc (modified) (2 diffs)
• mtools/MagicDomino.h (modified) (2 diffs)
• mtools/MagicJam.h (modified) (1 diff)
• mtools/MagicReversi.cc (modified) (2 diffs)
• mtools/MagicReversi.h (modified) (2 diffs)
• mtools/MagicShow.cc (modified) (2 diffs)
• mtools/MagicShow.h (modified) (2 diffs)
• mtools/MagicSnake.cc (modified) (2 diffs)
• mtools/MagicSnake.h (modified) (2 diffs)
• mtools/MineSweeper.cc (modified) (2 diffs)
• mtools/MineSweeper.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/10/10 Thomas Bretz
+
+   * mtools/MagicDomino.[h,cc], mtools/MagicReversi.[h,cc],
+     mtools/MagicShow.[h,cc], mtools/MagicSnake.[h,cc],
+      mtools/MineSweeper.[h,cc]:
+     - added a constructor supporting any MGeomCam
+
+   * mtools/MagicJam.h:
+     - removed some new function from the context menu
+
+
 
  2007/10/08 Thomas Bretz

trunk/MagicSoft/Mars/mtools/MagicDomino.cc

@@ -215 +215 @@
 // ------------------------------------------------------------------------
 //
-//  default constructor
-//
-MagicDomino::MagicDomino()
-    : fGeomCam(NULL), fDir(kBottom), fDone(NULL)
+void MagicDomino::Init()
 {
     memset(fText, 0, sizeof(fText));
-
-    SetNewCamera(new MGeomCamMagic);
 
     //
@@ -233 +228 @@
 
     Draw();
+}
+
+// ------------------------------------------------------------------------
+//
+//  default constructor
+//
+MagicDomino::MagicDomino()
+    : fGeomCam(NULL), fDir(kBottom), fDone(NULL)
+{
+    SetNewCamera(new MGeomCamMagic);
+    Init();
+}
+// ------------------------------------------------------------------------
+//
+//
+MagicDomino::MagicDomino(const MGeomCam &geom)
+    : fGeomCam(NULL), fDir(kBottom), fDone(NULL)
+{
+    SetNewCamera(static_cast<MGeomCam*>(geom.Clone()));
+    Init();
 }
 

trunk/MagicSoft/Mars/mtools/MagicDomino.h

@@ -83 +83 @@
     Short_t AnalysePixel(Int_t dir);
     void    GetSortedNeighbors(Int_t indices[6]);
+    void    Init();
 
     void  Draw(Option_t *option="");
@@ -91 +92 @@
 public:
     MagicDomino();
+    MagicDomino(const MGeomCam &geom);
     ~MagicDomino();
 

trunk/MagicSoft/Mars/mtools/MagicJam.h

@@ -41 +41 @@
     void  SetAutoScale() { }
     void  SetMinMax(Double_t min=-1111, Double_t max=-1111) { SetMinimum(min); SetMaximum(max); }
+    TH1  *ShowBackground(Int_t niter=2, Option_t *option="same") { return 0; }
+    Int_t ShowPeaks(Double_t sigma=2, Option_t *option="", Double_t threshold=0.05) { return 0; }
+    void  SetErrorSpread(Bool_t f=kTRUE) { }
 
     // Make the full pad sensible for the context menu

trunk/MagicSoft/Mars/mtools/MagicReversi.cc

@@ -181 +181 @@
 }
 
-// ------------------------------------------------------------------------
-//
-//  default constructor
-//
-MagicReversi::MagicReversi()
-    : fGeomCam(NULL), fDone(NULL), fW(0), fH(0), fDrawingPad(NULL), fIsAllocated(kFALSE)
-{
-    SetNewCamera(new MGeomCamMagic);
-
+void MagicReversi::Init()
+{
     //
     // Make sure, that the object is destroyed when the canvas/pad is
@@ -201 +194 @@
 
     Draw();
+}
+
+// ------------------------------------------------------------------------
+//
+//  default constructor
+//
+MagicReversi::MagicReversi()
+    : fGeomCam(NULL), fDone(NULL), fW(0), fH(0), fDrawingPad(NULL), fIsAllocated(kFALSE)
+{
+    SetNewCamera(new MGeomCamMagic);
+
+    Init();
+}
+
+MagicReversi::MagicReversi(const MGeomCam &geom)
+    : fGeomCam(NULL), fDone(NULL), fW(0), fH(0), fDrawingPad(NULL), fIsAllocated(kFALSE)
+{
+    SetNewCamera(static_cast<MGeomCam*>(geom.Clone()));
+
+    Init();
 }
 

trunk/MagicSoft/Mars/mtools/MagicReversi.h

@@ -70 +70 @@
     void  DrawHexagons();
     void  Free();
+    void  Init();
 
     Bool_t Flip(Int_t idx, Bool_t flip);
@@ -83 +84 @@
 public:
     MagicReversi();
+    MagicReversi(const MGeomCam &geom);
     ~MagicReversi();
 

trunk/MagicSoft/Mars/mtools/MagicShow.cc

@@ -167 +167 @@
 }
 
-// ------------------------------------------------------------------------
-//
-//  default constructor
-//
-MagicShow::MagicShow()
-    : fTimer(this, 250, kTRUE), fGeomCam(NULL), fNumPixel(-1), fAuto(kTRUE), fW(0), fH(0)
-{
-    SetNewCamera(new MGeomCamMagic);
-
+void MagicShow::Init()
+{
     memset(fText, 0, sizeof(fText));
 
@@ -189 +182 @@
 
     fTimer.TurnOn();
+}
+
+// ------------------------------------------------------------------------
+//
+//  default constructor
+//
+MagicShow::MagicShow()
+    : fTimer(this, 250, kTRUE), fGeomCam(NULL), fNumPixel(-1), fAuto(kTRUE), fW(0), fH(0)
+{
+    SetNewCamera(new MGeomCamMagic);
+    Init();
+}
+
+// ------------------------------------------------------------------------
+//
+//  default constructor
+//
+MagicShow::MagicShow(const MGeomCam &geom)
+    : fTimer(this, 250, kTRUE), fGeomCam(NULL), fNumPixel(-1), fAuto(kTRUE), fW(0), fH(0)
+{
+    SetNewCamera(static_cast<MGeomCam*>(geom.Clone()));
+    Init();
 }
 

trunk/MagicSoft/Mars/mtools/MagicShow.h

@@ -58 +58 @@
     void   SetNewCamera(MGeomCam *);
     void   ChangePixel(Int_t add);
+    void   Init();
 
     Bool_t HandleTimer(TTimer *timer);
@@ -67 +68 @@
 public:
     MagicShow();
+    MagicShow(const MGeomCam &geom);
     ~MagicShow();
 

trunk/MagicSoft/Mars/mtools/MagicSnake.cc

@@ -153 +153 @@
 }
 
-// ------------------------------------------------------------------------
-//
-//  default constructor
-//
-MagicSnake::MagicSnake()
-    : fTimer(this, 500, kTRUE), fGeomCam(NULL), fDone(NULL), fPaused(NULL), fW(0), fH(0)
-{
-    SetNewCamera(new MGeomCamMagic);
-
+void MagicSnake::Init()
+{
     //
     // Make sure, that the object is destroyed when the canvas/pad is
@@ -175 +168 @@
 
     fTimer.TurnOn();
+}
+
+// ------------------------------------------------------------------------
+//
+//  default constructor
+//
+MagicSnake::MagicSnake()
+    : fTimer(this, 500, kTRUE), fGeomCam(NULL), fDone(NULL), fPaused(NULL), fW(0), fH(0)
+{
+    SetNewCamera(new MGeomCamMagic);
+    Init();
+}
+
+// ------------------------------------------------------------------------
+//
+//  default constructor
+//
+MagicSnake::MagicSnake(const MGeomCam &geom)
+    : fTimer(this, 500, kTRUE), fGeomCam(NULL), fDone(NULL), fPaused(NULL), fW(0), fH(0)
+{
+    SetNewCamera(static_cast<MGeomCam*>(geom.Clone()));
+    Init();
 }
 

trunk/MagicSoft/Mars/mtools/MagicSnake.h

@@ -82 +82 @@
     void   SetWormColor();
     void   Pause(Bool_t yes=kTRUE);
+    void   Init();
 
     Bool_t HandleTimer(TTimer *timer);
@@ -91 +92 @@
 public:
     MagicSnake();
+    MagicSnake(const MGeomCam &geom);
     ~MagicSnake();
 

trunk/MagicSoft/Mars/mtools/MineSweeper.cc

@@ -175 +175 @@
 }
 
-// ------------------------------------------------------------------------
-//
-//  default constructor
-//
-MineSweeper::MineSweeper()
-    : fGeomCam(NULL), fDone(NULL), fShow(NULL), fW(0), fH(0), fDrawingPad(NULL), fIsAllocated(kFALSE)
-{
-    SetNewCamera(new MGeomCamMagic);
-
+void MineSweeper::Init()
+{
     //
     // Make sure, that the object is destroyed when the canvas/pad is
@@ -193 +186 @@
 
     Draw();
+}
+
+// ------------------------------------------------------------------------
+//
+//  default constructor
+//
+MineSweeper::MineSweeper()
+    : fGeomCam(NULL), fDone(NULL), fShow(NULL), fW(0), fH(0), fDrawingPad(NULL), fIsAllocated(kFALSE)
+{
+    SetNewCamera(new MGeomCamMagic);
+    Init();
+}
+
+MineSweeper::MineSweeper(const MGeomCam &geom)
+    : fGeomCam(NULL), fDone(NULL), fShow(NULL), fW(0), fH(0), fDrawingPad(NULL), fIsAllocated(kFALSE)
+{
+    SetNewCamera(static_cast<MGeomCam*>(geom.Clone()));
+    Init();
 }
 

trunk/MagicSoft/Mars/mtools/MineSweeper.h

@@ -60 +60 @@
     void  DrawHexagons();
     void  Free();
+    void  Init();
 
     void  Paint(Option_t *option="");
@@ -68 +69 @@
 public:
     MineSweeper();
+    MineSweeper(const MGeomCam &geom);
     ~MineSweeper();