Changeset 9519 for trunk/MagicSoft/Mars/mbase

Timestamp:

10/26/09 15:13:28 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MStatusArray.cc (modified) (4 diffs)
• MStatusArray.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -72 +72 @@
 // --------------------------------------------------------------------------
 //
+// Remove objects matching the id (the first character of their class
+// name) recuresively
+//
+void MStatusArray::RecursiveDelete(TVirtualPad *p, const char id) const
+{
+    if (!p)
+        return;
+
+    TIter Next2(p->GetListOfPrimitives());
+    TObject *o=0;
+    while ((o=Next2()))
+    {
+        if (!dynamic_cast<TVirtualPad*>(o) && (o->ClassName()[0]==id || id==0))
+            delete p->GetListOfPrimitives()->Remove(o);
+        else
+            RecursiveDelete(dynamic_cast<TVirtualPad*>(o), id);
+    }
+
+}
+
+// --------------------------------------------------------------------------
+//
+// Make sure to set the kMustCleanup for all object in our tree
+// which will later be deleted when the array is destructed.
+//
+void MStatusArray::SetCleanup(TObject *obj) const
+{
+    if (!obj)
+        return;
+
+    TVirtualPad *pad = dynamic_cast<TVirtualPad*>(obj);
+
+    // Do not set the bit for pads because it would end in
+    // endless recursions
+    if (pad && !dynamic_cast<TCanvas*>(obj))
+        obj->ResetBit(kMustCleanup);
+    else
+        obj->SetBit(kMustCleanup);
+
+    if (!pad)
+        return;
+
+    TIter Next(pad->GetListOfPrimitives());
+    TObject *o=0;
+    while ((o=Next()))
+        SetCleanup(o);
+}
+
+// --------------------------------------------------------------------------
+//
+// Try to do a delete of the whole list in a way which is less vulnarable
+// to double deletion due to wrongly set bits or other things
+//
+void MStatusArray::Delete(Option_t *)
+{
+    // Add this to the list of cleanups to ensure as many cleaning
+    // operations as possible are propagated
+    gROOT->GetListOfCleanups()->Add(this);
+
+    // First make sure that all kMustCleanup bits are se
+    TIter Next(this);
+    TObject *o=0;
+    while ((o=Next()))
+        SetCleanup(o);
+
+    // Now delete the MARS object first because we have full control
+    // of them
+    TIter Next2(this);
+    while ((o=Next2()))
+        RecursiveDelete(dynamic_cast<TVirtualPad*>(o), 'M');
+
+    // Now delete all root objects
+    TIter Next3(this);
+    while ((o=Next3()))
+        RecursiveDelete(dynamic_cast<TVirtualPad*>(o));
+
+    // And delete all the rest
+    TObjArray::Delete();
+
+    // Remove it from the list again
+    gROOT->GetListOfCleanups()->Remove(this);
+}
+
+// --------------------------------------------------------------------------
+//
 // If o==NULL a new status display is created, otherwise the one with name o
 // is searched in gROOT->GetListOfSpecials().
@@ -335 +420 @@
 }
 
+MStatusArray::~MStatusArray()
+{
+    // This is the destructor from TObjArray...
+    // It must be here, because for some reason I don't know it
+    // is otherwise not correctly executed from the Interpreter
+    // (root 5.12/00f)
+    if (IsOwner())
+        Delete();
+
+    TStorage::Dealloc(fCont);
+
+    fCont = 0;
+    fSize = 0;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -344 +444 @@
     // It seems that the contents are not properly deleted by TObjArray::Read
     Delete();
+
+    SetOwner();
 
     const TString keyname = name?name:"MStatusDisplay";
@@ -372 +474 @@
             TObject *o2=0;
             while ((o2=Next2()))
-                if (o2->InheritsFrom("MParContainer"))
+                if (o2->InheritsFrom(MParContainer::Class()))
                     o2->SetBit(kCanDelete);
         }

trunk/MagicSoft/Mars/mbase/MStatusArray.h

@@ -19 +19 @@
     };
 
+    void     SetCleanup(TObject *obj) const;
+    void     RecursiveDelete(TVirtualPad *p, const char id=0) const;
+
     void     SetCanDelete(const TCollection *list) const;
     void     SetMyCanDelete(const TCollection *list) const;
@@ -28 +31 @@
     MStatusArray() : TObjArray() { }
     MStatusArray(const MStatusDisplay &d);
+    ~MStatusArray();
 
     TObject *DisplayIn(Option_t *o=0) const;         // *MENU*
@@ -56 +60 @@
 
     void EnableTH1Workaround(const TCollection *list=0) const;
+    void Delete(Option_t *option="");
 
     ClassDef(MStatusArray, 0) // Helper class for status display