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

LIMS-1170: Dont use thumbnails for crystal snapshots #784

Merged
merged 8 commits into from
Jun 25, 2024
Merged

LIMS-1170: Dont use thumbnails for crystal snapshots #784

merged 8 commits into from
Jun 25, 2024

Conversation

ndg63276
Copy link
Collaborator

Superseding #703

JIRA ticket: LIMS-1170

Summary:

Use full-sized crystal snapshot image files, not thumbnails.

Note that I have only touched the crystal snapshot image handling, not the diffraction preview image handling, which also uses a thumbnail image, which is generated upstream by a different mechanism to the snapshot image thumbnails.

Changes:

Remove ternary operation to switch between reading the full-sized image and the thumbnail. Always use the full-sized image.
I have removed the option to use the /f/1 URL parameter as it is no longer needed, and thus removed it every time it is used.

To test:

Find a data collection that has multiple image snapshots (each DC can have up to four).

  • Open all views that display a data collection pane. Check that the snapshot image is displayed correctly.
  • Click on the snapshot image. Check that you can still roll through the full selection of available snapshot images.
  • Repeat the above for a robot load pane.
  • Repeat the above for a sample action (eg anneal, wash) - see mx34438-111 for examples
  • Repeat the above for grid scans, click the arrows icon to view full size and scroll through all images

@benjaminhwilliams, can you check you are happy with this?

ndg63276 and others added 6 commits May 31, 2024 13:18
@ndg63276
LIMS-1204: Remove log area from top of active visits (#735)
24c9e1d 
* LIMS-1204: Remove log area from the top of active visits

* LIMS-1204: Remove dclog.js

---------

Co-authored-by: Mark Williams <[email protected]>
@MattPrit @gfrn
@ndg63276 @DominicOram
ULIMS-50: Shipping service incoming shipment redirect (#731)
57db914 
* LIMS-1113: Redirect to shipping-service on dispatch

* LIMS-1113: Fix typos in shipping service URLs

* LIMS-1113: Change text on submit button if redirecting

* LIMS-1113: Fix shipment request requests for Dewars with no pucks/samples

* LIMS-1113: Don't redirect for international shipments

* LIMS-1113: Tweak logic for international shipments

* LIMS-1113: Propagate shipping service error codes to client

* LIMS-1113: Link to shipping service from shipping page

* LIMS-1113: Restore commented code

* LIMS-1113: Include Dewar data in dispatch error log

* LIMS-1113: Apply GdF suggestions

* LIMS-1113: Update config_sample.php

* LIMS-1113: Limit redirects to supported countries

* LIMS-1113: Add supported country dropdown to dispatch from

* ULIMS-50: Redirect to shipping service to book incoming shipments

* Update client/src/js/modules/shipment/views/createawb.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/shipment/views/createawb.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update api/src/Page/Shipment.php

Co-authored-by: Guilherme Francisco <[email protected]>

* Update api/src/Page/Shipment.php

Co-authored-by: Guilherme Francisco <[email protected]>

* ULIMS-50: Add better error messages, make hidden fields not required

* ULIMS-50: Update description and date validation in dispatch model

* Restore EM menu in dropdown (#766) (#767)

* Merge master into prerelease (#773)

* Restore EM menu in dropdown (#766)

* Pre release/2024 r2.2 (#770)

* LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>

* Pre release/2024 r2.3 (#772)

* LIMS-1207: Move Calendar link to top left

* LIMS-1207: Move Migrate link to Lab Contacts page

* LIMS-1207: Re-order menu, remove Assign Containers

* LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1304: Correct the order of before and after snapshots

* LIMS-1304: Update to fix typo

Co-authored-by: Mark W <[email protected]>

* LIMS-1235: Queries for implicit samples and DCs in project time out (#758)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1200: CSV file upload ignores first sample (#737)

* LIMS-1200: CSV file upload ignores first sample

* LIMS-1200: Fix bug uploading csv with one sample

---------

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1174: Handle blank proposal on visits page (#740)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-44: Speed up visit query (#759)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1059: Add visit column to shipments list (#742)

Co-authored-by: Mark Williams <[email protected]>

* Restore EM menu in dropdown (#766) (#768)

* Add 2.2a changes to 2.3 (#771)

* Restore EM menu in dropdown (#766)

* Pre release/2024 r2.2 (#770)

* LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Dominic Oram <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Dominic Oram <[email protected]>

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: Mark W <[email protected]>
Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Dominic Oram <[email protected]>
@JPHall-DLS @ndg63276
LIMS-1331: Send all dispatch requests to Goods Handling unless intern…
b940fce 
…ational via DHL for BI/MX (#779)

Co-authored-by: Mark W <[email protected]>
@ndg63276
LIMS-1206: Remove stacked usage bar chart from visit page (#743)
ad8274c 
* LIMS-1206: Remove stacked usage bar chart from visit page

* Remove no longer used modules/stats/views/stack.js

---------

Co-authored-by: Mark Williams <[email protected]>
@ndg63276
LIMS-1203: Remove hidden temporary button to 'Use facility account' (#…
168fa86 
…741)

Co-authored-by: Mark Williams <[email protected]>
LIMS-1170: Dont use thumbnails for crystal snapshots
11fa306
@ndg63276 ndg63276 mentioned this pull request Jun 11, 2024
Closed
benjaminhwilliams
benjaminhwilliams approved these changes Jun 11, 2024
View reviewed changes
Copy link

@benjaminhwilliams benjaminhwilliams left a comment

Choose a reason for hiding this comment

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

Thanks @ndg63276, I'd completely forgotten about my change set on an unmerged branch. Thanks for picking up where I left off. LGTM.

@ndg63276 ndg63276 changed the base branch from prerelease to master June 24, 2024 09:33
@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R3.1 June 25, 2024 09:02
@ndg63276 ndg63276 merged commit cb5d918 into pre-release/2024-R3.1 Jun 25, 2024
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-1170/dont-use-snapshot-thumbnails branch June 25, 2024 09:31
ndg63276 added a commit that referenced this pull request Jul 3, 2024
@ndg63276
Merge pre-release/2024-R3.1 into master (#797)
da53c52 
* LIMS-595: Change Sample Changers/Containers/Stage to Pucks for i15/i15-1 (xpdf) (#579)

* LIMS-67: Fix 2 slow queries on imaging admin dashboard (#751)

* LIMS-1334: Allow selection of plate samples already in a group (#778)

* LIMS-1246: Allow users with all_dewars permission to view all shipments (#752)

* LIMS-1351: Switch to simpler arrows (#787)

* LIMS-1343: Interface changes based on reviewer suggestions from Conexs paper (#783)

* LIMS-1170: Dont use thumbnails for crystal snapshots (#784)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benjaminhwilliams benjaminhwilliams benjaminhwilliams approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ndg63276 @benjaminhwilliams @MattPrit @JPHall-DLS