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

Jump to bottom

Allow to make a layer exclusively visible by pressing ctrl when changing visibility #4061

Merged
merged 5 commits into from
May 8, 2019
Merged

Allow to make a layer exclusively visible by pressing ctrl when changing visibility #4061

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b25dc48
allow to make a layer exclusively visible by pressing ctrl when chang…
philippotto May 2, 2019
61bcea9
change ctrl toggle behavior to match gimps behavior
philippotto May 2, 2019
e204d04
Merge branch 'master' into ctrl-visibility-toggle
philippotto May 6, 2019
4d82140
Merge branch 'master' of github.com:scalableminds/webknossos into ctr…
philippotto May 8, 2019
29e43a2
update changelog and docs
philippotto May 8, 2019
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
30 changes: 29 additions & 1 deletion frontend/javascripts/oxalis/view/settings/dataset_settings_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,21 @@ class DatasetSettings extends React.PureComponent<DatasetSettingsProps> {
</Tooltip>
);

setVisibilityForAllLayers = (isVisible: boolean) => {
const { layers } = this.props.datasetConfiguration;
Object.keys(layers).forEach(otherLayerName =>
this.props.onChangeLayer(otherLayerName, "isDisabled", !isVisible),
);
};

isLayerExclusivelyVisible = (layerName: string): boolean => {
const { layers } = this.props.datasetConfiguration;
return Object.keys(layers).every(otherLayerName => {
const { isDisabled } = layers[otherLayerName];
return layerName === otherLayerName ? !isDisabled : isDisabled;
});
};

getColorSettings = (
[layerName, layer]: [string, DatasetLayerConfiguration],
layerIndex: number,
Expand All @@ -96,7 +111,20 @@ class DatasetSettings extends React.PureComponent<DatasetSettingsProps> {
<div style={{ display: "inline-block", marginRight: 8 }}>
<Switch
size="small"
onChange={val => this.props.onChangeLayer(layerName, "isDisabled", !val)}
onChange={(val, event) => {
if (!event.ctrlKey) {
this.props.onChangeLayer(layerName, "isDisabled", !val);
return;
}
// If ctrl is pressed, toggle between "all layers visible" and
// "only selected layer visible".
if (this.isLayerExclusivelyVisible(layerName)) {
this.setVisibilityForAllLayers(true);
} else {
this.setVisibilityForAllLayers(false);
this.props.onChangeLayer(layerName, "isDisabled", false);
}
}}
checked={!isDisabled}
/>
</div>
Expand Down