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

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc (modified) (5 diffs)

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);
+    }
+}