Make w shortcut non-looping (#5865)

* make w shortcut non-looping and remove leftover 1 shortcut for volume tools * update changelog, adapt docs
scalableminds · Nov 25, 2021 · bc888f0 · bc888f0
1 parent 1767d9d
commit bc888f0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -16,13 +16,14 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 ### Changed
 - The docker setup has been restructured, which requires changes to existing docker-compose setups. See the migration guide for details. [#5843](https://github.com/scalableminds/webknossos/pull/5843)
 - By default, if data is missing in one magnification, higher magnifications are used for rendering. This setting can be controlled via the left sidebar under "Render Missing Data Black". [#5862](https://github.com/scalableminds/webknossos/pull/5862)
+- Made the `w` shortcut to cycle through the tools non-looping. [#5865](https://github.com/scalableminds/webknossos/pull/5865)
 
 ### Fixed
 - Fixed a bug that the displayed value range of a histogram of a color layer wasn't applied until the slider was dragged a bit. [#5853](https://github.com/scalableminds/webknossos/pull/5853)
 - Fixed a bug where admins could not share annotations with teams they were not explicitly a member of. [#5845](https://github.com/scalableminds/webknossos/pull/5845)
 
 ### Removed
--
+- Removed `1` shortcut which allowed to cycle through the tools but only if some of the tools were active. Use `w` instead. [#5865](https://github.com/scalableminds/webknossos/pull/5865)
 
 ### Breaking Change
 -
diff --git a/docs/keyboard_shortcuts.md b/docs/keyboard_shortcuts.md
@@ -104,7 +104,7 @@ Note that you can enable *Classic Controls* which will behave slightly different
 | CTRL + SHIFT + Left Mouse Drag    | Remove Voxels From Cell                                     |
 | Alt + Mouse Move                  | Move                                                        |
 | C                                 | Create New Cell                                             |
-| W, 1                              | Toggle Modes (Move / Trace / Brush)                         |
+| W                                 | Toggle Modes (Move / Skeleton / Trace / Brush / ...)        |
 | SHIFT + Mousewheel or SHIFT + I, O | Change Brush Size (Brush Mode)                             |
 | V                                 | Copy Segmentation of Current Cell From Previous Slice       |
 | SHIFT + V                         | Copy Segmentation of Current Cell From Next Slice           |

diff --git a/frontend/javascripts/oxalis/controller/viewmodes/plane_controller.js b/frontend/javascripts/oxalis/controller/viewmodes/plane_controller.js
@@ -133,7 +133,6 @@ class VolumeKeybindings {
   static getKeyboardControls() {
     return {
       c: () => Store.dispatch(createCellAction()),
-      "1": cycleTools,
       v: () => {
         Store.dispatch(copySegmentationLayerAction());
       },
@@ -378,7 +377,6 @@ class PlaneController extends React.PureComponent<Props> {
         h: () => this.changeMoveValue(25),
         g: () => this.changeMoveValue(-25),
 
-        w: cycleTools,
         ...loopedKeyboardControls,
       },
       {
@@ -427,16 +425,17 @@ class PlaneController extends React.PureComponent<Props> {
         }
       },
       q: downloadScreenshot,
+      w: cycleTools,
     };
 
     // TODO: Find a nicer way to express this, while satisfying flow
-    const emptyDefaultHandler = { c: null, "1": null };
-    const { c: skeletonCHandler, "1": skeletonOneHandler, ...skeletonControls } =
+    const emptyDefaultHandler = { c: null };
+    const { c: skeletonCHandler, ...skeletonControls } =
       this.props.tracing.skeleton != null
         ? SkeletonKeybindings.getKeyboardControls()
         : emptyDefaultHandler;
 
-    const { c: volumeCHandler, "1": volumeOneHandler, ...volumeControls } =
+    const { c: volumeCHandler, ...volumeControls } =
       this.props.tracing.volume != null
         ? VolumeKeybindings.getKeyboardControls()
         : emptyDefaultHandler;
@@ -455,7 +454,6 @@ class PlaneController extends React.PureComponent<Props> {
         volumeCHandler,
         boundingBoxCHandler,
       ),
-      "1": this.createToolDependentKeyboardHandler(skeletonOneHandler, volumeOneHandler),
     };
   }