Changeset 2215 for trunk/MagicSoft/Mars/mmain

Timestamp:

06/23/03 13:59:48 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

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

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -504 +504 @@
     fFont = gVirtualX->LoadQueryFont("7x13bold");
 
-    fBatch.SetOwner();
+    fBatch = new TList;
+    fBatch->SetOwner();
 
     //
@@ -563 +564 @@
 
     delete fList;
+    delete fBatch;
 
     if (fFont)
@@ -605 +607 @@
 {
     if (gROOT->IsBatch())
-        return (TCanvas*)fBatch.At(i-1);
+        return (TCanvas*)fBatch->At(i-1);
 
     if (i<0 || i>=fTab->GetNumberOfTabs())
@@ -672 +674 @@
     {
         TCanvas *c = new TCanvas(name, name);
-        fBatch.Add(c);
+        fBatch->Add(c);
         return *c;
     }
@@ -832 +834 @@
 {
     if (gROOT->IsBatch())
-        return (Bool_t)fBatch.FindObject(c);
+        return (Bool_t)fBatch->FindObject(c);
 
     for (int i=1; i<fTab->GetNumberOfTabs(); i++)
@@ -1341 +1343 @@
         return 0;
     }
-    if (gROOT->IsBatch() && num>fBatch.GetSize())
+    if (gROOT->IsBatch() && num>fBatch->GetSize())
     {
         *fLog << warn << "MStatusDisplay::Write: Tab doesn't exist... skipped." << endl;
@@ -1349 +1351 @@
     TObjArray list;
 
-    const Int_t max  = gROOT->IsBatch() ? fBatch.GetSize()+1 : fTab->GetNumberOfTabs();
+    const Int_t max  = gROOT->IsBatch() ? fBatch->GetSize()+1 : fTab->GetNumberOfTabs();
     const Int_t from = num<0 ?   1 : num;
     const Int_t to   = num<0 ? max : num+1;
@@ -1447 +1449 @@
 {
     if (gROOT->IsBatch())
-        return num>0 && num<=fBatch.GetSize() || num<0;
+        return num>0 && num<=fBatch->GetSize() || num<0;
 
     if (num>=fTab->GetNumberOfTabs())
@@ -1573 +1575 @@
     // Maintain tab numbers
     //
-    const Int_t max  = gROOT->IsBatch() ? fBatch.GetSize()+1 : fTab->GetNumberOfTabs();
+    const Int_t max  = gROOT->IsBatch() ? fBatch->GetSize()+1 : fTab->GetNumberOfTabs();
     const Int_t from = num<0 ?   1 : num;
     const Int_t to   = num<0 ? max : num+1;

trunk/MagicSoft/Mars/mmain/MStatusDisplay.h

@@ -75 +75 @@
     UInt_t fIsLocked;
 
-    TList fBatch;
+    TList *fBatch;          //!
 
     void AddMenuBar();