-
Notifications
You must be signed in to change notification settings - Fork 31
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
Don't use group -1 for luts_png #603
Open
will-moore
wants to merge
20
commits into
ome:master
Choose a base branch
from
will-moore:luts_getOriginalFile_group-1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+12,736
−49
Open
Changes from 14 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
de444ef
Don't use group -1 for luts_png
will-moore afc2c7e
Don't use group:-1 for listLuts_json
will-moore f6f4258
Add support for luts_png/?cached=false
will-moore 03e6c6a
Use static/webgateway/img/luts_10.png for /luts_png/
will-moore eb71bb1
Add option to generate dynamic luts if not in static png
will-moore f1507c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] e30c293
Remove debug lut_crop.show()
will-moore 3490f80
Add load_lut_to_rgb() to utils
will-moore 121fff4
Use static luts.json to cache luts
will-moore c0b2ee0
Add LUTs caching notes to README
will-moore a36306d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 7a4f809
flake8 fix
will-moore 4d819ce
Rewrote the LUTs caching section of README to improve clarity
will-moore eada123
Format static luts.json to improve future diffs
will-moore 961d307
Fix Users -> Admins in README luts
will-moore 297e69b
luts_png/?new=true loads luts from server if needed
will-moore f28328e
Use cached png except with /luts_png/?cached=false
will-moore 3175ede
Add 8 'new' LUTs into static luts.json
will-moore d721376
Update README with new LUTs cache workflow
will-moore 3bfb3fc
Remove ?new=true and only cache if not use_cached
will-moore File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,6 +51,30 @@ Usage | |
For running omero-web in production with NGINX, see See: `OMERO.web install`_ documentation. | ||
To run in development mode, see below. | ||
|
||
LUTs caching | ||
------------ | ||
|
||
The OMERO server ships with a set of look-up tables (LUTs) for rendering images. Users can also | ||
add their own LUTs to the server. The LUTs available on the server can be retrieved from the | ||
`/webgateway/luts/` endpoint as JSON data. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Although it certainly does not hurt to have this documentation here, it feels a bit at odds with the rest of the README. Should https://omero.readthedocs.io/en/stable/developers/Web/WebGateway.html be extended to cover the LUT endpoints of the OMERO.web gateway? |
||
|
||
To include the `rgb` values of each LUT in the JSON response, append `?rgb=true` to the URL. | ||
|
||
A copy of the JSON output from `/webgateway/luts/?rgb=true` is included in the `omero-web` package | ||
as a static file at | ||
https://github.com/ome/omero-web/blob/master/omeroweb/webgateway/static/webgateway/json/luts.json. | ||
|
||
This is used to generate a LUT preview png at `/webgateway/luts_png/` that can be used by clients | ||
such as OMERO.ivewer and OMERO.figure to display the LUTs in a user-friendly way. | ||
By using the static `luts.json`, the `/luts_png/` can be quickly generated without needing to load LUTs from | ||
the server. | ||
|
||
The sequence of LUTs in `/webgateway/luts_png/` correspond to the dynamic list from `/webgateway/luts/`. | ||
If there are new LUTs on the server that are not found in the static `luts.json`, the `/luts_png/` will | ||
show a blank placeholder for that LUT. | ||
To fix this issue following addition of LUTs to the server, the JSON from `/webgateway/luts/?rgb=true` | ||
should be updated in the `luts.json` file in the `omero-web` package. | ||
|
||
Contributing | ||
------------ | ||
|
||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Admin can add, not users since it is treated as a script
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 961d307