Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Removed unnecessary scrollbars in skeleton tab that occurred especially after resizing. [#8148](https://github.com/scalableminds/webknossos/pull/8148)
- Deleting a bounding box is now possible independently of a visible segmentation layer. [#8164](https://github.com/scalableminds/webknossos/pull/8164)
- S3-compliant object storages can now be accessed via HTTPS. [#8167](https://github.com/scalableminds/webknossos/pull/8167)
- Fixed that skeleton tree nodes were created with the wrong mag. [#8185](https://github.com/scalableminds/webknossos/pull/8185)
- Fixed a layout persistence bug leading to empty viewports, triggered when switching between orthogonal, flight, or oblique mode. [#8177](https://github.com/scalableminds/webknossos/pull/8177)

### Removed
Expand Down
4 changes: 2 additions & 2 deletions frontend/javascripts/oxalis/model/helpers/nml_helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ function serializeNodes(
rotY: node.rotation[1],
rotZ: node.rotation[2],
inVp: node.viewport,
inMag: node.mag,
inMag: node.resolution,
bitDepth: node.bitDepth,
interpolation: node.interpolation,
time: node.timestamp,
Expand Down Expand Up @@ -963,7 +963,7 @@ export function parseNml(nmlString: string): Promise<{
}),
bitDepth: _parseInt(attr, "bitDepth", { defaultValue: DEFAULT_BITDEPTH }),
viewport: _parseInt(attr, "inVp", { defaultValue: DEFAULT_VIEWPORT }),
mag: _parseInt(attr, "inMag", { defaultValue: DEFAULT_RESOLUTION }),
resolution: _parseInt(attr, "inMag", { defaultValue: DEFAULT_RESOLUTION }),
radius: _parseFloat(attr, "radius", { defaultValue: Constants.DEFAULT_NODE_RADIUS }),
timestamp: _parseTimestamp(attr, "time", { defaultValue: DEFAULT_TIMESTAMP }),
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export function createNode(
radius,
rotation,
viewport,
mag: resolution,
resolution,
id: nextNewId,
timestamp,
bitDepth: state.datasetConfiguration.fourBit ? 4 : 8,
Expand Down Expand Up @@ -846,7 +846,7 @@ function serverNodeToMutableNode(n: ServerNode): MutableNode {
rotation: Utils.point3ToVector3(n.rotation),
bitDepth: n.bitDepth,
viewport: n.viewport,
mag: n.resolution,
resolution: n.resolution,
radius: n.radius,
timestamp: n.createdTimestamp,
interpolation: n.interpolation,
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/oxalis/model/sagas/proofread_saga.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ function* createEditableMapping(): Saga<string> {
// Get volume tracing again to make sure the version is up to date
const upToDateVolumeTracing = yield* select((state) => getActiveSegmentationTracing(state));
if (upToDateVolumeTracing == null) {
throw new Error("No active segmentation tracing layer. Cannot create editble mapping.");
throw new Error("No active segmentation tracing layer. Cannot create editable mapping.");
}

const volumeTracingId = upToDateVolumeTracing.tracingId;
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/oxalis/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export type MutableNode = {
rotation: Vector3;
bitDepth: number;
viewport: number;
mag: number;
resolution: number;
radius: number;
timestamp: number;
interpolation: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ const synapseNodeCreator = (synapseId: number, synapsePosition: Vector3): Mutabl
radius: Constants.DEFAULT_NODE_RADIUS,
rotation: [0, 0, 0],
viewport: 0,
mag: 0,
resolution: 0,
id: synapseId,
timestamp: Date.now(),
bitDepth: 8,
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/test/libs/nml.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const createDummyNode = (id: number): Node => ({
untransformedPosition: [id, id, id],
additionalCoordinates: [],
radius: id,
mag: 10,
resolution: 10,
rotation: [id, id, id],
timestamp: id,
viewport: 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ test("SkeletonTracing should add a new node", (t) => {
untransformedPosition: position,
rotation,
viewport,
mag: resolution,
resolution,
id: 1,
radius: 1,
});
Expand Down Expand Up @@ -295,7 +295,7 @@ test("SkeletonTracing should delete nodes and split the tree", (t) => {
untransformedPosition: [0, 0, 0],
additionalCoordinates: null,
radius: 10,
mag: 10,
resolution: 10,
rotation: [0, 0, 0],
timestamp: 0,
viewport: 1,
Expand Down Expand Up @@ -453,7 +453,7 @@ test("SkeletonTracing should delete an edge and split the tree", (t) => {
untransformedPosition: [0, 0, 0],
additionalCoordinates: null,
radius: 10,
mag: 10,
resolution: 10,
rotation: [0, 0, 0],
timestamp: 0,
viewport: 1,
Expand Down