X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbox.cc;h=6569493419da6a66c44077feab15ea5297c46ee9;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=1d69b6ecfb0b95139833702a141bffc050ea3d3a;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/box.cc b/lily/box.cc
index 1d69b6ecfb..6569493419 100644
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -1,19 +1,30 @@
 /*
-  box.cc -- implement Box
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--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.
+
+  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 "box.hh"
-#include "array.hh"
 
 void
 Box::translate (Offset o)
 {
   for (Axis i = X_AXIS; i < NO_AXES; incr (i))
-    interval_a_[i] += o[i];
+    if (!is_empty (i))
+      interval_a_[i] += o[i];
 }
 
 void
@@ -23,18 +34,37 @@ Box::unite (Box b)
     interval_a_[i].unite (b[i]);
 }
 
-/**
-  Initialize to empty.
- */
+Real
+Box::area () const
+{
+  return interval_a_[X_AXIS].length ()
+         * interval_a_[Y_AXIS].length ();
+}
+
 Box::Box ()
-{        
+{
 }
 
 void
 Box::set_empty ()
 {
   interval_a_[X_AXIS].set_empty ();
-  interval_a_[Y_AXIS].set_empty (); 
+  interval_a_[Y_AXIS].set_empty ();
+}
+
+bool
+Box::is_empty () const
+{
+  return is_empty (X_AXIS) && is_empty (Y_AXIS);
+}
+
+bool
+Box::is_empty (Axis a) const
+{
+  Interval empty;
+  empty.set_empty ();
+  return interval_a_[a][LEFT] == empty[LEFT]
+    && interval_a_[a][RIGHT] == empty[RIGHT];
 }
 
 Box::Box (Interval ix, Interval iy)
@@ -44,13 +74,13 @@ Box::Box (Interval ix, Interval iy)
 }
 
 Interval &
-Box::operator[] (Axis a)
+Box::operator [] (Axis a)
 {
   return interval_a_[a];
 }
 
 Interval
-Box::operator[] (Axis a)const
+Box::operator [] (Axis a) const
 {
   return interval_a_[a];
 }
@@ -66,14 +96,14 @@ void
 Box::add_point (Offset o)
 {
   interval_a_[X_AXIS].add_point (o[X_AXIS]);
-  interval_a_[Y_AXIS].add_point (o[Y_AXIS]);  
+  interval_a_[Y_AXIS].add_point (o[Y_AXIS]);
 }
 
 Offset
 Box::center () const
 {
   return Offset (interval_a_[X_AXIS].center (),
-		 interval_a_[Y_AXIS].center ()); 
+                 interval_a_[Y_AXIS].center ());
 }
 
 void
@@ -82,3 +112,25 @@ Box::widen (Real x, Real y)
   interval_a_[X_AXIS].widen (x);
   interval_a_[Y_AXIS].widen (y);
 }
+
+void
+Box::intersect (Box b)
+{
+  interval_a_[X_AXIS].intersect (b[X_AXIS]);
+  interval_a_[Y_AXIS].intersect (b[Y_AXIS]);
+}
+
+// for debugging
+
+void
+Box::print ()
+{
+  printf ("X left %4.4f right %4.4f Y down %4.4f up %4.4f\n",
+          interval_a_[X_AXIS][LEFT], interval_a_[X_AXIS][RIGHT],
+          interval_a_[Y_AXIS][DOWN], interval_a_[Y_AXIS][UP]);
+}
+
+/****************************************************************/
+
+
+const char * const Box::type_p_name_ = "ly:box?";