X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=0554e6b2e951be590bb5db02bb35f12bbde04411;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b45809e0b9ed82322fb243a18fef7a748540f1c3;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/flower/offset.cc b/flower/offset.cc index b45809e0b9..0554e6b2e9 100644 --- a/flower/offset.cc +++ b/flower/offset.cc @@ -1,31 +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 - (c) 1997--2006 Han-Wen Nienhuys + 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. + + 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 . */ #include "offset.hh" - #ifndef STANDALONE -std::string +string Offset::to_string () const { - std::string s; - s = std::string (" (") + std::to_string (coordinate_a_[X_AXIS]) + ", " - + std::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 */ @@ -34,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]; @@ -75,6 +79,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 */ @@ -82,14 +91,28 @@ Real Offset::length () const { return sqrt (sqr (coordinate_a_[X_AXIS]) - + sqr (coordinate_a_[Y_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]); }