Changeset 2615 for trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc (modified) (3 diffs)

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);