Rounding for bounds inputs. Fixed bug when determining whether edit s…

…hould be disabled.
QutEcoacoustics · Dec 12, 2013 · 4ac0805 · 4ac0805
1 parent 3ebee91
commit 4ac0805
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/app/listen/listen.js b/src/app/listen/listen.js
@@ -317,7 +317,7 @@ angular.module('bawApp.listen', ['decipher.tags', 'ui.bootstrap.typeahead'])
                 };
 
                 $scope.singleEditDisabled = function () {
-                    return ($scope.model.selectedAudioEvent.id === undefined);
+                    return ($scope.model.selectedAudioEvent === null || $scope.model.selectedAudioEvent.id === undefined);
                 };
 
 

diff --git a/src/components/services/unitConverter.js b/src/components/services/unitConverter.js
@@ -118,10 +118,14 @@ uc.factory("bawApp.unitConverter", ['conf.constants', function (constants) {
             conversions: conversions,
             pixelsToSeconds: function pixelsToSeconds(pixels) {
                 var seconds = pixels / conversions.pixelsPerSecond;
+                var m = Math.pow(10, constants.unitConverter.precisionSeconds);
+                seconds = Math.round(seconds * m) / m;
                 return seconds;
             },
             pixelsToHertz: function pixelsToHertz(pixels) {
                 var hertz = pixels / conversions.pixelsPerHertz;
+                var m = Math.pow(10, constants.unitConverter.precisionHertz);
+                hertz = Math.round(hertz * m) / m;
                 return hertz;
             },
             secondsToPixels: function secondsToPixels(seconds) {
-Original file line number
+Diff line change
@@ Expand Up @@
                     };
                     $scope.singleEditDisabled = function () {
-                        return ($scope.model.selectedAudioEvent.id === undefined);
+                        return ($scope.model.selectedAudioEvent === null || $scope.model.selectedAudioEvent.id === undefined);
                     };
@@ Expand Down @@