Merge pull request #524 from Original-Recipe/fixed-resizekeyRtoCtrl4

fix: Fix the key of resize rect from R to ctrl+4
open-mmlab · Jul 17, 2024 · 6dec4b5 · 6dec4b5
2 parents 7ecae3b + 5d5982f
commit 6dec4b5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/packages/lb-annotation/src/constant/keyCode.ts b/packages/lb-annotation/src/constant/keyCode.ts
@@ -20,6 +20,8 @@ enum EKeyCode {
   One = 49,
   Two = 50,
   Three = 51,
+  Four = 52,
+  NumberFour = 100,
   Delete = 46,
   F11 = 122,
   Space = 32,

diff --git a/packages/lb-annotation/src/core/toolOperation/pointCloud2DRectOperation.ts b/packages/lb-annotation/src/core/toolOperation/pointCloud2DRectOperation.ts
@@ -58,7 +58,7 @@ class PointCloud2DRectOperation extends RectOperation {
   }
 
   public onKeyDown(e: KeyboardEvent) {
-    if (this.checkMode || ![EKeyCode.Delete, EKeyCode.R].includes(e.keyCode)) {
+    if (this.checkMode || ![EKeyCode.Delete, EKeyCode.Four, EKeyCode.NumberFour].includes(e.keyCode)) {
       return;
     }
 

diff --git a/packages/lb-annotation/src/core/toolOperation/rectOperation.ts b/packages/lb-annotation/src/core/toolOperation/rectOperation.ts
@@ -1325,7 +1325,7 @@ class RectOperation extends BasicToolOperation {
       return;
     }
 
-    const { keyCode } = e;
+    const { keyCode, ctrlKey } = e;
     switch (keyCode) {
       case EKeyCode.Ctrl:
         if (this.drawingRect) {
@@ -1392,8 +1392,11 @@ class RectOperation extends BasicToolOperation {
         break;
       }
 
-      case EKeyCode.R: {
-        this.resizeRect();
+      case EKeyCode.Four:
+      case EKeyCode.NumberFour: {
+        if (ctrlKey) {
+          this.resizeRect();
+        }
         break;
       }
 

diff --git a/...es/lb-components/src/views/MainView/toolFooter/FooterTips/ToolHotKey/pointCloud/index.tsx b/...es/lb-components/src/views/MainView/toolFooter/FooterTips/ToolHotKey/pointCloud/index.tsx
@@ -197,7 +197,7 @@ const DeletePoint = {
 const Image2DBoxScale = {
   name: 'Image2DBoxScale',
   icon: Image2DBoxScaleSvg,
-  shortCut: ['R'],
+  shortCut: ['Ctrl', '4'],
   noticeInfo: 'SelectedRect',
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,7 @@ class PointCloud2DRectOperation extends RectOperation { @@
       }
       public onKeyDown(e: KeyboardEvent) {
-        if (this.checkMode || ![EKeyCode.Delete, EKeyCode.R].includes(e.keyCode)) {
+        if (this.checkMode || ![EKeyCode.Delete, EKeyCode.Four, EKeyCode.NumberFour].includes(e.keyCode)) {
           return;
         }
@@ Expand Down @@