LEMON/LEMON-official Changeset - r241:92f046dd7f6c

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r241:92f046dd7f6c

« 235:b46d27

242:dbe3fc »

r241:92f046dd7f6c

Tue, 29 Jul 2008 14:41:16

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Improvements in dim2::BoundingBox (ticket #126) - Rename the private varibles to start with underscore. - Doc improvements.

0 1 0

default

1 file changed with 54 insertions and 52 deletions:

lemon/dim2.h

↑ Collapse diff ↑

lemon/dim2.h

Show inline comments

@@ -22,3 +22,2 @@
 		#include <iostream>
 		#include <lemon/core.h>
@@ -269,3 +268,3 @@
 		    class BoundingBox {
-		      Point<T> bottom_left, top_right;
+		      Point<T> _bottom_left, _top_right;
 		      bool _empty;
@@ -277,3 +276,6 @@
 		      ///Construct an instance from one point
-		      BoundingBox(Point<T> a) { bottom_left=top_right=a; _empty = false; }
 		      BoundingBox(Point<T> a) {
 		        _bottom_left = _top_right = a;
 		        _empty = false;
+		      }
@@ -288,4 +290,4 @@
+		      {
 		        bottom_left=a;
 		        top_right=b;
 		        _bottom_left = a;
 		        _top_right = b;
 		        _empty = false;
@@ -304,4 +306,4 @@
+		      {
 		        bottom_left=Point<T>(l,b);
 		        top_right=Point<T>(r,t);
 		        _bottom_left=Point<T>(l,b);
 		        _top_right=Point<T>(r,t);
 		        _empty = false;
@@ -322,3 +324,3 @@
 		      void clear() {
-		        _empty=1;
+		        _empty = true;
+		      }
@@ -330,3 +332,3 @@
 		      Point<T> bottomLeft() const {
-		        return bottom_left;
+		        return _bottom_left;
+		      }
@@ -336,5 +338,5 @@
 		      ///Set the bottom left corner of the box.
-		      ///It should only be used for non-empty box.
+		      ///\pre The box must not be empty.
 		      void bottomLeft(Point<T> p) {
-		        bottom_left = p;
+		        _bottom_left = p;
+		      }
@@ -346,3 +348,3 @@
 		      Point<T> topRight() const {
-		        return top_right;
+		        return _top_right;
+		      }
@@ -352,5 +354,5 @@
 		      ///Set the top right corner of the box.
-		      ///It should only be used for non-empty box.
+		      ///\pre The box must not be empty.
 		      void topRight(Point<T> p) {
-		        top_right = p;
+		        _top_right = p;
+		      }
@@ -362,3 +364,3 @@
 		      Point<T> bottomRight() const {
-		        return Point<T>(top_right.x,bottom_left.y);
+		        return Point<T>(_top_right.x,_bottom_left.y);
+		      }
@@ -368,6 +370,6 @@
 		      ///Set the bottom right corner of the box.
-		      ///It should only be used for non-empty box.
+		      ///\pre The box must not be empty.
 		      void bottomRight(Point<T> p) {
 		        top_right.x = p.x;
 		        bottom_left.y = p.y;
 		        _top_right.x = p.x;
 		        _bottom_left.y = p.y;
+		      }
@@ -379,3 +381,3 @@
 		      Point<T> topLeft() const {
-		        return Point<T>(bottom_left.x,top_right.y);
+		        return Point<T>(_bottom_left.x,_top_right.y);
+		      }
@@ -385,6 +387,6 @@
 		      ///Set the top left corner of the box.
-		      ///It should only be used for non-empty box.
+		      ///\pre The box must not be empty.
 		      void topLeft(Point<T> p) {
 		        top_right.y = p.y;
 		        bottom_left.x = p.x;
 		        _top_right.y = p.y;
 		        _bottom_left.x = p.x;
+		      }
@@ -396,3 +398,3 @@
 		      T bottom() const {
-		        return bottom_left.y;
+		        return _bottom_left.y;
+		      }
@@ -402,5 +404,5 @@
 		      ///Set the bottom of the box.
-		      ///It should only be used for non-empty box.
+		      ///\pre The box must not be empty.
 		      void bottom(T t) {
-		        bottom_left.y = t;
+		        _bottom_left.y = t;
+		      }
@@ -412,3 +414,3 @@
 		      T top() const {
-		        return top_right.y;
+		        return _top_right.y;
+		      }
@@ -418,5 +420,5 @@
 		      ///Set the top of the box.
-		      ///It should only be used for non-empty box.
+		      ///\pre The box must not be empty.
 		      void top(T t) {
-		        top_right.y = t;
+		        _top_right.y = t;
+		      }
@@ -428,3 +430,3 @@
 		      T left() const {
-		        return bottom_left.x;
+		        return _bottom_left.x;
+		      }
@@ -434,5 +436,5 @@
 		      ///Set the left side of the box.
-		      ///It should only be used for non-empty box.
+		      ///\pre The box must not be empty.
 		      void left(T t) {
-		        bottom_left.x = t;
+		        _bottom_left.x = t;
+		      }
@@ -444,3 +446,3 @@
 		      T right() const {
-		        return top_right.x;
+		        return _top_right.x;
+		      }
@@ -450,5 +452,5 @@
 		      ///Set the right side of the box.
-		      ///It should only be used for non-empty box.
+		      ///\pre The box must not be empty.
 		      void right(T t) {
-		        top_right.x = t;
+		        _top_right.x = t;
+		      }
@@ -460,3 +462,3 @@
 		      T height() const {
-		        return top_right.y-bottom_left.y;
+		        return _top_right.y-_bottom_left.y;
+		      }
@@ -468,3 +470,3 @@
 		      T width() const {
-		        return top_right.x-bottom_left.x;
+		        return _top_right.x-_bottom_left.x;
+		      }
@@ -476,4 +478,4 @@
 		        else{
 		          return ((u.x-bottom_left.x)*(top_right.x-u.x) >= 0 &&
 		              (u.y-bottom_left.y)*(top_right.y-u.y) >= 0 );
 		          return ( (u.x-_bottom_left.x)*(_top_right.x-u.x) >= 0 &&
 		                   (u.y-_bottom_left.y)*(_top_right.y-u.y) >= 0 );
+		        }
@@ -487,3 +489,3 @@
 		        if (_empty){
-		          bottom_left=top_right=u;
+		          _bottom_left = _top_right = u;
 		          _empty = false;
@@ -491,6 +493,6 @@
 		        else{
 		          if (bottom_left.x > u.x) bottom_left.x = u.x;
 		          if (bottom_left.y > u.y) bottom_left.y = u.y;
 		          if (top_right.x < u.x) top_right.x = u.x;
 		          if (top_right.y < u.y) top_right.y = u.y;
 		          if (_bottom_left.x > u.x) _bottom_left.x = u.x;
 		          if (_bottom_left.y > u.y) _bottom_left.y = u.y;
 		          if (_top_right.x < u.x) _top_right.x = u.x;
 		          if (_top_right.y < u.y) _top_right.y = u.y;
+		        }
@@ -505,4 +507,4 @@
 		        if ( !u.empty() ){
 		          this->add(u.bottomLeft());
 		          this->add(u.topRight());
 		          add(u._bottom_left);
 		          add(u._top_right);
+		        }
@@ -517,11 +519,11 @@
 		        BoundingBox b;
-		        if (this->_empty || u._empty) {
 		        if (_empty || u._empty) {
 		          b._empty = true;
 		        } else {
 		          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 = b.bottom_left.x > b.top_right.x ||
 		                     b.bottom_left.y > b.top_right.y;
 		          b._bottom_left.x = std::max(_bottom_left.x, u._bottom_left.x);
 		          b._bottom_left.y = std::max(_bottom_left.y, u._bottom_left.y);
 		          b._top_right.x = std::min(_top_right.x, u._top_right.x);
 		          b._top_right.y = std::min(_top_right.y, u._top_right.y);
 		          b._empty = b._bottom_left.x > b._top_right.x ||
 		                     b._bottom_left.y > b._top_right.y;
+		        }

0 comments (0 inline)

RhodeCode

Login to your account