reverted check on change frame

cvat-ai · Nov 28, 2023 · bbc09d4 · bbc09d4
1 parent 6358dc6
commit bbc09d4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/cvat-ui/src/reducers/settings-reducer.ts b/cvat-ui/src/reducers/settings-reducer.ts
@@ -439,7 +439,8 @@ export default (state = defaultState, action: AnyAction): SettingsState => {
             };
         }
         case AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS:
-        case AnnotationActionTypes.CREATE_ANNOTATIONS_SUCCESS: {
+        case AnnotationActionTypes.CREATE_ANNOTATIONS_SUCCESS:
+        case AnnotationActionTypes.CHANGE_FRAME_SUCCESS: {
             const { states } = action.payload;
             const { shapes } = state;
             const [clampedOpacity, clampedSelectedOpacity] = clampOpacity(states, shapes);

diff --git a/cvat-ui/src/utils/clamp-opacity.ts b/cvat-ui/src/utils/clamp-opacity.ts
@@ -15,12 +15,22 @@ export function clampOpacity(
     const ENHANCED_DEFAULT_OPACITY = 30;
     const ENHANCED_DEFAULT_SELECTED_OPACITY = 60;
 
+    if (shapes.opacity >= ENHANCED_DEFAULT_OPACITY && shapes.selectedOpacity >= ENHANCED_DEFAULT_SELECTED_OPACITY) {
+        return [shapes.opacity, shapes.selectedOpacity];
+    }
+
+    const opacity = Math.max(shapes.opacity, ENHANCED_DEFAULT_OPACITY);
+    const selectedOpacity = Math.max(shapes.selectedOpacity, ENHANCED_DEFAULT_SELECTED_OPACITY);
+
+    if (job?.dimension === DimensionType.DIMENSION_3D) {
+        return [opacity, selectedOpacity];
+    }
+
     const withMasks = states
         .some((_state: ObjectState): boolean => _state.shapeType === ShapeType.MASK);
-    const opacity = withMasks || job?.dimension === DimensionType.DIMENSION_3D ?
-        Math.max(shapes.opacity, ENHANCED_DEFAULT_OPACITY) : shapes.opacity;
-    const selectedOpacity = withMasks || job?.dimension === DimensionType.DIMENSION_3D ?
-        Math.max(shapes.selectedOpacity, ENHANCED_DEFAULT_SELECTED_OPACITY) : shapes.selectedOpacity;
+    if (withMasks) {
+        return [opacity, selectedOpacity];
+    }
 
-    return [opacity, selectedOpacity];
+    return [shapes.opacity, shapes.selectedOpacity];
 }