Changeset 2580 for trunk/MagicSoft/Mars/mbase

Timestamp:

12/01/03 18:20:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MPrint.cc (modified) (3 diffs)
• MPrint.h (modified) (1 diff)
• MTime.cc (modified) (2 diffs)
• MTime.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MPrint.cc

@@ -62 +62 @@
 }
 
+MPrint::MPrint()
+{
+    Init(0, 0);
+    SetBit(kSeperator);
+}
+
 // --------------------------------------------------------------------------
 //
@@ -112 +118 @@
     // The pointer is already given by the user.
     //
-    if (fObject)
+    if (fObject || TestBit(kSeperator))
         return kTRUE;
 
@@ -144 +150 @@
 Int_t MPrint::Process()
 {
-    fObject->Print(fOption);
+    if (TestBit(kSeperator))
+        gLog << endl << setfill('-') << setw(72) << "-" << endl << endl;
+    else
+        fObject->Print(fOption);
     return kTRUE;
 } 

trunk/MagicSoft/Mars/mbase/MPrint.h

@@ -15 +15 @@
     TString fOption;         // Print option
 
-    enum { kSkip = BIT(14) };
+    enum { kSkip = BIT(14), kSeperator = BIT(15) };
 
     void Init(const char *name, const char *title);
 
 public:
+    MPrint();
     MPrint(const char *obj,    const char *option="", const char *name=NULL, const char *title=NULL);
     MPrint(const TObject *obj, const char *option="", const char *name=NULL, const char *title=NULL);

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -43 +43 @@
 #include <iomanip>
 
+#include <TTime.h>
+
 #include "MLog.h"
 
@@ -48 +50 @@
 
 using namespace std;
+
+void MTime::SetTime(const TTime &t)
+{
+    SetTime((ULong_t)t);
+}
 
 void MTime::Print(Option_t *) const

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -14 +14 @@
 #endif
 
+class TTime;
+
 class MTime : public MParContainer
 {
@@ -24 +26 @@
     Byte_t   fSec;
     UInt_t   fNanoSec;
+
+    /*
+     UInt_t   fMjd;     // Day in the century        (Day of sun rise)
+     TTime    fTime;    // Time of Day               (43,200,000<x<43,200,000)
+     UShort_t fNanoSec; // NanoSec part of TimeOfDay (<1000)
+     */
 
 public:
@@ -71 +79 @@
         fHour     = t%24;
     }
+
+    void SetTime(const TTime &t);
 
     void SetTime(Double_t t)