Changeset 9038 for trunk/MagicSoft/Mars/mbase

Timestamp:

07/23/08 11:11:13 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MStatusDisplay.cc (modified) (4 diffs)
• MStatusDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -780 +780 @@
 MStatusDisplay::~MStatusDisplay()
 {
+    fTimer.Stop();
+
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,10,01)
     fTab = NULL; // See HandleEvent
@@ -959 +961 @@
     c->cd();
     return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the number of user added tabs (not that in batch mode this
+// exclude tabs without a canvas)
+//
+Int_t MStatusDisplay::GetNumTabs() const
+{
+    return gROOT->IsBatch() ? fBatch->GetEntries() : fTab->GetNumberOfTabs()-1;
 }
 
@@ -2249 +2261 @@
 
 
-    cout << "Display done." << endl;
-
     if (n==0)
         return list.GetEntries();
@@ -2683 +2693 @@
         // deletion
         //
-        const Bool_t store = c->IsBatch();
-
-        c->SetBatch(kTRUE);
+        //const Bool_t store = c->IsBatch();
+        //c->SetBatch(kTRUE);
         c->Paint();
-        c->SetBatch(store);
+        //c->SetBatch(store);
 
         //
         // Use the canvas as coordinate system for the overlaying text
         //
-        gPad = c;
-        //n->cd();
-
         const Double_t height = 0.015;
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -196 +196 @@
      TObject *FindObject(const TObject *) const { return 0;  }
 
+     Int_t GetNumTabs() const;
+
      void PrintContent(Option_t *o="") const;