Changeset 9571 for trunk/MagicSoft/Mars/mbase/MStatusArray.cc

Timestamp:

04/19/10 13:11:19 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MStatusArray.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -49 +49 @@
 #include <TCanvas.h>
 
+#include <TGraph.h>           // For the TGraph workaround
+#include <TPaveText.h>        // For the TPaveText workaround
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -56 +59 @@
 
 ClassImp(MStatusArray);
-
-#include <TGraph.h>
 
 using namespace std;
@@ -77 +78 @@
 // name) recuresively
 //
-#include<TPaveText.h>
 void MStatusArray::RecursiveDelete(TVirtualPad *p, const char id) const
 {
@@ -98 +98 @@
                 continue;
 
+            /*
+            // This is necessary because the histogram can get deleted
+            // but is not treated in TGraph recursive remove. Unfortunately,
+            // we have no possibility to find out whether it was already
+            // deleted. Fortunately these histograms don't contain data
+            // and threfore don't consume memory.
+            TGraph *g = dynamic_cast<TGraph*>(o);
+            if (g)
+                g->SetHistogram(0);
+             */
+
             delete o;
 
@@ -153 +164 @@
         if (dynamic_cast<TGraph*>(o))
         {
+            // FIXME: This should not be called for the TGraph
+            // which is currently getting deleted.
             TGraph *g = static_cast<TGraph*>(o);
             if (g->GetHistogram()==obj)
                 g->SetHistogram(0);
+            else
+                g->GetHistogram()->SetBit(kMustCleanup);
 
             continue;
@@ -175 +190 @@
     TObjArray::RecursiveRemove(obj);
 
+    // FIXME: Maybe we still have to call SetBit(kMustCleanup) ???
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,26,00)
     TObject *o = 0;
 
@@ -180 +197 @@
     while ((o=Next()))
         RecursiveRemove(dynamic_cast<TVirtualPad*>(o), obj);
+#endif
 }