Merge branch 'master' into topic/master-translation

[lilypond.git] / flower / offset.cc

diff --git a/flower/offset.cc b/flower/offset.cc
index f578b191f9a4c8b93f4f694a8b8f06beefb522c8..294f69e6f8e5a3c2626497615c14038429df8ece 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -8,7 +8,6 @@
 
 #include "offset.hh"
 
-
 #ifndef STANDALONE
 string
 Offset::to_string () const
@@ -75,6 +74,11 @@ 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
 */
@@ -91,5 +95,19 @@ 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]);
+    && !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]);
 }