Changeset 2416 for trunk/MagicSoft/Mars/mbase/MParContainer.cc

Timestamp:

10/20/03 21:32:30 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParContainer.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -114 +114 @@
 TObject *MParContainer::Clone(const char *newname) const
 {
+
    MParContainer *named = (MParContainer*)TObject::Clone();
    if (newname && strlen(newname)) named->SetName(newname);
@@ -583 +584 @@
     return ((TEnv&)env).GetValue(prefix, dflt);
 }
-
-// --------------------------------------------------------------------------
-//
-// 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)
-{
-    if (!obj)
-    {
-        gLog << warn << "MParContainer::DrawTS: obj==NULL" << endl;
-        return;
-    }
-
-    if (!pad)
-        pad = gPad;
-
-    // FIXME: Move MH to mbase
-    //if (!pad)
-    //    pad = MakeDefCanvas(this);
-
-    if (!pad)
-    {
-        if (!gROOT->GetMakeDefCanvas())
-            return;
-        (gROOT->GetMakeDefCanvas())();
-        pad = gPad;
-    }
-
-    if (!pad->IsEditable())
-        return;
-
-    obj->SetBit(kMustCleanup);
-
-    pad->GetListOfPrimitives()->Add(obj, option);
-    pad->Modified(kTRUE);
-}
-
-// --------------------------------------------------------------------------
-//
-// 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)
-{
-    // Draw a clone of this object in the current pad
-    if (!obj)
-        return 0;
-
-    TObject *newobj = obj->Clone();
-    if (!newobj)
-        return 0;
-
-    /*
-     gLog << dbg << "MParConatiner::DrawCloneTS - ";
-     gLog << (int)newobj->InheritsFrom(MParContainer::Class()) << " ";
-     gLog << pad << endl;
-     */
-    if (newobj->InheritsFrom(MParContainer::Class()))
-        ((MParContainer*)newobj)->DrawTS(pad, strlen(option) ? option : obj->GetDrawOption());
-    else
-        DrawTS(newobj, pad, strlen(option) ? option : obj->GetDrawOption());
-
-    return newobj;
-}