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

Default to fallback rendering (renderMissingDataBlack == false) #5862

Merged
merged 4 commits into from
Nov 23, 2021
Merged

Default to fallback rendering (renderMissingDataBlack == false) #5862

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
938ba80
default renderMissingDataBlack to false
philippotto Nov 23, 2021
fc070e7
update changelog
philippotto Nov 23, 2021
c07db94
change property to false
philippotto Nov 23, 2021
415e3d1
Merge branch 'master' into default-to-fallback-rendering
daniel-wer Nov 23, 2021
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: 2 additions & 1 deletion CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Added a new bounding box tool that allows resizing and creating bounding boxes more easily. Additionally, the context menu now contains options to modify the bounding box close to the clicked position. [#5767](https://github.com/scalableminds/webknossos/pull/5767)

### Changed
- The docker setup has been restructured, which requires changes to existing docker-compose setups. See the migration guide for details. [#5843](https://github.com/scalableminds/webknossos/pull/5843)
- The docker setup has been restructured, which requires changes to existing docker-compose setups. See the migration guide for details. [#5843](https://github.com/scalableminds/webknossos/pull/5843)
- By default, if data is missing in one magnification, higher magnifications are used for rendering. This setting can be controlled via the left sidebar under "Render Missing Data Black". [#5862](https://github.com/scalableminds/webknossos/pull/5862)

### Fixed
- Fixed a bug that the displayed value range of a histogram of a color layer wasn't applied until the slider was dragged a bit. [#5853](https://github.com/scalableminds/webknossos/pull/5853)
Expand Down
12 changes: 3 additions & 9 deletions frontend/javascripts/oxalis/default_state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
// @flow

import type { OxalisState } from "oxalis/store";
import { defaultDatasetViewConfigurationWithoutNull } from "types/schemas/dataset_view_configuration.schema";
import { document } from "libs/window";
import Constants, {
ControlModeEnum,
OrthoViews,
OverwriteModeEnum,
FillModeEnum,
TDViewDisplayModeEnum,
} from "oxalis/constants";
import { document } from "libs/window";

const defaultViewportRect = {
top: 0,
Expand Down Expand Up @@ -46,14 +47,7 @@ const initialAnnotationInfo = {
const primaryStylesheetElement: ?HTMLLinkElement = document.getElementById("primary-stylesheet");

const defaultState: OxalisState = {
datasetConfiguration: {
fourBit: false,
interpolation: false,
layers: {},
loadingStrategy: "PROGRESSIVE_QUALITY",
segmentationPatternOpacity: 40,
renderMissingDataBlack: false,
},
datasetConfiguration: defaultDatasetViewConfigurationWithoutNull,
userConfiguration: {
autoSaveLayouts: true,
brushSize: 50,
Expand Down
10 changes: 7 additions & 3 deletions frontend/javascripts/types/schemas/dataset_view_configuration.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,20 @@ export const layerViewConfiguration = {
isInEditMode: { type: "boolean" },
};

export const defaultDatasetViewConfiguration = {
export const defaultDatasetViewConfigurationWithoutNull = {
fourBit: false,
interpolation: true,
renderMissingDataBlack: true,
renderMissingDataBlack: false,
loadingStrategy: "PROGRESSIVE_QUALITY",
segmentationPatternOpacity: 40,
layers: {},
};

export const defaultDatasetViewConfiguration = {
...defaultDatasetViewConfigurationWithoutNull,
zoom: null,
position: null,
rotation: null,
layers: {},
};

export const baseDatasetViewConfiguration = {
Expand Down