Changeset 4108 for trunk/MagicSoft

Timestamp:

05/20/04 06:43:00 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MGMap.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/05/19: Abelardo Moralejo
+
+   * mbase/MGMap.cc
+     - replaced rint by TMath::Nint() (my Mac did not recognize the 
+       former)
 
  2004/05/19: Abelardo Moralejo

trunk/MagicSoft/Mars/mbase/MGMap.cc

@@ -252 +252 @@
         y+= dy;
 
-        const Int_t iy = (int)rint(y);
+        const Int_t iy = TMath::Nint(y);
         if (iy<0 || iy>=h)
             continue;
 
-        const Int_t ix = (int)rint(x);
+        const Int_t ix = TMath::Nint(x);
         if (ix<0 || ix>=w)
             continue;
@@ -284 +284 @@
 void MGMap::DrawCircle(UChar_t *buf, int w, int h, Float_t x, Float_t y, Float_t r, UChar_t col)
 {
-    const Int_t n = (int)rint(sqrt(2.)*r*TMath::Pi()/2);
+    const Int_t n = TMath::Nint(sqrt(2.)*r*TMath::Pi()/2);
     for (int i=0; i<n-1; i++)
     {
@@ -292 +292 @@
         const Double_t dy = r*sin(angle);
 
-        const Int_t x1 = (int)rint(x+dx);
-        const Int_t x2 = (int)rint(x-dx);
-
-        const Int_t y1 = (int)rint(y+dy);
+        const Int_t x1 = TMath::Nint(x+dx);
+        const Int_t x2 = TMath::Nint(x-dx);
+
+        const Int_t y1 = TMath::Nint(y+dy);
         if (y1>=0 && y1<h)
         {
@@ -305 +305 @@
         }
 
-        const Int_t y2 = (int)rint(y-dy);
+        const Int_t y2 = TMath::Nint(y-dy);
         if (y2>=0 && y2<h)
         {
@@ -323 +323 @@
 void MGMap::DrawDot(UChar_t *buf, int w, int h, Float_t cx, Float_t cy, UChar_t col)
 {
-    const Int_t x1 = (int)rint(cx);
-    const Int_t y1 = (int)rint(cy);
+    const Int_t x1 = TMath::Nint(cx);
+    const Int_t y1 = TMath::Nint(cy);
 
     if (x1>=0 && y1>=0 && x1<w && y1<h)