Feedback based on meeting

QutEcoacoustics · May 27, 2014 · e332821 · e332821
1 parent b0cc80c
commit e332821
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/src/app/annotationLibrary/annotationLibrary.js b/src/app/annotationLibrary/annotationLibrary.js
@@ -134,6 +134,13 @@ angular.module('bawApp.annotationLibrary', ['bawApp.configuration'])
                 $scope.setFilter();
             };
 
+            $scope.searchFilter = function searchFilter() {
+                // reset page number on search
+                $scope.filterSettings.page = 1;
+
+                $scope.setFilter();
+            };
+
             $scope.updateFilter = function updateFilter(filterSettings) {
                 $scope.filterSettings = filterSettings;
                 $scope.setFilter();

diff --git a/src/app/annotationLibrary/annotationLibrary.tpl.html b/src/app/annotationLibrary/annotationLibrary.tpl.html
@@ -91,7 +91,7 @@ <h3>Annotation Library</h3>
                 </div>
                 <div class="form-group">
                     <div class="col-sm-offset-1 col-sm-2">
-                        <button type="submit" class="btn btn-primary" data-ng-click="setFilter()">Filter</button>
+                        <button type="submit" class="btn btn-primary" data-ng-click="searchFilter()">Filter</button>
                         <button type="submit" class="btn btn-warning" data-ng-click="clearFilter()">Clear</button>
                     </div>
                     <div class="col-sm-2">

diff --git a/src/app/annotationViewer/annotationViewer.js b/src/app/annotationViewer/annotationViewer.js
@@ -77,7 +77,7 @@ avModule.controller('AnnotationViewerCtrl', ['$scope', '$element', '$attrs', '$t
 
                     return (offset).toFixed(0);
                 },
-                title: "Time offset (seconds)"
+                title: "Time (seconds)"
             }
         };
 

diff --git a/src/app/annotationViewer/gridLines/gridLines.js b/src/app/annotationViewer/gridLines/gridLines.js
@@ -102,7 +102,7 @@ bawGLs.directive('gridLines',
                     var element = container.children[j - start];
 
                     if (innerText) {
-                        var label = formatter(steps[j].value, j, steps.min, steps.max)
+                        var label = formatter(steps[j].value, j, steps.min, steps.max);
                         element.innerText = label;
                         biggest = label.length > biggest ? label.length : biggest;
                     }

diff --git a/src/app/listen/listen.tpl.html b/src/app/listen/listen.tpl.html
@@ -138,7 +138,7 @@ <h1 id="chunkInfo" class="row">
 					<div class="row">
 
 							<label class="col-xs-2" for="start-time">
-								<span>Start</span>
+								<span>Start (s)</span>
 							</label>
 								<input class="col-xs-3" id="start-time" type="number" min="{{limits.timeMin}}" max="{{limits.timeMax}}" step="0.5" required
 									   ng-disabled="singleEditDisabled()"
@@ -147,7 +147,7 @@ <h1 id="chunkInfo" class="row">
 
 
 							<label class="col-xs-2 col-md-offset-1" for="high-frequency" >
-								<span>High Frequency</span>
+								<span>High Frequency (Hz)</span>
 							</label>
 
 								<input class="col-xs-3" id="high-frequency" type="number" min="{{limits.freqMin}}" max="{{limits.freqMax}}" step="100" required
@@ -161,7 +161,7 @@ <h1 id="chunkInfo" class="row">
 
 
 							<label class="col-xs-2" for="end-time">
-								<span>End</span>
+								<span>End (s)</span>
 							</label>
 								<input class="col-xs-3" id="end-time" type="number" min="{{limits.timeMin}}" max="{{limits.timeMax}}" step="0.5" required
 									   ng-disabled="singleEditDisabled()"
@@ -170,7 +170,7 @@ <h1 id="chunkInfo" class="row">
 
 
 							<label class="col-xs-2 col-md-offset-1" for="low-frequyency">
-								<span>Low Frequency</span>
+								<span>Low Frequency (Hz)</span>
 							</label>
 								<input class="col-xs-3" id="low-frequyency" type="number" min="{{limits.freqMin}}" max="{{limits.freqMax}}" step="100" required
 									   ng-disabled="singleEditDisabled()"
@@ -181,13 +181,13 @@ <h1 id="chunkInfo" class="row">
 					</div>
                     <div class="row">
                         <small class="col-xs-2 text-right">
-                            Duration
+                            Duration (s)
                         </small>
                         <small class="col-xs-3">
                             {{model.selectedAudioEvent.endTimeSeconds -  model.selectedAudioEvent.startTimeSeconds | number:3}}
                         </small>
                         <small class="col-xs-2 col-md-offset-1 text-right">
-                            Difference
+                            Difference (Hz)
                         </small>
                         <small class="col-xs-3">
                             {{model.selectedAudioEvent.highFrequencyHertz -  model.selectedAudioEvent.lowFrequencyHertz | number:0}}
-Original file line number
+Diff line change
@@ Expand Up @@
                         return (offset).toFixed(0);
                     },
-                    title: "Time offset (seconds)"
+                    title: "Time (seconds)"
                 }
             };
@@ Expand Down @@