Fix beamstop and capillary not shown #1447
Open
+15
−22
Conversation
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
axelboc
commented
Oct 14, 2024
| @@ -1,5 +1,5 @@ | |||
| <object class="ExporterNStateMockup"> | |||
| <username>beamstop</username> | |||
| <values>{"OUT": "OFF", "IN": "BEAM"}</values> | |||
| <values>{"IN": "BEAM", "OUT": "OFF"}</values> | |||
There was a problem hiding this comment.
The front-end expects the "good" state (green) to come first.
Comment on lines
+103
to
+105
| attribute: diffractometer.beamstop | ||
| - label: Capillary | ||
| attribute: capillary | ||
| attribute: diffractometer.capillary |
There was a problem hiding this comment.
This makes the two attributes appear in the UI.
| function renderBeamstopAlignmentOverlay() { | ||
| const { hardwareObjects } = beamline; | ||
| const motorInputList = []; | ||
| let popover = null; | ||
|
|
||
| const motor = hardwareObjects.beamstop_alignemnt_x; |
There was a problem hiding this comment.
There was a typo, but the hardware object is no longer called beamstop_alignment_x anyway but diffractometer.beamstop_distance.
This and the changes below fix the beamstop distance overlay as shown in the third screenshot (the cog icon + overlay with OneAxisTranslationControl).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes the beamstop and capillary beamline attributes in the mock environment ... and probably the beamstop distance overlay in production environments too??