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

Timestamp:

03/02/03 17:08:13 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

@@ -262 +262 @@
     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!!!***
+    SetDotRange(arc, x, y);
 }
 
@@ -393 +372 @@
 }
 
+bool MGSkyPosition::SetDotRange(TArc *arc, float &x, float &y)
+{
+    if (!(x>-95 && x<95 && y>-95 && y<95))
+    {
+        if (arc->GetX1()==-100 && arc->GetY1()==100)
+            return false;
+
+        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 false;
+
+    arc->SetX1(x);
+    arc->SetY1(y);
+
+    SetModified(); 
+
+    return true;
+}
+
 void MGSkyPosition::UpdatePlanet(Int_t planet, TArc *arc)
 {
@@ -400 +407 @@
     fSlaPlanet->UpdatePlanetPos((ePlanets_t)planet);
 
-    ZdAz zdaz = fSlaPlanet->GetPlanetPos((ePlanets_t)planet);
+    const ZdAz zdaz = fSlaPlanet->GetPlanetPos((ePlanets_t)planet);
 
     //
@@ -413 +420 @@
     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);
-
-    const int oldx = (int)(arc->GetX1()/fPix);
-    const int oldy = (int)(arc->GetY1()/fPix);
-
-    if (oldx==pixx && oldy==pixy)
+    if (!SetDotRange(arc, x, y))
         return;
-
-    //
-    // Set new position
-    //
-    arc->SetX1(x);
-    arc->SetY1(y);
-
-    SetModified();
 
     if (planet==kESaturn)