From 4ac0805c613830ed90e4658ccff9aa2b349a17c0 Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 12 Dec 2013 16:13:23 +1000 Subject: [PATCH] Rounding for bounds inputs. Fixed bug when determining whether edit should be disabled. --- src/app/listen/listen.js | 2 +- src/components/services/unitConverter.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/listen/listen.js b/src/app/listen/listen.js index c6b9e249..1edac256 100644 --- 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 index d6b36f71..0c19206a 100644 --- 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) {