Changeset 8283 for trunk

Timestamp:

02/01/07 12:49:29 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MStatusArray.cc (modified) (2 diffs)
• MStatusArray.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -247 +247 @@
 // --------------------------------------------------------------------------
 //
+// Make sure that kCanDelete is properly set for all directly contained
+// objects. Some kCanDelete bits might not be properly set or get lost when
+// the MParContainer is stored.
+//
+void MStatusArray::SetCanDelete(const TCollection *list) const
+{
+    TIter Next(list);
+    TObject *o=0;
+    while ((o=Next()))
+    {
+        if (o->InheritsFrom(TVirtualPad::Class()))
+            SetCanDelete(((TVirtualPad*)o)->GetListOfPrimitives());
+        else
+            o->SetBit(kCanDelete);
+    }
+}
+
+// --------------------------------------------------------------------------
+//
 // Switch off adding histograms to current directory before reading.
 // Switch back
@@ -252 +271 @@
 Int_t MStatusArray::Read(const char *name)
 {
+    // It seems that the contents are not properly deleted by TObjArray::Read
+    Delete();
+
+    // Make sure newly read histograms are not added to the current directory
     const Bool_t store = TH1::AddDirectoryStatus();
     TH1::AddDirectory(kFALSE);
     const Int_t rc = TObjArray::Read(name?name:"MStatusDisplay");
     TH1::AddDirectory(store);
+
+    // Make sure that all kCanDelete bits are properly set
+    SetCanDelete(this);
+
     return rc;
 }

trunk/MagicSoft/Mars/mbase/MStatusArray.h

@@ -15 +15 @@
 {
 private:
+    void     SetCanDelete(const TCollection *list) const;
     void     PrintObjectsInPad(const TCollection *list, const TString &name, Int_t lvl=0) const;
     TObject *FindObjectInPad(TVirtualPad *pad, const char *object, TClass *base) const;