Changeset 8965 for trunk/MagicSoft/Mars/mbase

Timestamp:

06/16/08 15:58:28 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MLog.cc (modified) (4 diffs)
• MStatusDisplay.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.60 2008-06-14 15:55:50 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.61 2008-06-16 14:58:27 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -832 +832 @@
     gLog << std::flush;
 
+    const Int_t store = gLog.GetOutputLevel();
+
     if (level >= kInfo)
        gLog << inf;
@@ -842 +844 @@
 
     gLog << std::flush;
+
+    gLog.SetOutputLevel(store);
     if (!abort)
         return;
@@ -848 +852 @@
     if (gSystem) {
         gSystem->StackTrace();
+        gLog.SetOutputLevel(store);
         gSystem->Abort();
-    } else
+    }
+    else
+    {
+        gLog.SetOutputLevel(store);
         ::abort();
+    }
 }
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1048 +1048 @@
         TCanvas *c = new TCanvas("", title?title:"", -cw, ch);
         c->SetName(name);
+        c->SetFillColor(10); // White
+        c->SetFrameBorderMode(0);
+        c->SetBorderMode(0);
         fBatch->Add(c);
 
@@ -1062 +1065 @@
 
     // create root embedded canvas and add it to the tab
-    TRootEmbeddedCanvas *ec = new TRootEmbeddedCanvas(name, f, f->GetWidth(), f->GetHeight(), 0);
+    TRootEmbeddedCanvas *ec = new TRootEmbeddedCanvas(name, f, f->GetWidth(), f->GetHeight(), kSunkenFrame);
     f->AddFrame(ec, fLayCanvas);
     fList->Add(ec);
@@ -1072 +1075 @@
         c.SetTitle(title);
 
-    c.SetFillColor(16/*165*//*17*//*203*/);
+    c.SetFillColor(10); // White
     c.SetFrameBorderMode(0);
     c.SetBorderMode(0);