Changeset 1727 for trunk/MagicSoft/Cosy/gui

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGCosy.cc (modified) (7 diffs)
• MGSkyPosition.cc (modified) (5 diffs)
• MGSkyPosition.h (modified) (1 diff)

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())

trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

@@ -56 +56 @@
     fMoon    = new TArc(0, 0, 3, 290, 70);
     fSun     = new TArc(0, 0, 2);
-
-    InitArc(fMars,    1001, 13, 12);
+    fSaturn  = new TArc(0, 0, 1);
+
+    fSaturnRing = new TArc(0, 0, 2);
+    fSaturnRing->SetFillStyle(4000);      // (s. TAttFill)
+    fSaturnRing->SetLineColor(kRed);
+    fSaturnRing->Draw();
+
+    InitArc(fMars,    1001, kRed/*13*/, kRed/*12*/);
     InitArc(fVenus,   1001, 15, 14);
     InitArc(fJupiter, 1001, 17, 16);
     InitArc(fMoon,    1001, 19, 15);
-    InitArc(fSun,     1001, 10, 19);
+    InitArc(fSaturn,  1001, kYellow/*17*/, 16);
 
     for (int i=0; i<4; i++)
@@ -72 +78 @@
         fList->Add(fSunL[i]);
     }
+    InitArc(fSun, 1001, kYellow/*10*/, kYellow/*19*/);
 
     fList->Add(fMars);
@@ -78 +85 @@
     fList->Add(fMoon);
     fList->Add(fSun);
+    fList->Add(fSaturn);
 
     //
@@ -317 +325 @@
     UpdatePlanet(kEVenus,   fVenus);
     UpdatePlanet(kEMars,    fMars);
+    UpdatePlanet(kESaturn,  fSaturn);
 
     RaDec radec = fSlaStar->CalcRaDecFast(pos*kDeg2Rad);
@@ -363 +372 @@
     SetModified();
 
-    if (planet!=kESun)
-        return;
-
-    // cout << "Sun: x=" << x << " y=" << y;
-    // cout << "   Zd=" << deg << " Az=" << 360./D2PI*zdaz.Az() << endl;
-
-    fSunL[0]->SetX1(x-3.5); fSunL[0]->SetX2(x+3.5);
-    fSunL[1]->SetX1(x-2.5); fSunL[1]->SetX2(x+2.5);
-    fSunL[2]->SetX1(x-2.5); fSunL[2]->SetX2(x+2.5);
-    fSunL[3]->SetX1(x);     fSunL[3]->SetX2(x);
-
-    fSunL[0]->SetY1(y);     fSunL[0]->SetY2(y);
-    fSunL[1]->SetY1(y-2.5); fSunL[1]->SetY2(y+2.5);
-    fSunL[2]->SetY1(y+2.5); fSunL[2]->SetY2(y-2.5);
-    fSunL[3]->SetY1(y-3.5); fSunL[3]->SetY2(y+3.5);
-}
+    if (planet==kESaturn)
+    {
+        fSaturnRing->SetX1(x);
+        fSaturnRing->SetY1(y);
+    }
+
+    if (planet==kESun)
+    {
+        fSunL[0]->SetX1(x-3.5); fSunL[0]->SetX2(x+3.5);
+        fSunL[1]->SetX1(x-2.5); fSunL[1]->SetX2(x+2.5);
+        fSunL[2]->SetX1(x-2.5); fSunL[2]->SetX2(x+2.5);
+        fSunL[3]->SetX1(x);     fSunL[3]->SetX2(x);
+
+        fSunL[0]->SetY1(y);     fSunL[0]->SetY2(y);
+        fSunL[1]->SetY1(y-2.5); fSunL[1]->SetY2(y+2.5);
+        fSunL[2]->SetY1(y+2.5); fSunL[2]->SetY2(y-2.5);
+        fSunL[3]->SetY1(y-3.5); fSunL[3]->SetY2(y+3.5);
+    }
+}

trunk/MagicSoft/Cosy/gui/MGSkyPosition.h

@@ -29 +29 @@
     TArc       *fMars;
     TArc       *fSun;
+    TArc       *fSaturn;
+
+    TArc       *fSaturnRing;
 
     TArc       *fDot[6];