Merge pull request #950 from biigle/keyboard-shortcut-last-annotation

Add keyboard shortcut for last annotation
biigle · Nov 5, 2024 · 097d62c · 097d62c
2 parents c13ef5c + 94e9913
commit 097d62c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/resources/assets/js/annotations/annotatorContainer.vue b/resources/assets/js/annotations/annotatorContainer.vue
@@ -24,6 +24,7 @@ import {CrossOriginError} from './stores/images';
 import {debounce} from './../core/utils';
 import {handleErrorResponse} from '../core/messages/store';
 import {urlParams as UrlParams} from '../core/utils';
+import Keyboard from '../core/keyboard';
 
 /**
  * View model for the annotator container
@@ -592,6 +593,10 @@ export default {
             }
             Messages.danger(`Invalid shape. ${shape} needs ${count} different points.`);
         },
+        selectLastAnnotation() {
+            let lastAnnotation = this.annotations.reduce((lastAnnotated, a) => a.id > lastAnnotated.id ? a : lastAnnotated, { id: 0 });
+            this.handleSelectAnnotation(lastAnnotation);
+        }
     },
     watch: {
         async imageId(id) {
@@ -742,6 +747,8 @@ export default {
                 this.openTab = openTab;
             }
         }
+
+        Keyboard.on('C', this.selectLastAnnotation, 0, this.listenerSet);
     },
     mounted() {
         Events.$emit('annotations.map.init', this.$refs.canvas.map);

diff --git a/resources/assets/js/videos/videoContainer.vue b/resources/assets/js/videos/videoContainer.vue
@@ -18,6 +18,7 @@ import VideoApi from './api/videos';
 import VideoLabelsTab from './components/videoLabelsTab';
 import VideoScreen from './components/videoScreen';
 import VideoTimeline from './components/videoTimeline';
+import Keyboard from '../core/keyboard';
 import {handleErrorResponse} from '../core/messages/store';
 import {urlParams as UrlParams} from '../core/utils';
 
@@ -673,6 +674,10 @@ export default {
             }
             Messages.danger(`Invalid shape. ${shape} needs ${count} different points.`);
         },
+        selectLastAnnotation() {
+            let lastAnnotation = this.annotations.reduce((lastAnnotated, a) => a.id > lastAnnotated.id ? a : lastAnnotated, { id: 0 });
+            this.selectAnnotations([lastAnnotation], this.selectedAnnotations, lastAnnotation.startFrame);
+        }
     },
     watch: {
         'settings.playbackRate'(rate) {
@@ -724,6 +729,8 @@ export default {
         this.video.addEventListener('pause', this.updateVideoUrlParams);
         this.video.addEventListener('seeked', this.updateVideoUrlParams);
 
+        Keyboard.on('C', this.selectLastAnnotation, 0, this.listenerSet);
+
         if (Settings.has('openTab')) {
             this.openTab = Settings.get('openTab');
         }

diff --git a/resources/views/manual/tutorials/annotations/shortcuts.blade.php b/resources/views/manual/tutorials/annotations/shortcuts.blade.php
@@ -123,6 +123,10 @@
                     <td><kbd>p</kbd></td>
                     <td>Capture a screenshot</td>
                 </tr>
+                <tr>
+                    <td><kbd>c</kbd></td>
+                    <td>Select last created annotation</td>
+                </tr>
             </tbody>
         </table>
 

diff --git a/resources/views/manual/tutorials/videos/shortcuts.blade.php b/resources/views/manual/tutorials/videos/shortcuts.blade.php
@@ -115,6 +115,10 @@
                     <td><kbd>Esc</kbd></td>
                     <td>Cancel current action<br><small>e.g. drawing or moving an annotation</small></td>
                 </tr>
+                <tr>
+                    <td><kbd>c</kbd></td>
+                    <td>Select last created annotation</td>
+                </tr>
             </tbody>
         </table>