Changeset 8999 for trunk/MagicSoft/Mars/mastro

Timestamp:

07/14/08 20:59:13 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstro.cc (modified) (2 diffs)
• MAstroCatalog.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -213 +213 @@
     Deg2Dms(deg, sgn, d, m, s);
 
-    MString str;
-    str.Print(fmt, sgn, d, m ,s);
-    return str;
+    return MString::Format(fmt, sgn, d, m ,s);
 }
 
@@ -224 +222 @@
     Hor2Hms(deg, sgn, h, m, s);
 
-    MString str;
-    str.Print(fmt, sgn, h, m ,s);
-    return str;
+    return MString::Format(fmt, sgn, h, m ,s);
 }
 

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.30 2008-06-02 08:46:39 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.31 2008-07-14 19:59:08 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -959 +959 @@
     const TVector2 deg = va*TMath::RadToDeg();
 
-    MString txt;
-    if (type==1)
-        txt.Print("Ra=%.2fh  Dec=%.1fd", fmod(deg.X()/15+48, 24),  fmod(90-deg.Y()+270,180)-90);
-    else
-        txt.Print("Zd=%.1fd  Az=%.1fd",  fmod(deg.Y()+270,180)-90, fmod(deg.X()+720, 360));
+    const TString txt = type==1 ?
+        MString::Format("Ra=%.2fh  Dec=%.1fd", fmod(deg.X()/15+48, 24),  fmod(90-deg.Y()+270,180)-90) :
+        MString::Format("Zd=%.1fd  Az=%.1fd",  fmod(deg.Y()+270,180)-90, fmod(deg.X()+720, 360));
 
     TMarker *tip=new TMarker(v0.X(), v0.Y(), kDot);