Changeset 1727 for trunk/MagicSoft/Cosy/gui/MGCosy.cc

Timestamp:

01/23/03 13:32:58 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/gui/MGCosy.cc (modified) (7 diffs)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -180 +180 @@
     fList->Add(l);
 
-    fOffsetZd = new TGLabel(f, "0000000");
-    fOffsetAz = new TGLabel(f, "0000000");
+    fOffsetZd = new TGLabel(f, "000000000");
+    fOffsetAz = new TGLabel(f, "000000000");
     fOffsetZd->SetTextJustify(kTextRight);
     fOffsetAz->SetTextJustify(kTextRight);
-    fOffsetZd->Move(x, y+102);
-    fOffsetAz->Move(x, y+119);
+    fOffsetZd->Move(x+15, y+102);
+    fOffsetAz->Move(x+15, y+119);
     fList->Add(fOffsetZd);
     fList->Add(fOffsetAz);
@@ -193 +193 @@
     fList->Add(l);
 
-    l = new TGLabel(f, "Ra (soll):");
+    l = new TGLabel(f, "Ra (nominal):");
     l->Move(x-60, y+159);
     fList->Add(l);
@@ -201 +201 @@
     fList->Add(l);
 
-    l = new TGLabel(f, "Dec (soll):");
+    l = new TGLabel(f, "Dec (nominal):");
     l->Move(x-60, y+199);
     fList->Add(l);
 
-    l = new TGLabel(f, "Zd (soll):");
+    l = new TGLabel(f, "Zd (nominal):");
     l->Move(x-60, y+222);
     fList->Add(l);
 
-    l = new TGLabel(f, "Az (soll):");
+    l = new TGLabel(f, "Az (nominal):");
     l->Move(x-60, y+239);
     fList->Add(l);
@@ -836 +836 @@
     {
         zd = (int)test.Zd();
-        sprintf(text, "%c%dh %.1fm", soll.Zd()<0?'-':'+', abs((int)soll.Zd()), 0.1*(abs((int)test.Zd())%600));
+        sprintf(text, "%c%dd %.1fm", soll.Zd()<0?'-':'+', abs((int)soll.Zd()), 0.1*(abs((int)test.Zd())%600));
         fZdSoll->SetText(new TGString(text));
     }
@@ -984 +984 @@
             Timer tm;
             tm.Now();
-
+            /*
             Float_t h = 2.+tm.H()+(10.7+tm.M())/60.;
             RaDec dest(h*15, 129.7);
@@ -994 +994 @@
             int i = 0;
             while (!HasStopFlag() && i++<60)  // 2.5min
-                usleep(1000000);
+            usleep(1000000);
             if (HasStopFlag())
                 break;
+            */
 
             //fQueue->PostMsg(WM_STOP, 0, 0);
 
-            ZdAz dest1(fRand.Integer(36)+25, fRand.Integer(360));
+            ZdAz dest1((float)fRand.Integer(120)-60., 0);//fRand.Integer(25)+90);
 
             cout << "Demo: Zd=" << dest1.Zd() << "° Az=" << dest1.Az() << "°" << endl;
@@ -1006 +1007 @@
             fQueue->PostMsg(WM_POSITION, &dest1, sizeof(dest1));
 
-            i = 0;
-            while (!HasStopFlag() && i++<15)  // 30s
+            int i = 0;
+            while (!HasStopFlag() && i++<5/*5*/)  // 30s
                 usleep(1000000);
             if (HasStopFlag())