Changeset 2411 for trunk

Timestamp:

10/20/03 17:54:03 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MParContainer.cc (modified) (2 diffs)
• mbase/MParContainer.h (modified) (1 diff)
• mgui/MCamEvent.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -584 +584 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// DrawTS which is a thread safe version of Draw. Draw
+// are also overwritten to call DrawTS. Please overwrite
+// the TS version of the member function if you want to implement
+// Draw for your class. Classes which overwrites Draw instead
+// should work well, too, except in multithreaded environments like Mona.
+//
+// The static version maybe called dor any TObject. For you class it is
+// called with a pointer to 'this' object.
+//
 void MParContainer::DrawTS(TObject *obj, TVirtualPad *pad, Option_t *option)
 {
@@ -616 +627 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// DrawCloneTS which is a thread safe version of DrawClone. DrawClone
+// are also overwritten to call DrawCloneTS. Please overwrite
+// the TS version of the member function if you want to implement
+// DrawClone for your class. Classes which overwrites DrawClone instead
+// should work well, too, except in multithreaded environments like Mona
+//
+// The static version maybe called dor any TObject. For you class it is
+// called with a pointer to 'this' object.
+//
 TObject *MParContainer::DrawCloneTS(const TObject *obj, TVirtualPad *pad, Option_t *option)
 {

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -129 +129 @@
     const char *GetEnvValue(const TEnv &env, TString prefix, const char *dflt) const;
 
+    static  void DrawTS(TObject *obj, TVirtualPad *pad=NULL, Option_t *option="");
+    virtual void DrawTS(TVirtualPad *pad=NULL, Option_t *option="")
+    {
+        DrawTS(this, pad, option);
+    }
+    void Draw(Option_t *option="") { DrawTS(NULL, option); }
+
+    static  TObject *DrawCloneTS(const TObject *obj, TVirtualPad *pad=NULL, Option_t *option="");
+    virtual TObject *DrawCloneTS(TVirtualPad *pad=NULL, Option_t *option="") const
+    {
+        return DrawCloneTS(this, pad, option);
+    }
+    TObject *DrawClone(Option_t *option="") const
+    {
+        return DrawCloneTS(NULL, option);
+    }
+
     ClassDef(MParContainer, 0)  //The basis for all parameter containers
 };

trunk/MagicSoft/Mars/mgui/MCamEvent.h

@@ -12 +12 @@
 public:
     virtual Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const = 0;
-    virtual void   DrawPixelContent(Int_t num) const = 0;
+    virtual void   DrawPixelContent(Int_t num, TVirtualPad *pad=NULL) const = 0;
 
     ClassDef(MCamEvent, 0) // A camera event