Changeset 1804 for trunk/MagicSoft/Cosy/gui

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGEmbeddedCanvas.cc (modified) (1 diff)
• MGEmbeddedCanvas.h (modified) (1 diff)
• MGSkyPosition.cc (modified) (4 diffs)
• MGSkyPosition.h (modified) (1 diff)
• MGStarguider.cc (modified) (6 diffs)

trunk/MagicSoft/Cosy/gui/MGEmbeddedCanvas.cc

@@ -52 +52 @@
 }
 
+void MGEmbeddedCanvas::Resize(TGDimension size)
+{
+    fWidth = size.fWidth;
+    fPix = 2.*fRange/size.fWidth;
+    TRootEmbeddedCanvas::Resize(size);
+}
+
+void MGEmbeddedCanvas::Resize(UInt_t w, UInt_t h)
+{
+    fWidth = w;
+    fPix = 2.*fRange/w;
+    TRootEmbeddedCanvas::Resize(w, h);
+}
+
+void MGEmbeddedCanvas::MoveResize(Int_t x, Int_t y, UInt_t w, UInt_t h)
+{
+    fWidth = w;
+    fPix = 2.*fRange/w;
+    TRootEmbeddedCanvas::MoveResize(x, y, w, h);
+}
+
 // ------------------------------------------------------------------------
 //

trunk/MagicSoft/Cosy/gui/MGEmbeddedCanvas.h

@@ -37 +37 @@
     ~MGEmbeddedCanvas();
 
+    void Resize(TGDimension size);
+    void Resize(UInt_t w, UInt_t h);
+    void MoveResize(Int_t x, Int_t y, UInt_t w, UInt_t h);
+
     void UpdateCanvas();
 

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)

trunk/MagicSoft/Cosy/gui/MGSkyPosition.h

@@ -54 +54 @@
     const MObservatory::LocationName_t fObservatory;
 
-//    Int_t fStarX[13];
-//    Int_t fStarY[13];
-
-//    Int_t fPlanetX[9];
-//    Int_t fPlanetY[9];
+    bool SetDotRange(TArc *arc, float &x, float &y);
 
     void InitArc(TArc *arc, Int_t fillstyle, Int_t fillcolor, Int_t linecolor);

trunk/MagicSoft/Cosy/gui/MGStarguider.cc

@@ -77 +77 @@
     gVirtualX->GrabButton(fId, kButton2, 0, 0, 0, 0, kTRUE);
 
-
     fList = new MGList;
 
@@ -188 +187 @@
     fList->Add(fCZdAz);
 
-    const Double_t pixsize = 23.4;
+    const Double_t pixsize = 23.5;
 
     fSao->SetPixSize(pixsize/3600);
@@ -555 +554 @@
 void MGStarguider::ProcessFrame(const unsigned long n, byte *img, struct timeval *tm)
 {
+    static float myimg[768*576];
+
+    for (int i=0; i<768*576; i++)
+        myimg[i] += img[i];
+
+    if (n%fIntRate)
+        return;
+
+    cout << "Img: " << n << endl;
+
+    byte c[768*576];
+    for (int i=0; i<768*576; i++)
+        c[i] = (byte)(myimg[i]/fIntRate+.5);
+
     if (!fWrite->IsEntryEnabled(IDM_kStart) &&
         (!(n%fWrtRate) || fWriteType->IsEntryChecked(IDM_kOnce)))
@@ -563 +576 @@
             char name[80];
             sprintf(name, "pix/file%04d.png", num++);
-            Writer::Png(name, img, tm);
+            Writer::Png(name, c, tm);
         }
 
@@ -571 +584 @@
             char name[80];
             sprintf(name, "pix/file%04d.ppm", num++);
-            Writer::Ppm(name, img);
+            Writer::Ppm(name, c);
         }
 
@@ -578 +591 @@
     }
 
-    static float myimg[768*576];
-
-    for (int i=0; i<768*576; i++)
-        myimg[i] += img[i];
-
-    if (n%fIntRate)
-        return;
-
-    cout << "Img: " << n << endl;
-
-    byte c[768*576];
-    for (int i=0; i<768*576; i++)
-        c[i] = (byte)(myimg[i]/fIntRate+.5);
 
     MStarList spots;