Skip to content

Commit e03ec07

Browse files
Merge branch 'master' into expand-parent-tree
2 parents b7db915 + 66c1d68 commit e03ec07

File tree

85 files changed

+1474
-1071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1474
-1071
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
blank_issues_enabled: false
1+
blank_issues_enabled: true

CHANGELOG.unreleased.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,28 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
1111
[Commits](https://github.com/scalableminds/webknossos/compare/25.05.0...HEAD)
1212

1313
### Added
14+
- Meshes of Neuroglancer Precomputed Datasets can now be viewed. [#8236](https://github.com/scalableminds/webknossos/pull/8236)
1415
- Added the possibility to join an organization without requiring a paid user slot in case an organization already pays for the same user. Such a user is called a "Guest User". [#8502](https://github.com/scalableminds/webknossos/pull/8502)
16+
- Added that "Create Animation" jobs will now use the correct semgent colors for rendering meshes. [#8605](https://github.com/scalableminds/webknossos/pull/8605)
1517

1618
### Changed
1719
- Remove `data.maybe` dependency and replaced with regular Typescript types. [#8563](https://github.com/scalableminds/webknossos/pull/8563)
1820
- Updated `View Modes` documentation page with links for mouse and keyboard shortcuts. [#8582](https://github.com/scalableminds/webknossos/pull/8582)
1921
- Renamed the button to view the compound annotation of all tasks of a tasktype to be more descriptive. [#8565](https://github.com/scalableminds/webknossos/pull/8565)
20-
- Replaced fixed threshold of 40 meshes by a dynamic limit based on the number of triangles in the mesh for the "Create Animation" job. [#8588](https://github.com/scalableminds/webknossos/pull/8588)
22+
- Replaced fixed threshold of 40 meshes by a dynamic limit based on the number of triangles in the mesh for the "Create Animation" job. [#8588](https://github.com/scalableminds/webknossos/pull/8588)
2123
- Replaced Redux selector `useSelector((state: OxalisState) => ...)` with a typed `useWkSelector(state => ...)` shorthand. [#8591](https://github.com/scalableminds/webknossos/pull/8591)
2224
- Renamed `OxalisState`, `OxalisApplication`, and `OxalisApi` to their respective `Webknossos{State, API, Application}` equivalent [#8591](https://github.com/scalableminds/webknossos/pull/8591)
2325
- Renamed `frontend/javascripts/oxalis` to `frontend/javascripts/viewer`. [#8601](https://github.com/scalableminds/webknossos/pull/8601)
26+
- When loading data from a data layer that has data stored beyond the bounding box specified in the datasource-properties.json, data outside of the bounding box is now zeroed. (the layer is “clipped”). [#8551](https://github.com/scalableminds/webknossos/pull/8551)
27+
- Updated to Typescript from version `5.5` to `5.8`. [#8613](https://github.com/scalableminds/webknossos/pull/8613)
28+
- Updated Voxelytics log streaming to also include the `log_path` attribute. [#8615](https://github.com/scalableminds/webknossos/pull/8615)
2429

2530
### Fixed
2631
- When selecting a skeleton node in a viewport, its tree is focused and scrolled to in the skeleton tab, even if its parent group was collapsed before. [#8585](https://github.com/scalableminds/webknossos/pull/8585)
2732
- Fixed that layer bounding boxes were sometimes colored green even though this should only happen for tasks. [#8535](https://github.com/scalableminds/webknossos/pull/8535)
2833
- Fixed that annotations could not be opened anymore (caused by #8535). [#8599](https://github.com/scalableminds/webknossos/pull/8599)
34+
- The guest tag is now also shown for guest admin users. [#8612](https://github.com/scalableminds/webknossos/pull/8612)
35+
- Fixed a rare bug where segment bounding box would not be displayed correctly, with the request potentially even crashing the server. [#8590](https://github.com/scalableminds/webknossos/pull/8590)
2936

3037
### Removed
3138

MIGRATIONS.unreleased.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ User-facing changes are documented in the [changelog](CHANGELOG.released.md).
99
[Commits](https://github.com/scalableminds/webknossos/compare/25.05.0...HEAD)
1010

1111
### Postgres Evolutions:
12+
1213
- [131-more-indices-on-users.sql](conf/evolutions/131-more-indices-on-users.sql)
14+
- [132-remove-stored-meshes.sql](conf/evolutions/132-remove-stored-meshes.sql)

app/controllers/AuthenticationController.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -580,15 +580,14 @@ class AuthenticationController @Inject()(
580580
}
581581
}
582582

583-
private def validateNameAndEmail(firstName: String,
584-
lastName: String,
585-
email: String): Fox[(String, String, String, List[String])] = {
583+
private def validateNameAndEmail(firstName: String, lastName: String, email: String)(
584+
implicit messages: Messages): Fox[(String, String, String, List[String])] = {
586585
var (errors, fN, lN) = normalizeName(firstName, lastName)
587586
for {
588587
nameEmailError: (String, String, String,
589588
List[String]) <- multiUserDAO.findOneByEmail(email.toLowerCase)(GlobalAccessContext).shiftBox.flatMap {
590589
case Full(_) =>
591-
errors ::= "user.email.alreadyInUse"
590+
errors ::= Messages("user.email.alreadyInUse")
592591
Fox.successful(("", "", "", errors))
593592
case Empty =>
594593
if (errors.nonEmpty) {

app/controllers/MeshController.scala

Lines changed: 0 additions & 83 deletions
This file was deleted.

app/models/mesh/Mesh.scala

Lines changed: 0 additions & 125 deletions
This file was deleted.

app/models/voxelytics/LokiClient.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ class LokiClient @Inject()(wkConf: WkConf, rpc: RPC, val actorSystem: ActorSyste
220220
"thread_name" -> (entry \ "vx" \ "thread_name").as[String],
221221
"vx_version" -> (entry \ "vx" \ "version").as[String],
222222
"user" -> (entry \ "vx" \ "user").as[String],
223-
"pgid" -> (entry \ "vx" \ "process_group_id").as[Long].toString
223+
"pgid" -> (entry \ "vx" \ "process_group_id").as[Long].toString,
224+
"log_path" -> (entry \ "vx" \ "log_path").as[String]
224225
))
225226
).toFox
226227
} yield
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
do $$ begin ASSERT (select schemaVersion from webknossos.releaseInformation) = 131, 'Previous schema version mismatch'; end; $$ LANGUAGE plpgsql;
2+
3+
DROP VIEW webknossos.meshes_;
4+
DROP TABLE webknossos.meshes;
5+
6+
UPDATE webknossos.releaseInformation SET schemaVersion = 132;
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
do $$ begin ASSERT (select schemaVersion from webknossos.releaseInformation) = 132, 'Previous schema version mismatch'; end; $$ LANGUAGE plpgsql;
2+
3+
4+
CREATE TABLE webknossos.meshes(
5+
_id TEXT CONSTRAINT _id_objectId CHECK (_id ~ '^[0-9a-f]{24}$') PRIMARY KEY,
6+
_annotation TEXT CONSTRAINT _annotation_objectId CHECK (_annotation ~ '^[0-9a-f]{24}$') NOT NULL,
7+
description TEXT NOT NULL DEFAULT '',
8+
position webknossos.VECTOR3 NOT NULL,
9+
data TEXT,
10+
created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
11+
isDeleted BOOLEAN NOT NULL DEFAULT false
12+
);
13+
14+
CREATE VIEW webknossos.meshes_ AS SELECT * FROM webknossos.meshes WHERE NOT isDeleted;
15+
16+
ALTER TABLE webknossos.meshes
17+
ADD CONSTRAINT annotation_ref FOREIGN KEY(_annotation) REFERENCES webknossos.annotations(_id) DEFERRABLE;
18+
19+
UPDATE webknossos.releaseInformation SET schemaVersion = 131;

conf/messages

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -260,19 +260,9 @@ annotation.editableMapping.getAgglomerateGraph.failed=Could not look up an agglo
260260
annotation.editableMapping.getAgglomerateIdsForSegments.failed=Could not look up agglomerate ids for requested segments.
261261
annotation.duplicate.failed=Failed to duplicate annotation
262262

263-
mesh.notFound=Mesh could not be found
264-
mesh.write.failed=Failed to convert mesh info to json
265-
mesh.create.failed=Failed to save mesh info
266-
mesh.update.failed=Failed to update mesh info
267-
mesh.data.get.failed=Failed to load mesh raw data
268-
mesh.data.read.failed=Failed to convert mesh raw data for saving
269-
mesh.data.save.failed=Failed to save mesh raw data
270-
mesh.delete.failed=Failed to delete mesh
271-
mesh.file.load.failed=Failed to load mesh for segment {0}
272263
mesh.file.listChunks.failed=Failed to load chunk list for segment {0} from mesh file “{1}”
273264
mesh.file.loadChunk.failed=Failed to load mesh chunk for segment
274265
mesh.file.open.failed=Failed to open mesh file for reading
275-
mesh.file.readData.failed=Failed to read data from mesh file
276266
mesh.file.readEncoding.failed=Failed to read encoding from mesh file
277267

278268
task.create.noTasks=Zero tasks were requested

0 commit comments

Comments
 (0)