Changeset 1588:b79bcba43661 in lemon-0.x for lemon

Timestamp:

07/26/05 16:31:29 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2092

Message:

BoundingBox?<T>::operator+=() -> BoundingBox?<T>::add() ->

Location:

lemon

Files:

• graph_to_eps.h (modified) (1 diff)
• xy.h (modified) (3 diffs)

lemon/graph_to_eps.h

@@ -720 +720 @@
       double ns=_nodeSizes[n]*_nodeScale;
       xy<double> p(ns,ns);
-      bb+=p+_coords[n];
-      bb+=-p+_coords[n];
+      bb.add(p+_coords[n]);
+      bb.add(-p+_coords[n]);
     }
     if (bb.empty()) {

lemon/xy.h

@@ -307 +307 @@
   
       ///Increments a bounding box with a point
-      BoundingBox& operator +=(const xy<T>& u){
+      BoundingBox& add(const xy<T>& u){
         if (_empty){
           bottom_left=top_right=u;
@@ -321 +321 @@
       }
   
-      ///Sums a bounding box and a point
-      BoundingBox operator +(const xy<T>& u){
-        BoundingBox b = *this;
-        return b += u;
-      }
+//       ///Sums a bounding box and a point
+//       BoundingBox operator +(const xy<T>& u){
+//         BoundingBox b = *this;
+//         return b += u;
+//       }
 
       ///Increments a bounding box with an other bounding box
-      BoundingBox& operator +=(const BoundingBox &u){
+      BoundingBox& add(const BoundingBox &u){
         if ( !u.empty() ){
-          *this += u.bottomLeft();
-          *this += u.topRight();
+          this->add(u.bottomLeft());
+          this->add(u.topRight());
         }
         return *this;
@@ -339 +339 @@
       BoundingBox operator +(const BoundingBox& u){
         BoundingBox b = *this;
-        return b += u;
+        return b.add(u);
+      }
+
+
+      ///Intersection of two bounding boxes
+      BoundingBox operator &(const BoundingBox& u){
+        BoundingBox b;
+        b.bottom_left.x=std::max(this->bottom_left.x,u.bottom_left.x);
+        b.bottom_left.y=std::max(this->bottom_left.y,u.bottom_left.y);
+        b.top_right.x=std::min(this->top_right.x,u.top_right.x);
+        b.top_right.y=std::min(this->top_right.y,u.top_right.y);
+        b._empty = this->_empty || u._empty ||
+          b.bottom_left.x>top_right.x && b.bottom_left.y>top_right.y;
+        return b;
       }