Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KSW/support up to 16 profiles in multiprofile plotting mode #2441

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

KSW/support up to 16 profiles in multiprofile plotting mode #2441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ca14bf
support up to 16 profiles in multprofile plotting mode
kswang1029 Nov 28, 2024
8c82a6a
add changelog
kswang1029 Nov 28, 2024
83ac1f6
remove white and black colors
kswang1029 Dec 9, 2024
bfa37e0
adjust color lists
kswang1029 Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Synchronized the value format in the pan and zoom tab in the image view settings widget ([#2235](https://github.com/CARTAvis/carta-frontend/issues/2235)).
* Fix save image/export regions bug which could cause directory overwrite or deletion ([#1377](https://github.com/CARTAvis/carta-backend/issues/1377)).
* Fix incorrect rendering of image view when moving the window to monitors with different screen resolution ([[#2285](https://github.com/CARTAvis/carta-frontend/issues/2285)])
### Changed
* Changed the limitation of plotting up-to-10 profiles in the spectral profiler multi-profile mode to up-to-16 ([#2440](https://github.com/CARTAvis/carta-frontend/issues/2440))


## [4.1.0]

Expand Down
2 changes: 1 addition & 1 deletion src/stores/Widgets/SpectralProfileWidget/SpectralProfileSelectionStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface SpectralConfig extends CARTA.SetSpectralRequirements.ISpectralConfig {
regionId: number | null;
}

const MAXIMUM_PROFILES = 10;
const MAXIMUM_PROFILES = 16;

type Profile = {
channelValues: number[];
Expand Down
7 changes: 4 additions & 3 deletions src/utilities/color/color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,21 @@ export const SWATCH_COLORS = [
Colors.FOREST3,
Colors.GOLD3,
Colors.CERULEAN3,
Colors.ROSE3,
Colors.VERMILION3,
Colors.LIGHT_GRAY3,
Colors.DARK_GRAY3,
Colors.WHITE,
Colors.BLACK
];
export const DEFAULT_COLOR = SWATCH_COLORS[0];

const SELECTABLE_COLORS = ["blue", "orange", "green", "red", "violet", "sepia", "indigo", "gray", "lime", "turquoise", "forest", "gold", "cobalt", "light_gray", "dark_gray", "white", "black"];
const SELECTABLE_COLORS = ["blue", "orange", "green", "red", "violet", "sepia", "indigo", "gray", "lime", "turquoise", "forest", "gold", "cerulean", "rose", "vermilion", "light_gray", "dark_gray"];
export const AUTO_COLOR_OPTIONS = SELECTABLE_COLORS.map(color => {
return `auto-${color}`;
});

// SUPPORTED_COLORS are supported since ver. 1.4, and rose/vermilion are removed from selectable colors due to similar to red
const SUPPORTED_COLORS = [...SELECTABLE_COLORS, "rose", "vermilion"];
const SUPPORTED_COLORS = [...SELECTABLE_COLORS, "white", "black"];

// Supported auto colors are in pattern "auto-blue", "auto-orange", "auto-green"...etc
// Validate with regex ^auto-(blue|orange|green...)$
Expand Down
Loading