Changeset 2615 for trunk/MagicSoft/Cosy/gui

Timestamp:

12/07/03 14:48:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGCosy.cc (modified) (9 diffs)
• MGPngReader.cc (modified) (3 diffs)
• MGSkyPosition.cc (modified) (3 diffs)
• MGTPoint.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -22 +22 @@
 #include <TApplication.h>  // gApplication
 
-//#include "timer.h"         // Timer
-
 #include "MCosy.h"
+#include "MTime.h"
+#include "MAstro.h"
 #include "MGList.h"
 #include "MDriveCom.h"
@@ -365 +365 @@
         box->AddEntry(str, i++);
 
-        fStarList.Add(Slalib::Hms2Hor(h, m, s), Slalib::Dms2Deg(d, am, as));
+        fStarList.Add(MAstro::Hms2Hor(h, m, s), MAstro::Dms2Deg(d, am, as));
     }
 }
@@ -889 +889 @@
 
     // Calculate Display values
-    Slalib::Rad2Hm(rd.Ra(),  sh, h, hm);
-    Slalib::Rad2Dm(rd.Dec(), sd, d, dm);
+    MAstro::Rad2Hm(rd.Ra(),  sh, h, hm);
+    MAstro::Rad2Dm(rd.Dec(), sd, d, dm);
 
     rd.Ra(rd.Ra()  * 12/TMath::Pi());
@@ -922 +922 @@
 
     // Calculate display values
-    Slalib::Hor2Hm(radec.Ra(),  sh, h, hm);
-    Slalib::Deg2Dm(radec.Dec(), sd, d, dm);
+    MAstro::Hor2Hm(radec.Ra(),  sh, h, hm);
+    MAstro::Deg2Dm(radec.Dec(), sd, d, dm);
 
     test = radec*600;
@@ -974 +974 @@
     Char_t   sz, sa;
 
-    Slalib::Rad2Dm(soll.Zd(), sz, z, zm);
-    Slalib::Rad2Dm(soll.Az(), sa, a, am);
+    MAstro::Rad2Dm(soll.Zd(), sz, z, zm);
+    MAstro::Rad2Dm(soll.Az(), sa, a, am);
 
     const ZdAz test = soll*kRad2Deg*600;
@@ -994 +994 @@
 double MGCosy::UpdateTime()
 {
-    Timer time;
+    MTime time;
     time.Now();
 
-    static char oldtxt[256];
-
-    char text[256];
-
-    strcpy(text, time.GetTimeStr());
-
-    char *dot = strrchr(text, '.');
-
-    if (dot)
-        dot[2] = 0;
-
-    if (strcmp(oldtxt, text))
+    static TString oldtxt;
+
+    TString text(time.GetString());
+    text.Remove(text.Last('.')+2);
+
+    if (text!=oldtxt)
     {
         fUtc->SetText(new TGString(text));
-        strcpy(oldtxt, text);
-    }
-
-    static long oldmjd;
-    double mjd = time.GetMjd();
-
-    if (oldmjd != 1000000*mjd)
-    {
-        sprintf(text, "%12.6f", mjd);
-        fMjd->SetText(new TGString(text));
-
-        oldmjd = (long)(1000000*mjd);
+        oldtxt = text;
+    }
+
+    static ULong_t oldmjd=0;
+    const double mjd = time.GetMjd();
+
+    if (oldmjd != (ULong_t)(1000000*mjd))
+    {
+        fMjd->SetText(new TGString(Form("%12.6f", mjd)));
+        oldmjd = (ULong_t)(1000000*mjd);
     }
 
@@ -1034 +1026 @@
     acc *= kRad2Deg;   // [deg]
 
-    double mjd = UpdateTime();
+    const double mjd = UpdateTime();
     fSkyPosition->Update(pos, mjd);
     //UpdateOffset(off);
@@ -1205 +1197 @@
         while (i-->0)
         {
-            Timer tm;
-            tm.Now();
+            //Timer tm;
+            //tm.Now();
 
             if (!Move(75, -80, 1000000, 13))
@@ -1386 +1378 @@
                     UShort_t d, m, s;
                     Char_t sgn;
-                    Slalib::Deg2Dms(za.X(), sgn, d, m, s);
+                    MAstro::Deg2Dms(za.X(), sgn, d, m, s);
                     if (sgn=='-') fout << sgn;
                     fout << d << " " << m << " " << s << " \t";
-                    Slalib::Deg2Dms(za.Y(), sgn, d, m, s);
+                    MAstro::Deg2Dms(za.Y(), sgn, d, m, s);
                     if (sgn=='-') fout << sgn;
                     fout << d << " " << m << " " << s << " \t";

trunk/MagicSoft/Cosy/gui/MGPngReader.cc

@@ -25 +25 @@
 #include "CaosFilter.h"
 #include "Writer.h"
-#include "base/timer.h"
+#include "MTime.h"
 
 #include "MStarList.h"
@@ -1022 +1022 @@
         // Double_t kConv = 0.502; // [pix/mm]
 
-        static Timer t0(tm);
-        Timer t(tm);
-
-        fTime = (t.GetMjd()-t0.GetMjd())*24*60*60;
+        static MTime t0(*tm);
+        MTime t(*tm);
+
+        fTime = t-t0;
 
         Leds leds;
@@ -1098 +1098 @@
     if (fDisplay->IsEntryChecked(IDM_kCatalog))
     {
-        Timer time(tm);
+        MTime time(*tm);
 
         GetCoordinates();

trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

@@ -16 +16 @@
 
 #include "coord.h"
+#include "MAstro.h"
 #include "SlaStars.h"
 #include "SlaPlanets.h"
@@ -113 +114 @@
 {
     // 32349   Sirius           -1.44 1.45    2.64      0.009   A0m
-    (RaDec(Slalib::Hms2Rad(  6, 45,  0), Slalib::Dms2Rad(-16, 42,  0))),
+    (RaDec(MAstro::Hms2Rad(  6, 45,  0), MAstro::Dms2Rad(-16, 42,  0))),
     // 30438   Canopus          -0.62 -5.53   95.88     0.164   F0Ib
-    (RaDec(Slalib::Hms2Rad(  6, 23,  0), Slalib::Dms2Rad(-52, 41,  0))),
+    (RaDec(MAstro::Hms2Rad(  6, 23,  0), MAstro::Dms2Rad(-52, 41,  0))),
     // 69673   Arcturus         -0.05 -0.31   11.25     1.239   K2IIIp
-    (RaDec(Slalib::Hms2Rad( 14, 15,  0), Slalib::Dms2Rad( 19, 10,  0))),
+    (RaDec(MAstro::Hms2Rad( 14, 15,  0), MAstro::Dms2Rad( 19, 10,  0))),
     //         Vega              0.03
-    (RaDec(Slalib::Hms2Rad( 18, 37,  0), Slalib::Dms2Rad( 38, 47,  0))),
+    (RaDec(MAstro::Hms2Rad( 18, 37,  0), MAstro::Dms2Rad( 38, 47,  0))),
     //         Altair            0.77
-    (RaDec(Slalib::Hms2Rad( 19, 50,  0), Slalib::Dms2Rad(  8, 52,  6))),
+    (RaDec(MAstro::Hms2Rad( 19, 50,  0), MAstro::Dms2Rad(  8, 52,  6))),
     //         Antares           0.96
-    (RaDec(Slalib::Hms2Rad( 16, 29, 25), Slalib::Dms2Rad(-26, 25, 55))),
+    (RaDec(MAstro::Hms2Rad( 16, 29, 25), MAstro::Dms2Rad(-26, 25, 55))),
     //         Spica             0.98
-    (RaDec(Slalib::Hms2Rad( 13, 25, 13), Slalib::Dms2Rad(-11,  9, 41))),
+    (RaDec(MAstro::Hms2Rad( 13, 25, 13), MAstro::Dms2Rad(-11,  9, 41))),
     //         Deneb             1.25
-    (RaDec(Slalib::Hms2Rad( 20, 41, 26), Slalib::Dms2Rad( 45, 16, 49))),
-    (RaDec(Slalib::Hms2Rad(  1, 37,  6), Slalib::Dms2Rad(-57, 14,  0))),
-    (RaDec(Slalib::Hms2Rad( 12, 26,  6), Slalib::Dms2Rad(-63, 06,  0))),
-    (RaDec(Slalib::Hms2Rad(  5, 14,  0), Slalib::Dms2Rad(- 8, 12,  5))),
-    (RaDec(Slalib::Hms2Rad(  5, 16,  0), Slalib::Dms2Rad( 46, 00,  0))),
-    (RaDec(Slalib::Hms2Rad(  7, 39,  0), Slalib::Dms2Rad(  5, 14,  0))),
-    (RaDec(Slalib::Hms2Rad(  5, 55,  0), Slalib::Dms2Rad(  7, 24,  0)))
+    (RaDec(MAstro::Hms2Rad( 20, 41, 26), MAstro::Dms2Rad( 45, 16, 49))),
+    (RaDec(MAstro::Hms2Rad(  1, 37,  6), MAstro::Dms2Rad(-57, 14,  0))),
+    (RaDec(MAstro::Hms2Rad( 12, 26,  6), MAstro::Dms2Rad(-63, 06,  0))),
+    (RaDec(MAstro::Hms2Rad(  5, 14,  0), MAstro::Dms2Rad(- 8, 12,  5))),
+    (RaDec(MAstro::Hms2Rad(  5, 16,  0), MAstro::Dms2Rad( 46, 00,  0))),
+    (RaDec(MAstro::Hms2Rad(  7, 39,  0), MAstro::Dms2Rad(  5, 14,  0))),
+    (RaDec(MAstro::Hms2Rad(  5, 55,  0), MAstro::Dms2Rad(  7, 24,  0)))
 };
 
@@ -334 +335 @@
     Char_t   sx, sy;
     Double_t xm, ym;
-    Slalib::Deg2Dm(x, sx, xd, xm);
-    Slalib::Deg2Dm(y, sy, yd, ym);
+    MAstro::Deg2Dm(x, sx, xd, xm);
+    MAstro::Deg2Dm(y, sy, yd, ym);
 
     const int fx = (int)(x*600);

trunk/MagicSoft/Cosy/gui/MGTPoint.cc

@@ -18 +18 @@
 #include "Filter.h"
 #include "Writer.h"
-#include "base/timer.h"
+#include "MTime.h"
 
 ClassImp(MGStarguider);
@@ -397 +397 @@
             GetCoordinates();
 
-            Timer time(tm);
+            MTime time(*tm);
             fSao->GetImg(myimg, cimg, time.CalcMjd(), *fRaDec);
             fImage->DrawColImg(myimg, cimg);