Changeset 2058 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/05/03 10:37:08 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (2 diffs)
• MLog.cc (modified) (10 diffs)
• MLog.h (modified) (5 diffs)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -108 +108 @@
     fName = name;
 
-    *fLog << inf << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOTVER << endl;
+    fLog->Underline();
+    *fLog << inf << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOTVER << "\033[0m" << endl;
 }
 
@@ -240 +241 @@
             return kTRUE;
         default:
+            *fLog << warn << "MEvtloop: fDisplay->ChecStatus() has returned unknown status #" << fDisplay->CheckStatus() << "... cleared." << endl;
             fDisplay->ClearStatus();
-            *fLog << warn << "Display shows unknown status... cleared." << endl;
             break;
         }

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -80 +80 @@
 #include <pthread.h>
 #endif
-#include <TGListBox.h>
+#include <TGTextView.h>
 
 #include "MLogManip.h"
@@ -133 +133 @@
 // which is used for the output (i)
 //
-MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fIsNull(kFALSE), fGuiLineId(0), fout(NULL), fOutAllocated(kFALSE), fgui(NULL), fNumLines(0)
+MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fIsNull(kFALSE), fout(NULL), fOutAllocated(kFALSE), fgui(NULL), fNumLines(0)
 {
     Init();
@@ -143 +143 @@
 // ofstream as the default output device
 //
-MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGuiLineId(0),  fout(&out), fOutAllocated(kFALSE), fgui(NULL), fNumLines(0)
+MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fout(&out), fOutAllocated(kFALSE), fgui(NULL), fNumLines(0)
 {
     Init();
@@ -151 +151 @@
 //
 // default constructor which initializes the streamer and sets the given
-// TGListBox as the default output device
-//
-MLog::MLog(TGListBox &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fGuiLineId(0),  fout(NULL), fOutAllocated(kFALSE), fgui(&out), fNumLines(0)
+// TGTextView as the default output device
+//
+MLog::MLog(TGTextView &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fout(NULL), fOutAllocated(kFALSE), fgui(&out), fNumLines(0)
 {
     Init();
@@ -164 +164 @@
 // or not.
 //
-MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGuiLineId(0),  fgui(NULL), fNumLines(0)
+MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fgui(NULL), fNumLines(0)
 {
     Init();
@@ -193 +193 @@
     fDebugLevel  = log.fDebugLevel;
     fDevice      = log.fDevice;
+}
+
+void MLog::Underline()
+{
+    if (fDevice&eStdout)
+        cout << kUnderline;
+
+    if (fDevice&eStderr)
+        cerr << kUnderline;
 }
 
@@ -272 +281 @@
 }
 
+#include <TVirtualX.h>
 void MLog::UpdateGui()
 {
@@ -279 +289 @@
     // lock mutex
     Lock();
+
+    TGText &txt=*fgui->GetText();
 
     // copy lines to TGListBox
@@ -285 +297 @@
         // Replace all tabs by 7 white spaces
         fGuiLines[i]->ReplaceAll("\t", "       ");
-        fgui->AddEntry(*fGuiLines[i], fGuiLineId++);
+        txt.InsText(TGLongPosition(0, txt.RowCount()), *fGuiLines[i]);
         delete fGuiLines[i];
     }
@@ -292 +304 @@
     fNumLines=0;
 
-    // cut list box top 1000 lines
-    fgui->RemoveEntries(0, fGuiLineId-1000);
+    // cut text box top 1000 lines
+    while (txt.RowCount()>1000)
+        txt.DelLine(0);
+
     // show last entry
-    fgui->SetTopEntry(fGuiLineId-1);
+    fgui->Layout();
+    fgui->SetVsbPosition(txt.RowCount()-1);
+
     // tell a main loop, that list box contents have changed
     fgui->SetBit(kHasChanged);

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -18 +18 @@
 
 
-class TGListBox;
+class TGTextView;
 
 class MLog : public streambuf, public ostream, public TObject
@@ -54 +54 @@
     Bool_t fIsNull;           //! Switch output completely off
 
-    Int_t fGuiLineId;         //!
-
-    ofstream  *fout;          //! possible file output stream
-    Bool_t     fOutAllocated; //! flag if fout is created by MLogging
-    TGListBox *fgui;          //! Listbox output
+    ofstream   *fout;          //! possible file output stream
+    Bool_t      fOutAllocated; //! flag if fout is created by MLogging
+    TGTextView *fgui;          //! Text View output
 
     Bool_t     fIsDirectGui;  //! Pipe text directly to the GUI (for single threaded environments)
@@ -84 +82 @@
     MLog(int i=eStdout);
     MLog(ofstream &out);
-    MLog(TGListBox &out);
+    MLog(TGTextView &out);
     MLog(const char *fname, int flag=-1);
 
@@ -97 +95 @@
     void UpdateGui();
 
+    void Underline();
+
     void SetDebugLevel(int i)           { fDebugLevel  =  i;  }
     int  GetDebugLevel() const          { return fDebugLevel; }
@@ -104 +104 @@
     void DisableOutputDevice(Flags_t f) { fDevice     &= ~f;  }
     void operator=(ofstream &out)       { SetOutputFile(out); }
-    void operator=(TGListBox *out)      { SetOutputGui(out);  }
+    void operator=(TGTextView *out)     { SetOutputGui(out);  }
 
     Bool_t IsOutputDeviceEnabled(int i) const { return fDevice & i; }
 
-    void SetOutputGui(TGListBox *out, int flag=-1)
+    void SetOutputGui(TGTextView *out, int flag=-1)
     {
         fgui = out;