Changeset 1760 for trunk/MagicSoft/Cosy/gui

Timestamp:

02/16/03 17:02:06 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGAccuracy.cc (modified) (1 diff)
• MGCosy.cc (modified) (7 diffs)
• MGCosy.h (modified) (3 diffs)
• MGSkyPosition.cc (modified) (3 diffs)
• MGSkyPosition.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/gui/MGAccuracy.cc

@@ -206 +206 @@
     int rs = (int)floor(fmod(dist, 60.));
     dist /= 60.;
-    int rm = (int)floor(fmod(dist, 60.));
+    int rm = (int)dist;//floor(fmod(dist, 60.));
 
     char txt[100];

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -14 +14 @@
 #include <TGLabel.h>       // TGLabel
 #include <TGListBox.h>     // TGListBox
+#include <TGComboBox.h>    // TGComboBox
 #include <TG3DLine.h>      // TGHorizontal3DLine (TGSplitter)
 #include <TGTextEntry.h>   // TGTextEntry
@@ -53 +54 @@
     kPB_LoadBending,
     kPB_ResetBending,
-    kPB_CALIBSE
+    kPB_CALIBSE,
+    kCB_PredefPos
+
 };
 
@@ -306 +309 @@
 }
 
+void MGCosy::CreatePredefinedPos(TGCompositeFrame *tf1)
+{
+    TGComboBox *box = new TGComboBox(tf1, kCB_PredefPos);
+    box->Resize(120, 20);
+    box->Associate(this);
+
+    TGLayoutHints *lay = new TGLayoutHints(kLHintsLeft|kLHintsTop,
+                                            27, 0, 200, 0);
+    tf1->AddFrame(box, lay);
+
+    fList->Add(box);
+    fList->Add(lay);
+
+    ifstream fin("prepos.txt");
+    if (!fin)
+    {
+        cout << "ERROR: Predifined posiion in 'prepos.txt' not found." << endl;
+        return;
+    }
+
+    int i=0;
+    while (!fin.eof())
+    {
+        TString str;
+        Double_t zd, az;
+        fin >> str >> zd >> az;
+        box->AddEntry(str, i++);
+
+        fStarList.Add(zd, az);
+    }
+}
+
 void MGCosy::CreateTabs(TGTab *fTab)
 {
@@ -317 +352 @@
     fCZdAz->Move(27, 105);
     fList->Add(fCZdAz);
+
+    CreatePredefinedPos(tf1);
 
     fCRaDec = new MGCoordinates(tf2, kETypeRaDec);
@@ -866 +903 @@
     time.Now();
 
+    static char oldtxt[256];
+
     char text[256];
 
@@ -875 +914 @@
         dot[2] = 0;
 
-    fUtc->SetText(new TGString(text));
-
+    if (strcmp(oldtxt, text))
+    {
+        fUtc->SetText(new TGString(text));
+        strcpy(oldtxt, text);
+    }
+
+    static long oldmjd;
     double mjd = time.GetMjd();
 
-    sprintf(text, "%12.6f", mjd);
-    fMjd->SetText(new TGString(text));
+    if (oldmjd != 1000000*mjd)
+    {
+        sprintf(text, "%12.6f", mjd);
+        fMjd->SetText(new TGString(text));
+
+        oldmjd = (long)(1000000*mjd);
+    }
 
     return mjd;
@@ -1098 +1147 @@
         switch (GET_SUBMSG(msg))
         {
+        case kCM_COMBOBOX:
+            if (mp1==kCB_PredefPos)
+            {
+                MStar *pos = fStarList[mp2];
+                if (!pos)
+                    return kTRUE;
+                fCZdAz->SetCoordinates(ZdAz(pos->GetX(), pos->GetY()));
+            }
+            return kTRUE;
+
         case kCM_TAB:
             //cout << "Tab: " << mp1 << endl;

trunk/MagicSoft/Cosy/gui/MGCosy.h

@@ -7 +7 @@
 
 #ifndef MARS_MObservatory
-#include <MObservatory.h>
+#include "MObservatory.h"
+#endif
+
+#ifndef COSY_MStarList
+#include "MStarList.h"
 #endif
 
@@ -64 +68 @@
     TGLabel       *fMjd;
 
+    MStarList     fStarList;
+
     MGCoordinates *fCZdAz;
     MGCoordinates *fCRaDec;
@@ -94 +100 @@
     void CreateLabel(TGCompositeFrame *f);
     void CreateTabs(TGTab *fTab);
+    void CreatePredefinedPos(TGCompositeFrame *tf1);
 
     void StartPos();

trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

@@ -69 +69 @@
     InitArc(fSaturn,  1001, kYellow/*17*/, 16);
 
+    for (int i=0; i<13; i++)
+    {
+        fStars[i] = new TArc(0, 0, 1);
+        InitArc(fStars[i], 1001, kWhite, kWhite);
+        fList->Add(fStars[i]);
+    }
+
     for (int i=0; i<4; i++)
     {
@@ -97 +104 @@
 }
 
+void MGSkyPosition::UpdateStars()
+{
+    RaDec stars[13];
+
+    // 32349   Sirius           -1.44 1.45    2.64      0.009   A0m
+    stars[0] = RaDec(MObservatory::Hms2Rad(  6, 45, 0), MObservatory::Dms2Rad(-16, 42, 0));
+    // 30438   Canopus          -0.62 -5.53   95.88     0.164   F0Ib
+    stars[1] = RaDec(MObservatory::Hms2Rad(  6, 23, 0), MObservatory::Dms2Rad(-52, 41, 0));
+    // 69673   Arcturus         -0.05 -0.31   11.25     1.239   K2IIIp
+    stars[2] = RaDec(MObservatory::Hms2Rad( 14, 15, 0), MObservatory::Dms2Rad( 19, 10, 0));
+    stars[3] = RaDec(MObservatory::Hms2Rad( 01, 37, 6), MObservatory::Dms2Rad(-57, 14, 0));
+    stars[4] = RaDec(MObservatory::Hms2Rad( 12, 26, 6), MObservatory::Dms2Rad(-63, 06, 0));
+    stars[5] = RaDec(MObservatory::Hms2Rad( 13, 25, 2), MObservatory::Dms2Rad(-11, 10, 0));
+    stars[6] = RaDec(MObservatory::Hms2Rad(  5, 14, 0), MObservatory::Dms2Rad(- 8, 12, 5));
+    stars[7] = RaDec(MObservatory::Hms2Rad( 19, 50, 0), MObservatory::Dms2Rad(- 8, 52, 6));
+    stars[8] = RaDec(MObservatory::Hms2Rad( 18, 37, 0), MObservatory::Dms2Rad( 38, 47, 0));
+    stars[9] = RaDec(MObservatory::Hms2Rad(  5, 16, 0), MObservatory::Dms2Rad( 46, 00, 0));
+    stars[10] = RaDec(MObservatory::Hms2Rad(  7, 39, 0), MObservatory::Dms2Rad(  5, 14, 0));
+    stars[11] = RaDec(MObservatory::Hms2Rad(  5, 55, 0), MObservatory::Dms2Rad(  7, 24, 0));
+    stars[12] = RaDec(MObservatory::Hms2Rad( 19, 50, 0), MObservatory::Dms2Rad(  8, 52, 0));
+
+    for (int i=0; i<13; i++)
+        SetDot(fStars[i], stars[i], 0);
+
+}
 void MGSkyPosition::InitText()
 {
@@ -327 +359 @@
     UpdatePlanet(kESaturn,  fSaturn);
 
+    UpdateStars();
+
     RaDec radec = fSlaStar->CalcRaDecFast(pos*kDeg2Rad);
 

trunk/MagicSoft/Cosy/gui/MGSkyPosition.h

@@ -35 +35 @@
     TArc       *fSaturn;
 
+    TArc       *fStars[13];
+
     TArc       *fSaturnRing;
 
@@ -67 +69 @@
     void SetDot(TArc *arc, RaDec &radec, Int_t off);
 
+    void UpdateStars();
     void UpdateText(Float_t zd, Float_t az);
     void UpdatePlanet(Int_t planet, TArc *arc);