Skip to content

Commit

Permalink
Thchang/ hide the blinking toolbar when animating images (#2209)
Browse files Browse the repository at this point in the history
* hide the toolbar in the image view during animating images

* stopped rendering toolbar during animating images
  • Loading branch information
TienHao authored Jul 31, 2023
1 parent 8211a00 commit 4e37811
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Fixed the right ascension label in the image view ([#2192](https://github.com/CARTAvis/carta-frontend/issues/2192)).
* Fixed the multi-spectral-profile intensity unit conversion ([#1758](https://github.com/CARTAvis/carta-frontend/issues/1758)).
* Fixed the Jy/beam to K intensity unit conversion ([#1907](https://github.com/CARTAvis/carta-frontend/issues/1907)).
* Fixed the blinking toolbar in the image view during animating images ([#2163](https://github.com/CARTAvis/carta-frontend/issues/2163)).

## [4.0.0-beta.1]

Expand Down
22 changes: 12 additions & 10 deletions src/components/ImageView/ImagePanel/ImagePanelComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {observer} from "mobx-react";

import {ImageViewLayer} from "components";
import {CursorInfo, CursorInfoVisibility, Zoom} from "models";
import {AppStore} from "stores";
import {AnimationMode, AppStore} from "stores";
import {FrameStore} from "stores/Frame";

import {BeamProfileOverlayComponent} from "../BeamProfileOverlay/BeamProfileOverlayComponent";
Expand Down Expand Up @@ -192,15 +192,17 @@ export class ImagePanelComponent extends React.Component<ImagePanelComponentProp
dragPanningEnabled={appStore.preferenceStore.dragPanning}
docked={this.props.docked && activeLayer !== ImageViewLayer.Catalog}
/>
<ToolbarComponent
docked={this.props.docked}
visible={this.imageToolbarVisible}
frame={frame}
activeLayer={activeLayer}
onActiveLayerChange={appStore.updateActiveLayer}
onRegionViewZoom={this.onRegionViewZoom}
onZoomToFit={this.fitZoomFrameAndRegion}
/>
{!(appStore.animatorStore.animationActive && appStore.animatorStore.animationMode === AnimationMode.FRAME) && (
<ToolbarComponent
docked={this.props.docked}
visible={this.imageToolbarVisible}
frame={frame}
activeLayer={activeLayer}
onActiveLayerChange={appStore.updateActiveLayer}
onRegionViewZoom={this.onRegionViewZoom}
onZoomToFit={this.fitZoomFrameAndRegion}
/>
)}
</div>
);
} else {
Expand Down

0 comments on commit 4e37811

Please sign in to comment.