Changeset 2278 for trunk/MagicSoft/Cosy/base

Timestamp:

07/15/03 15:05:21 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/base

Files:

• coord.h (modified) (1 diff)
• timer.cc (modified) (3 diffs)
• timer.h (modified) (3 diffs)

trunk/MagicSoft/Cosy/base/coord.h

@@ -74 +74 @@
 
 inline ifstream& operator>>(ifstream &in,  XY &xy) { in  >> xy.fX; in  >> xy.fY; return in; }
-inline ofstream& operator<<(ofstream &out, XY &xy) { out << xy.fX << " " << xy.fY; return out; }
+inline ofstream& operator<<(ofstream &out, const XY &xy) { out << xy.X() << " " << xy.Y(); return out; }
 
 class AltAz : public XY

trunk/MagicSoft/Cosy/base/timer.cc

@@ -68 +68 @@
 }
 
-Timer::Timer(Timer &t)
+Timer::Timer(const Timer &t)
 {
     fMs   = t.fMs;
@@ -124 +124 @@
 }
 
-Timer::operator double() //[s]
+Timer::operator double() const //[s]
 {
     return fMs+fSecs;
@@ -142 +142 @@
 }
 
+ostream &operator<<(ostream &out, Timer &t)
+{
+    char text[256];
+
+    sprintf(text, "%d/%02d/%02d %d:%02d:%02d.%01li",
+            t.fYea, t.fMon, t.fDay, t.fHor, t.fMin, t.fSec, (long)(10.0*t.fMs));
+
+    out << text;
+    return out;
+}

trunk/MagicSoft/Cosy/base/timer.h

@@ -1 @@
-#ifndef TIMER_H
-#define TIMER_H
+#ifndef COSY_Timer
+#define COSY_Timer
 
 struct timeval;
 
+class ostream;
+
 class Timer
 {
+    friend ostream &operator<<(ostream &out, Timer &t);
 private:
     double fMs;
@@ -28 +31 @@
     Timer(double t);
     Timer(struct timeval *tv);
-    Timer(Timer &t);
+    Timer(const Timer &t);
 
     void SetTimer(int tv_sec, double tv_usec);
@@ -54 +57 @@
     void Print();
 
-    operator double(); //[s]
+    operator double() const; //[s]
 };
 
+ostream &operator<<(ostream &out, Timer &t);
+
 #endif