@@ -21,8 +21,7 @@ import { goBack } from 'connected-react-router';
21
21
import { all , put , select , take , takeLatest } from 'redux-saga/effects' ;
22
22
23
23
import { TicketsCardActions } from '@/v5/store/tickets/card/ticketsCard.redux' ;
24
- import { ROUTES } from '../../constants/routes' ;
25
- import { INITIAL_HELICOPTER_SPEED , VIEWER_GIZMO_MODES , VIEWER_EVENTS } from '../../constants/viewer' ;
24
+ import { INITIAL_HELICOPTER_SPEED , VIEWER_GIZMO_MODES , VIEWER_EVENTS , VIEWER_CLIP_MODES } from '../../constants/viewer' ;
26
25
import * as API from '../../services/api' ;
27
26
import { MultiSelect } from '../../services/viewer/multiSelect' ;
28
27
import { Viewer } from '../../services/viewer/viewer' ;
@@ -44,7 +43,7 @@ import { SequencesActions } from '../sequences';
44
43
import { StarredActions } from '../starred' ;
45
44
import { dispatch } from '../store' ;
46
45
import { TreeActions } from '../tree' ;
47
- import { selectInitialView , selectViewpointsDomain , selectViewpointsList , ViewpointsActions , ViewpointsTypes } from '../viewpoints' ;
46
+ import { selectInitialView , selectViewpointsDomain , ViewpointsActions , ViewpointsTypes } from '../viewpoints' ;
48
47
import { ViewerGuiActions , ViewerGuiTypes } from './viewerGui.redux' ;
49
48
import {
50
49
selectClippingMode ,
@@ -291,14 +290,11 @@ function* setClippingMode({ mode }) {
291
290
try {
292
291
const currentClipMode = yield select ( selectClippingMode ) ;
293
292
if ( currentClipMode !== mode ) {
294
- yield all ( [
295
- put ( ViewerGuiActions . setClipModeSuccess ( mode ) ) ,
296
- Viewer . setClipMode ( mode ) ,
297
- put ( ViewerGuiActions . setGizmoMode ( VIEWER_GIZMO_MODES . TRANSLATE ) ) ,
298
- ] )
299
- }
300
- if ( ! mode ) {
301
- yield put ( ViewerGuiActions . setClipEdit ( false ) ) ;
293
+ yield put ( ViewerGuiActions . setClipModeSuccess ( mode ) ) ;
294
+ if ( ! mode ) {
295
+ yield Viewer . clipToolDelete ( ) ;
296
+ yield put ( ViewerGuiActions . setClipEdit ( false ) ) ;
297
+ }
302
298
}
303
299
} catch ( error ) {
304
300
yield put ( DialogActions . showErrorDialog ( 'set' , 'clip mode' , error ) ) ;
@@ -328,8 +324,9 @@ function* setClipEdit({ isClipEdit }) {
328
324
try {
329
325
const currentClipEdit = yield select ( selectIsClipEdit ) ;
330
326
if ( currentClipEdit !== isClipEdit ) {
327
+ const clippingMode = yield select ( selectClippingMode ) ;
331
328
yield all ( [
332
- isClipEdit ? Viewer . startClipEdit ( ) : Viewer . stopClipEdit ( ) ,
329
+ isClipEdit ? Viewer . startClip ( clippingMode === VIEWER_CLIP_MODES . SINGLE ) : Viewer . stopClipEdit ( ) ,
333
330
put ( ViewerGuiActions . setClipEditSuccess ( isClipEdit ) ) ,
334
331
] )
335
332
}
0 commit comments