fix(listen): Fixed bug with unit converter. Closes #239

QutEcoacoustics · Oct 15, 2015 · 824a3f4 · 824a3f4
1 parent 8c3c15d
commit 824a3f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/components/services/unitConverter.js b/src/components/services/unitConverter.js
@@ -172,10 +172,11 @@ angular
                     return functions.input.startOffset + functions.pixelsToSeconds((left || 0.0) + (width || 0.0));
                 };
                 functions.toLow = function toLow(top, height) {
-                    return functions.pixelsToHertz(
+                    var low =  functions.pixelsToHertz(
                         functions.invertPixels(top || 0.0) - (height || 0.0)
                     );
 
+                    return low >= 0 ? low : 0;
                 };
                 functions.toHigh = function toHigh(top) {
                     return functions.pixelsToHertz(functions.invertPixels(top || 0.0));

diff --git a/src/components/services/unitConverters.spec.js b/src/components/services/unitConverters.spec.js
@@ -166,7 +166,7 @@ describe("The unitConverter service", function () {
         });
 
         it("correctly sets width and height given a stretched image", function () {
-            inputArgs.imageElement = {src: "boobies", naturalWidth: 1200, naturalHeight: 250 };
+            inputArgs.imageElement = {src: "test-image", naturalWidth: 1200, naturalHeight: 250 };
 
             converters = unitConverter.getConversions(inputArgs);
 
@@ -244,6 +244,11 @@ describe("The unitConverter service", function () {
             expect(low).toBe(8010.351563 /*hertz (unrounded = 8010.3515625)*/);
         });
 
+        it("toLow corrects for heights that are too tall", () => {
+            var low = converters.toLow(245, 18); // pixels
+            expect(low).toBe(0 /* hertz */);
+        });
+
         it("correctly calculates the highFrequency for an audioEvent from the top position of a box", function () {
             var high = converters.toHigh(20 /*pixels*/);
             expect(high).toBe(10163.671875 /*hertz (unrounded = 10163.671875)*/);