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

Timestamp:

02/25/03 21:07:13 (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

@@ -97 +97 @@
     // Reset 'static' positions of planets
     //
+    /*
     for (int i=0; i<9; i++)
     {
-        fX[i] = ~0;
-        fY[i] = ~0;
-    }
+        fPlanetX[i] = ~0;
+        fPlanetY[i] = ~0;
+    }
+    for (int i=0; i<13; i++)
+    {
+        fStarX[i] = ~0;
+        fStarY[i] = ~0;
+    }*/
 }
 
@@ -253 +259 @@
     const float c = cos(zdaz.Az());
 
-    const float x = s*zdaz.Zd()*kRad2Deg;             // [deg]
-    const float y = c*zdaz.Zd()*kRad2Deg;             // [deg]
+    float x = s*zdaz.Zd()*kRad2Deg;             // [deg]
+    float y = c*zdaz.Zd()*kRad2Deg;             // [deg]
+
+    if (x>95 || x<-95 || y>95 || y<-95)
+    {
+        if (arc->GetX1()==10 && arc->GetY1()==100)
+            return;
+
+        x=-100;
+        y= 100;
+    }
+
+    const int pixx = (int)(x/fPix);
+    const int pixy = (int)(y/fPix);
+
+    const int oldx = (int)(arc->GetX1()/fPix);
+    const int oldy = (int)(arc->GetY1()/fPix);
+
+    if (pixx==oldx && pixy==oldy)
+        return;
 
     arc->SetX1(x);
     arc->SetY1(y);
 
-    //SetModified(); ***MEMORY LEAK!!!***
+    SetModified(); //***MEMORY LEAK!!!***
 }
 
@@ -302 +326 @@
     SetLin2(x+dy, y-dx, x-dy, y+dx);
 
-    if (zd<80)
-    {
+    //if (zd<80)
+    //{
         for(int i=0; i<3; i++)
             SetDot(fDot[i], radec, i-3);
         for(int i=3; i<6; i++)
             SetDot(fDot[i], radec, i-2);
-    }
+    //}
 
     SetModified();
@@ -363 +387 @@
 
     RaDec radec = fSlaStar->CalcRaDecFast(pos*kDeg2Rad);
-
     UpdatePosition(radec, pos.Zd(), pos.Az());
     UpdateText(pos.Zd(), pos.Az());
@@ -387 +410 @@
     const float deg = zdaz.Zd()*kRad2Deg;
 
-    const float x = s*deg;
-    const float y = c*deg;
+    float x = s*deg;
+    float y = c*deg;
+
+    if (x>95 || x<-95 || y>95 || y<-95)
+    {
+        if (arc->GetX1()==10 && arc->GetY1()==100)
+            return;
+
+        x=-100;
+        y= 100;
+    }
 
     const int pixx = (int)(x/fPix);
     const int pixy = (int)(y/fPix);
 
-    if (fX[planet]==pixx && fY[planet]==pixy)
+    const int oldx = (int)(arc->GetX1()/fPix);
+    const int oldy = (int)(arc->GetY1()/fPix);
+
+    if (oldx==pixx && oldy==pixy)
         return;
-
-    fX[planet] = pixx;
-    fY[planet] = pixy;
 
     //