add new tensorflow model, apply PR feedback #1

scalableminds · Apr 8, 2019 · 7dcae93 · 7dcae93
1 parent 6d706d1
commit 7dcae93
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/docs/keyboard_shortcuts.md b/docs/keyboard_shortcuts.md
@@ -38,6 +38,7 @@ Find all available keyboard shortcuts for webKnossos listed below.
 | Key Binding                   | Operation                                   |
 | ----------------------------- | ------------------------------------------- |
 | Left Mouse Drag or Arrow Keys | Move                                        |
+| Alt + Mouse Move              | Move                                        |
 | SPACE                         | Move Forward by a Single Slice              |
 | Scroll Mousewheel (3D View)   | Zoom In And Out                             |
 | Right Click Drag (3D View)    | Rotate 3D View                              |
@@ -78,6 +79,7 @@ Find all available keyboard shortcuts for webKnossos listed below.
 | CTRL + Left Mouse Drag            | Add Empty Voxels To Current Cell (in Trace / Brush Mode)    |
 | Right Mouse Drag                  | Remove Voxels From Current Cell                             |
 | CTRL + Right Mouse Drag           | Remove Voxels From Any Cell                                 |
+| Alt + Mouse Move                  | Move                                                        |
 | C                                 | Create New Cell                                             |
 | W, 1                              | Toggle Modes (Move / Trace / Brush)                         |
 | SHIFT + Mousewheel or SHIFT + I, O | Change Brush Size (Brush Mode)                              |

diff --git a/frontend/javascripts/admin/help/keyboardshortcut_view.js b/frontend/javascripts/admin/help/keyboardshortcut_view.js
@@ -21,6 +21,10 @@ const KeyboardShortcutView = () => {
       keybinding: "Left Mouse Drag or Arrow Keys",
       action: "Move",
     },
+    {
+      keybinding: "Alt + Mouse Move",
+      action: "Move",
+    },
     {
       keybinding: "I, O, or Alt + Mousewheel",
       action: "Zoom In/out",
@@ -211,6 +215,10 @@ const KeyboardShortcutView = () => {
       keybinding: "Ctrl + Right Mouse Drag",
       action: "Remove Voxels From Any Cell",
     },
+    {
+      keybinding: "Alt + Mouse Move",
+      action: "Move",
+    },
     {
       keybinding: "C",
       action: "Create New Cell",

diff --git a/frontend/javascripts/oxalis/model/sagas/volumetracing_saga.js b/frontend/javascripts/oxalis/model/sagas/volumetracing_saga.js
@@ -62,7 +62,7 @@ import mainThreadPredict from "oxalis/workers/tensorflow.impl";
 import ThreeDMap from "libs/ThreeDMap";
 
 // Will remove model validation, NaN checks, and other correctness checks in favor of performance
-// tf.enableProdMode();
+if (process.env.NODE_ENV === "production") tf.enableProdMode();
 
 const workerPredict = createWorker(TensorFlowWorker);
 
@@ -298,8 +298,12 @@ function* inferSegmentInViewport(action: InferSegmentationInViewportAction): Sag
   Toast.info(toastDescription, toastConfig);
 
   const colorLayers = yield* call([Model, Model.getColorLayers]);
-  // TODO: Which color layer to pick?
   const colorLayer = colorLayers[0];
+  if (colorLayers.length > 1) {
+    Toast.warning(
+      `There are multiple color layers. Using ${colorLayer.name} for automatic segmentation.`,
+    );
+  }
   const [halfViewportExtentX, halfViewportExtentY] = yield* call(
     getHalfViewportExtents,
     activeViewport,

diff --git a/public/tf-models/group1-shard1of1 b/public/tf-models/group1-shard1of1