Changeset 2784 for trunk/MagicSoft

Timestamp:

01/13/04 15:41:12 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/BaseLinkDef.h (modified) (5 diffs)
• mbase/MLog.cc (modified) (6 diffs)
• mbase/MLog.h (modified) (3 diffs)
• mbase/MLogHtml.cc (added)
• mbase/MLogHtml.h (added)
• mbase/MLogPlugin.cc (added)
• mbase/MLogPlugin.h (added)
• mbase/Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
      - added check of whether input file is a MC file before executing 
        the PreProcess.
+
+
 
  2004/01/13: Wolfgang Wittek
@@ -67 +69 @@
      - replaced MPedestalCam by MPedPhotCam
      - removed some obsolete includes
+
+   * mbase/BaseLinkDef.h, mbase/Makefile:
+     - added MLogPlugin
+     - added MLogHtml
+
+   * mbase/MLog.[h,cc]:
+     - added use of plugins
+
+   * mbase/MLogPlugin.[h,cc], mbase/MLogHtml.[h,cc]:
+     - added
 
 

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
+// Global constants
 #pragma link C++ enum ParticleId_t;
 
@@ -11 +12 @@
 //#pragma link C++ global kPI;
 
+// Logging
 #pragma link C++ global gLog;
 
 #pragma link C++ class MLog+;
+#pragma link C++ class MLogPlugin+;
+#pragma link C++ class MLogHtml+;
+
+// Basic Network Tools
 #pragma link C++ class MReadSocket+;
 
+// Basic Tools
 #pragma link C++ class MIter+;
 #pragma link C++ class MAstro+;
 #pragma link C++ class MDirIter+;
+
+// Mars core
+#pragma link C++ class MInputStreamID+;
+
+#pragma link C++ class MParContainer+;
+#pragma link C++ class MParList+;
 
 #pragma link C++ class MTask+;
@@ -24 +37 @@
 #pragma link C++ class MTaskList+;
 
-#pragma link C++ class MParContainer+;
-#pragma link C++ class MParList+;
-
 #pragma link C++ class MFilter+;
 
 #pragma link C++ class MEvtLoop+;
 
+// Mars core (GUI part)
 #pragma link C++ class MStatusDisplay+;
 #pragma link C++ class MProgressBar+;
 #pragma link C++ class MSearch+;
-
-#pragma link C++ class MInputStreamID+;
 
 #pragma link C++ class MGTask+;
@@ -41 +50 @@
 #pragma link C++ class MGGroupFrame+;
 
-#pragma link C++ class MClone+;
-#pragma link C++ class MPrint+;
-#pragma link C++ class MContinue+;
-
+// Basic containers
 #pragma link C++ class MArray;
 #pragma link C++ class MArrayB;
@@ -55 +61 @@
 #pragma link C++ class MArgsEntry+;
 
+// Tool tasks
+#pragma link C++ class MClone+;
+#pragma link C++ class MPrint+;
+#pragma link C++ class MContinue+;
+
 #endif

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -100 +100 @@
 #include <iomanip>
 
+#include <TROOT.h>      // gROOT->GetListOfCleanups()
+
 #ifdef _REENTRANT
 #include <TMutex.h>
 #endif
 #include <TGTextView.h>
+
+#include "MLogPlugin.h"
 
 ClassImp(MLog);
@@ -140 +144 @@
 void MLog::Init()
 {
-    setp(&fBuffer, &fBuffer+1);
-    *this << '\0';
-
-#ifdef _REENTRANT
+
     //
     // Creat drawing semaphore
     //
+#ifdef _REENTRANT
     fMuxGui = new TMutex;
 #endif
+
+    fPlugins = new TList;
+    gROOT->GetListOfCleanups()->Add(fPlugins);
+
+    setp(&fBuffer, &fBuffer+1);
+    *this << '\0';
 }
 
@@ -202 +210 @@
 {
     DeallocateFile();
+
+    delete fPlugins;
 #ifdef _REENTRANT
     delete fMuxGui;
@@ -223 +233 @@
 {
     SetBit(kIsUnderlined);
+
+    fPlugins->ForEach(MLogPlugin, Underline)();
 
     if (TestBit(eNoColors))
@@ -311 +323 @@
         fOut->write(fBase, len);
 
+    fPlugins->ForEach(MLogPlugin, SetColor)(fOutputLevel);
+    fPlugins->ForEach(MLogPlugin, WriteBuffer)(fBase, len);
+
     if (fDevice&eGui && fGui)
     {
@@ -490 +505 @@
     flag ? EnableOutputDevice(chk) : DisableOutputDevice(chk);
 }
+
+// --------------------------------------------------------------------------
+//
+// Add a plugin to which the output should be redirected, eg. MLogHtml
+// The user has to take care of its deletion. If the plugin is deleted
+// (and the kMustCleanup bit was not reset accidentaly) the plugin
+// is automatically removed from the list of active plugins.
+//
+void MLog::AddPlugin(MLogPlugin *plug)
+{
+    fPlugins->Add(plug);
+    plug->SetBit(kMustCleanup);
+}

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -15 +15 @@
 class TMutex;
 class TGTextView;
+
+class MLogPlugin;
 
 class MLog : public std::streambuf, public std::ostream, public TObject
@@ -71 +73 @@
 #endif
 
+    TList *fPlugins;
+
     void Init();
 
@@ -192 +196 @@
     }
 
+    void AddPlugin(MLogPlugin *plug);
+
     ClassDef(MLog, 0) // This is what we call 'The logging system'
 };

trunk/MagicSoft/Mars/mbase/Makefile

@@ -34 +34 @@
 
 SRCFILES = MLogo.cc \
-           MLog.cc \
            MArgs.cc \
            MAstro.cc \
-           MParContainer.cc \
+           MLog.cc \
+           MLogManip.cc \
+           MLogPlugin.cc \
+           MLogHtml.cc \
+           MParContainer.cc \
            MParList.cc \
            MInputStreamID.cc \
@@ -62 +65 @@
            MClone.cc \
            MContinue.cc \
-           MPrint.cc \
-           MLogManip.cc
+           MPrint.cc
 
 SRCS    = $(SRCFILES)