Changeset 4081 for trunk/MagicSoft/Mars/mastro

Timestamp:

05/15/04 20:05:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstroCatalog.cc (modified) (8 diffs)
• MAstroCatalog.h (modified) (1 diff)

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -128 +128 @@
 
 #include "MTime.h"
-//#include "MString.h"
+#include "MString.h"
 #include "MAstro.h"
 #include "MAstroSky2Local.h"
@@ -179 +179 @@
     fList.SetOwner();
     fMapG.SetOwner();
-    fToolTip = new TGToolTip(0, "", 0);
+    fToolTip = gROOT->IsBatch() || !gClient ? 0 : new TGToolTip(0, "", 0);
 }
 
@@ -203 +203 @@
         delete fObservatory;
 
-    fToolTip->Hide();
-    delete fToolTip;
+    if (fToolTip)
+    {
+        fToolTip->Hide();
+        delete fToolTip;
+    }
 }
 
@@ -726 +729 @@
 // simultaneously.
 //
-void MAstroCatalog::PaintImg(unsigned char *buf, int w, int h)
-{
-    const char * o = "local mirrorx yellow *";
+void MAstroCatalog::PaintImg(unsigned char *buf, int w, int h, Option_t *o)
+{
+    if (!o)
+        o = "local mirrorx yellow * =";
 
     if (TestBit(kHasChanged))
@@ -757 +761 @@
     const Double_t mag = -2.5*log10(v.Mag());
 
-    //MString str;
-    //str.Print("%s:  Ra=%.2fh  Dec=%.1fd  Mag=%.1f", v.GetName(), ra, dec, mag);
-    TString str(Form("%s:  Ra=%.2fh  Dec=%.1fd  Mag=%.1f", v.GetName(), ra, dec, mag));
+    MString str;
+    str.Print("%s:  Ra=%.2fh  Dec=%.1fd  Mag=%.1f", v.GetName(), ra, dec, mag);
     if (txt)
     {
@@ -898 +901 @@
 
     const TVector2 deg = va*TMath::RadToDeg();
-    /*
+
     MString txt;
     if (type==1)
@@ -904 +907 @@
     else
         txt.Print("Zd=%.1fd  Az=%.1fd",  fmod(deg.Y()+270,180)-90, fmod(deg.X()+720, 360));
-        */
-    TString txt;
-    if (type==1)
-        txt = Form("Ra=%.2fh  Dec=%.1fd", fmod(deg.X()/15+48, 24),  fmod(90-deg.Y()+270,180)-90);
-    else
-        txt = Form("Zd=%.1fd  Az=%.1fd",  fmod(deg.Y()+270,180)-90, fmod(deg.X()+720, 360));
 
     TMarker *tip=new TMarker(v0.X(), v0.Y(), kDot);
@@ -1317 +1314 @@
     {
     case kMouseMotion:
-        if (!fToolTip->IsMapped() && !str.IsNull())
+        if (fToolTip && !fToolTip->IsMapped() && !str.IsNull())
             ShowToolTip(px, py, str);
         break;
 
     case kMouseLeave:
-        if (fToolTip->IsMapped())
+        if (fToolTip && fToolTip->IsMapped())
             fToolTip->Hide();
         break;

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -181 +181 @@
 
     //void PaintImg(Int_t id=0, Option_t *o="");
-    void PaintImg(unsigned char *buf, int w=768, int h=576);
+    void PaintImg(unsigned char *buf, int w=768, int h=576, Option_t *o=0);
     void Draw(Option_t *o="");
     void SetDrawOption(Option_t *option="")