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.

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

Rename Resolution to Mag #8111

Merged
merged 45 commits into from
Oct 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c4be79f
start to replace term resolution
knollengewaechs Oct 2, 2024
751d4f9
rename resolution to mag in backend where possible
fm3 Oct 8, 2024
58e75dd
rename resolution restrictions
knollengewaechs Oct 11, 2024
9b32b5f
rename resolution info to mag info
knollengewaechs Oct 12, 2024
e012803
rename in dataset accessor, a.o.
knollengewaechs Oct 12, 2024
f21b745
rename in frontend code
knollengewaechs Oct 12, 2024
ca6b25f
rename in docs
knollengewaechs Oct 12, 2024
6ec5cf5
rename node resolution to mag
knollengewaechs Oct 12, 2024
84e7333
adjust mag slider
knollengewaechs Oct 12, 2024
10a693d
fix tests
knollengewaechs Oct 12, 2024
7626df1
add explaining sentences
knollengewaechs Oct 12, 2024
d93c850
refresh snapshots
knollengewaechs Oct 14, 2024
bedf85c
improve explanation in info tab and status bar
knollengewaechs Oct 14, 2024
eaf7fec
adapt param name
knollengewaechs Oct 14, 2024
b9be934
merge master, with updated snapshots
knollengewaechs Oct 14, 2024
9be7f8b
remove application conf edits
knollengewaechs Oct 14, 2024
b7c4ecc
lint
knollengewaechs Oct 14, 2024
c6529a6
rename columns + table in sql, add migration
fm3 Oct 14, 2024
e9ba154
Merge branch 'master' into mag-all-the-way
fm3 Oct 14, 2024
89e267a
adapt test db after schema change
fm3 Oct 14, 2024
e88f070
changelog
fm3 Oct 14, 2024
3efbb44
slightly adjust changelog entry to lower expectations
knollengewaechs Oct 14, 2024
22beba0
adjust docs and revert some changes
knollengewaechs Oct 14, 2024
db09e99
adjust neuroglancer docs
knollengewaechs Oct 14, 2024
8b50f73
Update webknossos-tracingstore/app/com/scalableminds/webknossos/traci…
fm3 Oct 15, 2024
0ea1d8f
address review
knollengewaechs Oct 15, 2024
02b5d23
merge master
knollengewaechs Oct 16, 2024
d435fb3
fix previous version in db evolution
knollengewaechs Oct 16, 2024
8ed83b3
adjust version in schema.sql
knollengewaechs Oct 16, 2024
46e9619
also adapt schema version in reversion
fm3 Oct 16, 2024
8a839f8
Merge branch 'master' into mag-all-the-way
knollengewaechs Oct 17, 2024
68f58c9
adjust form names
knollengewaechs Oct 17, 2024
0a8b313
adjust get params for /createExplorational
knollengewaechs Oct 17, 2024
14ada37
remove unused messages
knollengewaechs Oct 17, 2024
e0797ee
Merge branch 'master' into mag-all-the-way
MichaelBuessemeyer Oct 17, 2024
4c47db5
debug nightly circleci image
hotzenklotz Oct 18, 2024
5c33252
fix keyboard shortcut links
hotzenklotz Oct 18, 2024
925127e
add nightly screenshot/puppeteer Github action stub
hotzenklotz Oct 18, 2024
7168c46
add a manual trigger for nightly action
hotzenklotz Oct 18, 2024
260ce74
Merge branch 'master' into mag-all-the-way
knollengewaechs Oct 18, 2024
00e4f34
merge master
knollengewaechs Oct 21, 2024
e5f8d93
Merge branch 'master' into mag-all-the-way
knollengewaechs Oct 21, 2024
dd7e85d
add whitespace
knollengewaechs Oct 21, 2024
19cfefa
format comment
knollengewaechs Oct 21, 2024
722b2d7
hopefully fix circleci config
fm3 Oct 21, 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
Prev Previous commit
Next Next commit
remove unused messages
knollengewaechs committed Oct 17, 2024

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 14ada370ce0d3bf35bcec0098e5e9aaeb133df76
4 changes: 0 additions & 4 deletions frontend/javascripts/messages.tsx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hej, I just noticed that the following messages aren't used in the code base

  • dataset.mag_mismatch
  • tracing.volume_mag_mismatch

Could you maybe double check this and in case you have the same result remove them? I'd say there is no use in keeping and maintaining them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, they are not used. I also noticed this. I'll remove them

Original file line number Diff line number Diff line change
@@ -187,8 +187,6 @@ instead. Only enable this option if you understand its effect. All layers will n
"You didn't add a node after jumping to this branchpoint, do you really want to jump again?",
"tracing.edit_volume_in_merger_mode":
"The volume annotation would be changed by this action. This is not allowed while merger mode is active.",
"tracing.volume_mag_mismatch":
"The volume annotation magnifications do not match the dataset magnifications. Was the dataset edited after creating the annotation? Consider downloading and re-uploading magnification 1 only to adapt the annotation.",
"tracing.segmentation_zoom_warning":
"Segmentation data and volume annotation is only fully supported at a smaller zoom level.",
"tracing.uint64_segmentation_warning":
@@ -367,8 +365,6 @@ instead. Only enable this option if you understand its effect. All layers will n
"The segmentation layer was defined as int64. This format is not supported for segmentations. Please convert the layer to the unsigned uint64 format.",
"dataset.is_scratch":
"This dataset location is marked as 'scratch' and meant for testing only. Please move this dataset to a permanent storage location and reimport it.",
"dataset.mag_mismatch":
"This dataset contains multiple layers which differ in their magnification. Please convert the layers to make their magnifications match. Otherwise, rendering errors cannot be avoided.",
"dataset.z1_downsampling_hint":
"The currently rendered quality is not optimal due to the available magnifications and the viewport arrangement. To improve the quality try to increase the size of the XY viewport (e.g. by maximizing it).",
"dataset.mag_explanation":