Changeset 8865 for trunk/MagicSoft/Cosy/gui

Timestamp:

02/20/08 19:39:13 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGCosy.cc (modified) (6 diffs)
• MGCosy.h (modified) (1 diff)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -58 +58 @@
     kPB_TPOINT,
     kPB_ENDSWITCH,
+    kPB_ARM,
     kPB_START,
     kPB_DISPLAY1,
@@ -529 +530 @@
 
 #ifdef EXPERT
+    but = new TGTextButton(tf1, "Arm", kPB_ARM);
+    but->MoveResize(204, 213, 62, 25);
+    but->SetToolTipText("Arm the telescop (allow for movement).");
+    but->Associate(this);
+    fList->Add(but);
+
+    ULong_t col;
+    gClient->GetColorByName("Magenta", col);
+    but->SetBackgroundColor(col);
+
     but= new TGTextButton(tf1, "New Position",  kPB_SavePreDef);
     but->MoveResize(165, 197, 80, 25);
@@ -554 +565 @@
 
     but = new TGTextButton(tf4, "Load", kPB_LoadBending);
-    but->ResizeMove(151, 185, 50, 25);
+    but->MoveResize(151, 185, 50, 25);
     but->SetToolTipText("Load bending corrections from file 'bending.txt'");
     but->Associate(this);
@@ -1030 +1041 @@
 
 void MGCosy::Update(ZdAz pos, ZdAz acc, ZdAz vel, /*ZdAz off,*/ RaDec radec,
-                    ZdAz soll, UInt_t stat, UInt_t stat2)
+                    ZdAz soll, UInt_t stat, UInt_t stat2, Bool_t armed)
 {
     // acc [rad]
@@ -1058 +1069 @@
     SetLabelColor(fAvailSe3,  stat2&0x20);
 
-    EnableLabel(fArmed, 1);//stat2&0x40);
+    EnableLabel(fArmed, armed);//stat2&0x40);
 
     if (stat&MDriveCom::kTracking)
@@ -1502 +1513 @@
                 StartTrackPos();
                 return kTRUE;
+            case kPB_ARM:
+                fQueue->PostMsg(WM_ARM);
+                return kTRUE;
             case kPB_DISPLAY1:
             case kPB_DISPLAY2:

trunk/MagicSoft/Cosy/gui/MGCosy.h

@@ -137 +137 @@
     MGImage    *GetImage()     { return fImage; }
 
-    void Update(ZdAz pos, ZdAz acc, ZdAz vel, /*ZdAz off,*/ RaDec radec, ZdAz soll, UInt_t stat, UInt_t stat2);
+    void Update(ZdAz pos, ZdAz acc, ZdAz vel, /*ZdAz off,*/ RaDec radec, ZdAz soll, UInt_t stat, UInt_t stat2, Bool_t armed);
     void UpdateWeather(const MCeCoCom &com);