Changeset 1758 for trunk/MagicSoft/Cosy/gui

Timestamp:

02/14/03 23:18:37 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGCosy.cc (modified) (8 diffs)
• MGCosy.h (modified) (3 diffs)
• MGSkyPosition.cc (modified) (2 diffs)
• MGSkyPosition.h (modified) (3 diffs)
• MGStarguider.cc (modified) (3 diffs)
• MGStarguider.h (modified) (3 diffs)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -311 +311 @@
     TGCompositeFrame *tf2 = fTab->AddTab("Track");
     TGCompositeFrame *tf4 = fTab->AddTab("Calibration");
-    TGCompositeFrame *tf3 = fTab->AddTab("Demo");
+    TGCompositeFrame *tf5 = fTab->AddTab("Test SE");
+    /*TGCompositeFrame *tf3 =*/ fTab->AddTab("Demo");
 
     fCZdAz = new MGCoordinates(tf1, kETypeZdAz);
@@ -359 +360 @@
     l3 = new TGLabel(tf4, "the TPoint button. To set the Shaftencoder offset");
     l4 = new TGLabel(tf4, "use the Calib SE button.");
+    l1->Move(x, y);
+    l2->Move(x, y+h);
+    l3->Move(x, y+2*h);
+    l4->Move(x, y+3*h);
+    fList->Add(l1);
+    fList->Add(l2);
+    fList->Add(l3);
+    fList->Add(l4);
+
+    l1 = new TGLabel(tf5, "START starts histograming the differences of");
+    l2 = new TGLabel(tf5, "the two shaftencoders at the elevation axis.");
+    l3 = new TGLabel(tf5, "Use STOP to stop histograming and display the");
+    l4 = new TGLabel(tf5, "results on the screen.");
     l1->Move(x, y);
     l2->Move(x, y+h);
@@ -569 +583 @@
 }
 
-MGCosy::MGCosy(MsgQueue *q, const TGWindow *p, UInt_t w, UInt_t h)
-    : TGMainFrame(p, w, h), fQueue(q)
+MGCosy::MGCosy(MObservatory::LocationName_t key, MsgQueue *q, const TGWindow *p, UInt_t w, UInt_t h)
+    : TGMainFrame(p, w, h), fObservatory(key), fQueue(q)
 {
     fList = new MGList;
@@ -596 +610 @@
     cout << "MGCosy: Creating MGSkyPosition" << endl;
 #endif
-    fSkyPosition = new MGSkyPosition(f1, 300);
+    fSkyPosition = new MGSkyPosition(fObservatory, f1, 300);
 #ifdef DEBUG
     cout << "MGCosy: Creating MGAccuracy" << endl;
@@ -750 +764 @@
     static Int_t decs=~0;
 
-    static SlaStars sla;
+    static SlaStars sla(fObservatory);
     sla.SetMjd(mjd);
 
@@ -863 +877 @@
     fUtc->SetText(new TGString(text));
 
-    double mjd = time.CalcMjd();
+    double mjd = time.GetMjd();
 
     sprintf(text, "%12.6f", mjd);
@@ -1114 +1128 @@
                     return kTRUE;
                 case 3:
+                    fQueue->Proc(WM_TESTSE, (void*)1);
+                    return kTRUE;
+                case 4:
                     StartDemo();
                     return kTRUE;
@@ -1123 +1140 @@
                 StopDemo();
                 fQueue->PostMsg(WM_STOP, 0, 0);
+                if (fTab->GetCurrent()==3)
+                    fQueue->Proc(WM_TESTSE, NULL);
                 cout << "PostMsg (WM_Stop) returned." << endl;
                 return kTRUE;

trunk/MagicSoft/Cosy/gui/MGCosy.h

@@ -4 +4 @@
 #ifndef ROOT_TGFrame
 #include <TGFrame.h>
+#endif
+
+#ifndef MARS_MObservatory
+#include <MObservatory.h>
 #endif
 
@@ -31 +35 @@
 {
 private:
+    const MObservatory::LocationName_t fObservatory;
 
     //
@@ -104 +109 @@
 
 public:
-    MGCosy(MsgQueue *q, const TGWindow *p, UInt_t w, UInt_t h);
+    MGCosy(MObservatory::LocationName_t key, MsgQueue *q, const TGWindow *p, UInt_t w, UInt_t h);
     ~MGCosy();
 

trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

@@ -43 +43 @@
     //   Neptun     7.8
     //
-    fSlaPlanet = new SlaPlanets;
-    fSlaStar   = new SlaStars;
+    fSlaPlanet = new SlaPlanets(fObservatory);
+    fSlaStar   = new SlaStars(fObservatory);
 
     //
@@ -177 +177 @@
 }
 
-MGSkyPosition::MGSkyPosition(const TGWindow* p, const UInt_t w)
-    : MGEmbeddedCanvas("SkyPosition", p, w, 110)
+MGSkyPosition::MGSkyPosition(MObservatory::LocationName_t key, const TGWindow* p, const UInt_t w)
+    : MGEmbeddedCanvas("SkyPosition", p, w, 110), fObservatory(key)
 {
     DrawCoordinateSystem();

trunk/MagicSoft/Cosy/gui/MGSkyPosition.h

@@ -11 +11 @@
 #ifndef MGEMBEDDEDCANVAS_H
 #include "MGEmbeddedCanvas.h"
+#endif
+
+#ifndef MARS_MObservatory
+#include "MObservatory.h"
 #endif
 
@@ -46 +50 @@
     SlaPlanets *fSlaPlanet;
 
+    const MObservatory::LocationName_t fObservatory;
+
     Int_t fX[9];
     Int_t fY[9];
@@ -66 +72 @@
 
 public:
-    MGSkyPosition(const TGWindow* p, const UInt_t w);
+    MGSkyPosition(MObservatory::LocationName_t key, const TGWindow* p, const UInt_t w);
     ~MGSkyPosition();
 

trunk/MagicSoft/Cosy/gui/MGStarguider.cc

@@ -72 +72 @@
 #define kZOOM 96
 
-MGStarguider::MGStarguider()
-: Camera(), TGMainFrame(gClient->GetRoot(), 768, 700), fDx((768-kZOOM)/2), fDy((512-kZOOM)/2)
+MGStarguider::MGStarguider(MObservatory::LocationName_t key)
+: Camera(), TGMainFrame(gClient->GetRoot(), 768, 700), fObservatory(key), fDx((768-kZOOM)/2), fDy((512-kZOOM)/2)
 {
     gVirtualX->GrabButton(fId, kButton2, /*kButtonPressMask|kButtonReleaseMask|*/kNone, kNone, kNone, kNone);
@@ -80 +80 @@
     fList = new MGList;
 
-    fSao = new StarCatalog;
+    fSao = new StarCatalog(fObservatory);
     fRaDec = new RaDec(180, 40);
 
@@ -612 +612 @@
 
         MStarList stars;
-        fSao->GetStars(stars, time.CalcMjd(), *fRaDec);
+        fSao->GetStars(stars, time.GetMjd(), *fRaDec);
         fSao->GetImg(c, cimg, stars);
         //fSao->GetImg(c, cimg, time.CalcMjd(), *fRaDec);

trunk/MagicSoft/Cosy/gui/MGStarguider.h

@@ -11 +11 @@
 #include "MGList.h"
 #include "MGImage.h"
+
+#ifndef MARS_MObservatory
+#include "MObservatory.h"
+#endif
 
 class AltAz;
@@ -56 +60 @@
     TTimer *fTimer;
 
+    const MObservatory::LocationName_t fObservatory;
+
     Int_t fDx;
     Int_t fDy;
@@ -70 +76 @@
 
 public:
-    MGStarguider();
+    MGStarguider(MObservatory::LocationName_t key);
     virtual ~MGStarguider();