# HG changeset patch
# User hertzhaft
# Date 1298199351 -3600
# Node ID 1b172892653450f16e89319d63e90a20d8ec0f61
# Parent  225054177f6716777793a18b6302112c58287d2b
geometry: overlapsRect() plus some comment clarifications

diff -r 225054177f67 -r 1b1728926534 client/digitallibrary/jquery/jquery.digilib.geometry.js
--- a/client/digitallibrary/jquery/jquery.digilib.geometry.js	Sat Feb 19 13:03:31 2011 +0100
+++ b/client/digitallibrary/jquery/jquery.digilib.geometry.js	Sun Feb 20 11:55:51 2011 +0100
@@ -178,8 +178,8 @@
             this.y = pos.y;
             return this;
         };
+        // adds pos to the position
         that.setPt1 = that.setPosition; // TODO: not really the same
-        // adds pos to the position
         that.addPosition = function(pos) {
             this.x += pos.x;
             this.y += pos.y;
@@ -198,14 +198,14 @@
                 y : this.y + this.height / 2
             });
         };
-        // moves this Rectangle's center to position pos
+        // moves this rectangle's center to position pos
         that.setCenter = function(pos) {
             this.x = pos.x - this.width / 2;
             this.y = pos.y - this.height / 2;
             return this;
         };
+        // returns true if both rectangles have equal position and proportion
         that.equals = function(other) {
-            // equal props
             var eq = (this.x === other.x && this.y === other.y && this.width === other.width);
             return eq;
         };
@@ -229,14 +229,18 @@
                     + this.height));
             return ct;
         };
-        // returns if rectangle "rect" is contained in this rectangle
+        // returns true if rectangle "rect" is contained in this rectangle
         that.containsRect = function(rect) {
             return (this.containsPosition(rect.getPt1()) && this
                     .containsPosition(rect.getPt2()));
         };
+        // returns true if rectangle "rect" and this rectangle overlap
+        that.overlapsRect = function(rect) {
+            return (this.containsPosition(rect.getPt1()) || this
+                    .containsPosition(rect.getPt2()));
+        };
         // changes this rectangle's x/y values so it stays inside of rectangle
-        // rect
-        // keeping the proportions
+        // "rect", keeping the proportions
         that.stayInside = function(rect) {
             if (this.x < rect.x) {
                 this.x = rect.x;
@@ -252,7 +256,7 @@
             }
             return this;
         };
-        // clips this rectangle so it stays inside of rectangle rect
+        // clips this rectangle so it stays inside of rectangle "rect"
         that.clipTo = function(rect) {
             var p1 = rect.getPt1();
             var p2 = rect.getPt2();
@@ -261,7 +265,7 @@
             this.setPt2(position(Math.min(this2.x, p2.x), Math.min(this2.y, p2.y)));
             return this;
         };
-        // returns the intersection of the given Rectangle and this one
+        // returns the intersection of rectangle "rect" and this one
         that.intersect = function(rect) {
             // FIX ME: not really, it should return null if there is no overlap
             var sec = rect.copy();
@@ -281,7 +285,8 @@
             }
             return sec;
         };
-        // returns a Rectangle that fits into this one (by moving first)
+        // returns a copy of rectangle "rect" that fits into this one
+        // (moving it first)
         that.fit = function(rect) {
             var sec = rect.copy();
             sec.x = Math.max(sec.x, this.x);
@@ -294,7 +299,7 @@
             }
             return sec.intersect(this);
         };
-        // adjusts position and size of $elem to this rectangle
+        // adjusts position and size of jQuery element "$elem" to this rectangle
         that.adjustDiv = function($elem) {
             $elem.offset({
                 left : this.x,
@@ -302,7 +307,7 @@
             });
             $elem.width(this.width).height(this.height);
         };
-        // returns size and position in css-compatible format
+        // returns position and size of this rectangle in css-compatible format
         that.getAsCss = function() {
             return {
                 left : this.x,
@@ -311,6 +316,11 @@
                 height : this.height
             };
         };
+        // returns position and size of this rectangle formatted for SVG attributes
+        that.getAsSvg = function() {
+            return [this.x, this.y, this.width, this.height].join(" ");
+        };
+        // returns size and position of this rectangle formatted for ??? (w x h@x,y)
         that.toString = function() {
             return this.width + "x" + this.height + "@" + this.x + "," + this.y;
         };
diff -r 225054177f67 -r 1b1728926534 client/digitallibrary/jquery/jquery.digilib.js
--- a/client/digitallibrary/jquery/jquery.digilib.js	Sat Feb 19 13:03:31 2011 +0100
+++ b/client/digitallibrary/jquery/jquery.digilib.js	Sun Feb 20 11:55:51 2011 +0100
@@ -1430,7 +1430,7 @@
             $scaler.css({
                 'background-position' : bgPos.x + "px " + bgPos.y + "px"
                 });
-            // set birdview indicator to reflect new zoom position
+            // send message event with current zoom position
             var za = geom.rectangle($img);
             za.addPosition(delta.neg());
             $data.trigger('dragZoom', [za]);