X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=0554e6b2e951be590bb5db02bb35f12bbde04411;hb=c054eb280fd9953596eb164f67b0f9d5555c5a32;hp=f54772daa9c3747d791572b8ac205e159ee2f833;hpb=c879d18f08f2000f2fdae1efe108e1bd818eb911;p=lilypond.git

diff --git a/flower/offset.cc b/flower/offset.cc
index f54772daa9..0554e6b2e9 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -1,34 +1,35 @@
 /*
-  offset.cc -- implement Offset
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-#include "offset.hh"
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-#include <math.h>
-// #include <cmath>  // undefines isnan on MacOS X.  
+#include "offset.hh"
 
 #ifndef STANDALONE
-String
+string
 Offset::to_string () const
 {
-  String s;
-  s = String (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
-    + ::to_string (coordinate_a_[Y_AXIS]) + ")";
+  string s;
+  s = string (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
+      + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }
 #endif
 
-bool
-isinf_b (Real r)
-{
-  return (fabs (r) > 1e20);
-}
-
 /*
   free bsd fix by John Galbraith
 */
@@ -37,7 +38,7 @@ Offset
 complex_multiply (Offset z1, Offset z2)
 {
   Offset z;
-  if (!isinf_b (z2[Y_AXIS]))
+  if (!isinf (z2[Y_AXIS]))
     {
       z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS] * z2[Y_AXIS];
       z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] + z1[Y_AXIS] * z2[X_AXIS];
@@ -78,20 +79,40 @@ Offset::arg () const
   return atan2 (coordinate_a_[Y_AXIS], coordinate_a_[X_AXIS]);
 }
 
+Real
+Offset::angle_degrees () const
+{
+  return arg () * 180 / M_PI;
+}
 /**
    euclidian vector length / complex modulus
 */
 Real
 Offset::length () const
 {
-  return sqrt (sqr (coordinate_a_[X_AXIS]) + sqr (coordinate_a_[Y_AXIS]));
+  return sqrt (sqr (coordinate_a_[X_AXIS])
+               + sqr (coordinate_a_[Y_AXIS]));
 }
 
 bool
 Offset::is_sane () const
 {
   return !isnan (coordinate_a_[X_AXIS])
-    && !isnan (coordinate_a_ [Y_AXIS])
-    && !isinf (coordinate_a_[X_AXIS]) 
-    && !isnan (coordinate_a_[Y_AXIS]);
+         && !isnan (coordinate_a_ [Y_AXIS])
+         && !isinf (coordinate_a_[X_AXIS])
+         && !isinf (coordinate_a_[Y_AXIS]);
+}
+
+Offset
+Offset::direction () const
+{
+  Offset d = *this;
+  d /= length ();
+  return d;
+}
+
+Offset
+Offset::swapped () const
+{
+  return Offset (coordinate_a_[Y_AXIS], coordinate_a_[X_AXIS]);
 }