Changeset 2278 for trunk/MagicSoft/Cosy/gui/MGVelocity.cc

Timestamp:

07/15/03 15:05:21 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/gui/MGVelocity.cc (modified) (7 diffs)

trunk/MagicSoft/Cosy/gui/MGVelocity.cc

@@ -24 +24 @@
 void MGVelocity::DrawCoordinateSystem()
 {
-    /*
-    TArc arc;
-    arc.SetFillStyle(4000);  // transparent
-    arc.SetFillColor(39);
-    arc.SetLineColor(3);     // green
-    arc.SetLineStyle(2);     // dashed  (s. TAttLine)
-    arc.DrawArc(0, 0,  20);
-
-    arc.SetLineColor(5);     // yellow
-    arc.DrawArc(0, 0,  40);
-
-    arc.SetLineColor(2);     // red
-    arc.DrawArc(0, 0, 60);
-    */
-    //
-    // FIXME? Use TAxis?
-    //
-/*
-    TLine line;
-    line.SetLineColor(13);
-    line.SetLineStyle(3);  // dotted  (s. TAttLine)
-    line.DrawLine(-30., -65., -30.,  65.);
-    line.DrawLine(-65., -30.,  65., -30.);
-    line.DrawLine( 30., -65.,  30.,  65.);
-    line.DrawLine( -6.,  30.,  65.,  30.);
-
-    line.DrawLine(-15., -65., -15.,  65.);
-    line.DrawLine(-65., -15.,  65., -15.);
-    line.DrawLine( 15., -65.,  15.,  65.);
-    line.DrawLine(-65.,  15.,  65.,  15.);
-
-    line.DrawLine(-45., -65., -45.,  65.);
-    line.DrawLine(-65., -45.,  65., -45.);
-    line.DrawLine( 45., -65.,  45.,  65.);
-    line.DrawLine(-65.,  45.,  65.,  45.);
-
-    line.SetLineColor(12);
-    line.SetLineStyle(2);  // dashed  (s. TAttLine)
-    line.DrawLine(-60., -65., -60.,  65.);
-    line.DrawLine(-65., -60.,  65., -60.);
-    line.DrawLine( 60., -65.,  60.,  65.);
-    line.DrawLine(-65.,  60.,  65.,  60.);
-
-    line.SetLineColor(1);  // black
-    line.SetLineStyle(1);  // solid  (s. TAttLine)
-    line.DrawLine(-65.,   0, 65.,  0);
-    line.DrawLine(  0, -65.,  0, 65.);
-
-    line.DrawLine(-1.,  60., 1.,  60.);
-    line.DrawLine(-1., -60., 1., -60.);
-    line.DrawLine(-1.,  30., 1.,  30.);
-    line.DrawLine(-1., -30., 1., -30.);
-
-    line.DrawLine( 60., -1.,  60., 1.);
-    line.DrawLine(-60., -1., -60., 1.);
-    line.DrawLine( 30., -1.,  30., 1.);
-    line.DrawLine(-30., -1., -30., 1.);
-
-    TText text;
-    text.SetTextAlign(22);  // centered, centered (s.TAttText)
-    text.DrawText(60., 5., "vAz['/min]");
-    text.DrawText(0,  70., "vZd['/min]");
-
-    text.SetTextAlign(23);  // centered, centered (s.TAttText)
-    text.DrawText(-60., -2., "-1'");
-    text.DrawText( 60., -2., "1'");
-    text.DrawText(-30., -2., "-.5'");
-    text.DrawText( 30., -2., ".5'");
-
-    text.SetTextAlign(32);  // centered, centered (s.TAttText)
-    text.DrawText(-2., -60., "-1'");
-    text.DrawText(-2.,  60., "1'");
-    text.DrawText(-2., -30., "-.5'");
-    text.DrawText(-2.,  30., ".5'");
-    */
     TWbox box;
     box.DrawWbox(-145, 145, -35, 120,  18,  2, 1);
@@ -130 +55 @@
 void MGVelocity::InitVelocity()
 {
-    /*
-     fLin1  = new TLine(0, 0, 0, 0);
-    fLin2  = new TLine(0, 0, 0, 0);
-
-    fLin1->SetLineColor(10); // white (s. TAttFill)
-    fLin2->SetLineColor(10); // white
-    fLin1->SetLineStyle(1);  // solid (s. TAttLine)
-    fLin2->SetLineStyle(1); 
-
-    fLin1->Draw();
-    fLin2->Draw();
-
-    fList->Add(fLin1);
-    fList->Add(fLin2);
-    */
     fArrow    = new TArrow(0, 0, 0, 0, 0.01);
     fArrowX   = new TArrow(0, 0, 0, 0, 0.01);
@@ -170 +80 @@
     fText->Draw();
     fList->Add(fText);
-
-    fTextVel = new TText(2*70, 2*70, "");
-    fTextVel->SetTextAlign(33);  // right, top
-    fTextVel->SetTextColor(10);  // white
-    fTextVel->Draw();
-    fList->Add(fTextVel);
 }
 
@@ -255 +159 @@
     fArrowAvg->SetX2(avgx);
     fArrowAvg->SetY2(avgy);
-
-    //    cout << avgx << " " << avgy << endl;
 
     if ((fabs(avgx)>/*40.*/110. || fabs(avgy)>/*40.*/110.))
@@ -274 +176 @@
 }
 
-void MGVelocity::UpdateVelText(Float_t vx, Float_t vy)
-{
-    static int X = ~0;
-    static int Y = ~0;
-
-    vx /= 60.;  //['/min]
-    vy /= 60.;  //['/min]
-
-    int fx = (int)/*floor*/(vx*10.);
-    int fy = (int)/*floor*/(vy*10.);
-
-    if (X==fx && Y==fy)
-        return;
-
-    X = fx;
-    Y = fy;
-
-    char txt[100];
-    sprintf(txt, "Zd=%.1f'\nAz=%.1f'",
-            vy, vx);
-
-    fTextVel->SetText(fTextVel->GetX(), fTextVel->GetY(), txt);
-}
-
 void MGVelocity::Update(ZdAz &zdaz)
 {
@@ -303 +181 @@
     // calculate actual time for planet positions
     //
-    //    static int X = 0xaffe;
-    //    static int Y = 0xaffe;
-
     float vx = zdaz.Az()*3600.; // ["/min]
     float vy = zdaz.Zd()*3600.; // ["/min]
 
-    UpdateVelText(vx, vy);
-
     int pixx = (int)(vx*fScale/fPix);
     int pixy = (int)(vy*fScale/fPix);
@@ -328 +201 @@
         return;
 
-    //    cout << fScale << ": " << pixx << " " << pixy;
-    //    cout << fScale << ": " << (int)rc << (int)((int)fOld->X()==pixx) << (int)((int)fOld->Y()==pixy) << "  ";
-    //    cout << zdaz.Az()*3600. << " " << zdaz.Zd()*3600. << endl;
-
     vx *= fScale;
     vy *= fScale;