Changeset 920 for trunk/MagicSoft/Cosy/gui

Timestamp:

08/29/01 16:44:38 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• GuiIncl.h (added)
• GuiLinkDef.h (added)
• MGAccuracy.cc (modified) (1 diff)
• MGCosy.cc (modified) (8 diffs)
• MGCosy.h (modified) (5 diffs)
• MGEmbeddedCanvas.cc (modified) (1 diff)
• MGSkyPosition.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/gui/MGAccuracy.cc

@@ -184 +184 @@
 void MGAccuracy::UpdateText(Float_t pzd, Float_t azd, Float_t aaz)
 {
-    const Float_t d2r = TMath::Pi()/360.;
+    const Float_t d2r = TMath::Pi()/180.;
 
     pzd *= d2r;

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -12 +12 @@
 #include <TSystem.h>       // gSystem
 #include <TGLabel.h>       // TGLabel
+#include <TGListBox.h>     // TGListBox
 #include <TG3DLine.h>      // TGHorizontal3DLine (TGSplitter)
 #include <TGFrame.h>       // TGGroupFrame
@@ -72 +73 @@
 void MGCosy::CreateLabel(TGCompositeFrame *f)
 {
+    const int x = 180;
     const int y = 25;
-    const int x = 180;
+
+    TGLabel *l;
+
+    l = new TGLabel(f, "SE-Az:");
+    l->Move(x-60, y);
+    fList->Add(l);
+
+    l = new TGLabel(f, "SE-Zd1:");
+    l->Move(x-60, y+20);
+    fList->Add(l);
+
+    l = new TGLabel(f, "SE-Zd2:");
+    l->Move(x-60, y+40);
+    fList->Add(l);
+
 
     fLabel1 = new TGLabel*[3];
@@ -126 +142 @@
     //f->AddFrame(fLabel3[2]);
 
+    l = new TGLabel(f, "Offset-Zd:");
+    l->Move(x-60, y+80);
+    fList->Add(l);
+
+    l = new TGLabel(f, "Offset-Az:");
+    l->Move(x-60, y+100);
+    fList->Add(l);
+
+    fOffsetZd = new TGLabel(f, "0000000");
+    fOffsetAz = new TGLabel(f, "0000000");
+    fOffsetZd->SetTextJustify(kTextRight);
+    fOffsetAz->SetTextJustify(kTextRight);
+    fOffsetZd->Move(x, y+80);
+    fOffsetAz->Move(x, y+100);
+    fList->Add(fOffsetZd);
+    fList->Add(fOffsetAz);
+
 
     fError    = new TGLabel(f, "Error");
@@ -258 +291 @@
     fAccuracy    = new MGAccuracy   (f, 300);
     fVelocity    = new MGVelocity   (f, "Velocity ['/min]", 300);
-    fOffset      = new MGVelocity   (f, "Offset se-re [']", 300);
+//    fOffset      = new MGVelocity   (f, "Offset se-re [']", 300);
 
     fList->Add(fSkyPosition);
     fList->Add(fAccuracy);
     fList->Add(fVelocity);
-    fList->Add(fOffset);
+//    fList->Add(fOffset);
 
     TGGroupFrame *frame = new TGGroupFrame(f, "Status");
     frame->Resize(300, 300);
     fList->Add(frame);
+
+    fLog = new TGListBox(f, -1, kSunkenFrame);  //kSunkenFrame|kDoubleBorder,
+    fLog->Resize(300, 300);
+    fList->Add(fLog);
 
     //
@@ -277 +314 @@
     f->AddFrame(frame);
     f->AddFrame(fVelocity);
-    f->AddFrame(fOffset);
+    f->AddFrame(fLog);
 
     AddFrame(f, new TGLayoutHints(kLHintsNormal | kLHintsExpandX, 0, 0, 1, 0));
@@ -337 +374 @@
 }
 
+void MGCosy::UpdateOffset(ZdAz &off)
+{
+    static Int_t zd=~0;
+    static Int_t az=~0;
+
+    char text[21];
+
+    if (zd!=(Int_t)off.Zd())
+    {
+        zd = (Int_t)off.Zd();
+        sprintf(text, "%ld", zd);
+        fOffsetZd->SetText(new TGString(text));
+    }
+    if (az!=(Int_t)off.Az())
+    {
+        az = (Int_t)off.Az();
+        sprintf(text, "%ld", az);
+        fOffsetAz->SetText(new TGString(text));
+    }
+}
+
 void MGCosy::Update(ZdAz pos, ZdAz acc, ZdAz vel, ZdAz off, UInt_t stat)
 {
@@ -342 +400 @@
     fAccuracy->Update(pos, acc);
     fVelocity->Update(vel);
-    fOffset->Update(off);
+    UpdateOffset(off);
 
 #define kError     0x01
@@ -358 +416 @@
     stat&kTracking ? fAccuracy->MapWindow() : fAccuracy->UnmapWindow();
     stat&kTracking ? fVelocity->MapWindow() : fVelocity->UnmapWindow();
-    stat&kTracking ? fOffset->MapWindow()   : fOffset->UnmapWindow();
+    //    stat&kTracking ? fOffset->MapWindow()   : fOffset->UnmapWindow();
+
+    if (!fLog->TestBit(kHasChanged))
+        return;
+
+    fLog->MapSubwindows();
+    fLog->Layout();
+    fLog->ResetBit(kHasChanged);
 }
 // ======================================================================

trunk/MagicSoft/Cosy/gui/MGCosy.h

@@ -33 +33 @@
 class TGCompositeFrame;
 class TGTab;
+class TGListBox;
 
 class MGCosy : public TGMainFrame
@@ -50 +51 @@
     TGLabel      **fLabel3;
 
+    TGLabel       *fOffsetZd;
+    TGLabel       *fOffsetAz;
+
     MGCoordinates *fCoord;
     MGSkyPosition *fSkyPosition;
@@ -66 +70 @@
     TGLabel *fStopped;
 
+    TGListBox *fLog;
+
     void CreateMenu();
     void CreateLabel(TGCompositeFrame *f);
@@ -73 +79 @@
 
     void EnableLabel(TGLabel *label, Bool_t stat);
+    void UpdateOffset(ZdAz &off);
 
 public:
@@ -80 +87 @@
     void CloseWindow();
 
-    TGLabel **GetLabel1() { return fLabel1; }
-    TGLabel **GetLabel2() { return fLabel2; }
-    TGLabel **GetLabel3() { return fLabel3; }
+    TGLabel **GetLabel1() const { return fLabel1; }
+    TGLabel **GetLabel2() const { return fLabel2; }
+    TGLabel **GetLabel3() const { return fLabel3; }
+
+    TGListBox *GetLog() const { return fLog; }
 
     void Update(ZdAz pos, ZdAz acc, ZdAz vel, ZdAz off, UInt_t stat);

trunk/MagicSoft/Cosy/gui/MGEmbeddedCanvas.cc

@@ -12 +12 @@
 MGEmbeddedCanvas::MGEmbeddedCanvas(const char *name, const TGWindow* p,
                                    const UInt_t width, Float_t range)
-    : TRootEmbeddedCanvas(name, p, width+1, width+1, kRaisedFrame),//, 0) //234, 76, kFixedSize)
+    : TRootEmbeddedCanvas(name, p, width+1, width+1, 0/*kRaisedFrame*/),
       fModified(kFALSE), fWidth(width), fRange(range), fPix(2.*range/width)
 {

trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

@@ -203 +203 @@
 void MGSkyPosition::UpdatePosition(Float_t zd, Float_t az)
 {
-    static int X=~0;
-    static int Y=~0;
+    static int X =~0;
+    static int Y =~0;
+    static int Rx=~0;
+    static int Ry=~0;
 
     const float rad = D2PI*az/360.0;
@@ -217 +219 @@
     const int pixy = (int)(y/fPix);
 
-    if (X==pixx && Y==pixy)
+    const int rx = (int)(s*fWidth/2.);
+    const int ry = (int)(c*fWidth/2.);
+
+    if (X==pixx && Y==pixy && Rx==rx && Ry==ry)
         return;
 
     X = pixx;
     Y = pixy;
+
+    Rx = rx;
+    Ry = ry;
 
     const float dx = s*4.;