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

Added spacegroup synonyms, for interpreting user input names #1040

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+928 −302
Open

Added spacegroup synonyms, for interpreting user input names #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a39a0f0
First attempt to add space group synonyms
rhfogh Oct 4, 2024
101f49f
Cleaned up further for linting
rhfogh Oct 11, 2024
1b429b9
Added extra Space Group synonyms for P2221 and P21212 non-std settings
rhfogh Oct 11, 2024
842955a
Run black
rhfogh Oct 11, 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
116 changes: 58 additions & 58 deletions mxcubecore/HardwareObjects/Gphl/GphlWorkflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2356,64 +2356,64 @@ def process_centring_request(self, payload, correlation_id):
"Sample re-centering now active - Zoom in before continuing."
)

# else:
# # TODO The UI popup does not work in mxcubeweb
# # NB Temporarily inactivated pending a fix
#
# # Ask user to zoom
# info_text = """Automatic sample re-centering is now active
# Switch to maximum zoom before continuing"""
#
# schema = {
# "title": "GΦL Translational calibration",
# "type": "object",
# "properties": {},
# }
# fields = schema["properties"]
# fields["_info"] = {
# "type": "textdisplay",
# "default": info_text,
# "readOnly": True,
# }
# ui_schema = {
# "ui:order": ["_info"],
# "ui:widget": "vertical_box",
# "ui:options": {
# "return_signal": self.PARAMETER_RETURN_SIGNAL,
# # "update_signal": self.PARAMETER_UPDATE_SIGNAL,
# # "update_on_change": "selected",
# },
# }
# self._return_parameters = gevent.event.AsyncResult()
# try:
# dispatcher.connect(
# self.receive_ok_cancel,
# self.PARAMETER_RETURN_SIGNAL,
# dispatcher.Any,
# )
# responses = dispatcher.send(
# self.PARAMETERS_NEEDED,
# self,
# schema,
# ui_schema,
# )
# if not responses:
# self._return_parameters.set_exception(
# RuntimeError(
# "Signal %s is not connected" % self.PARAMETERS_NEEDED
# )
# )
#
# result = self._return_parameters.get()
# if result is StopIteration:
# return StopIteration
# finally:
# dispatcher.disconnect(
# self.receive_ok_cancel,
# self.PARAMETER_RETURN_SIGNAL,
# dispatcher.Any,
# )
# self._return_parameters = None
# else:
# # TODO The UI popup does not work in mxcubeweb
# # NB Temporarily inactivated pending a fix
#
# # Ask user to zoom
# info_text = """Automatic sample re-centering is now active
# Switch to maximum zoom before continuing"""
#
# schema = {
# "title": "GΦL Translational calibration",
# "type": "object",
# "properties": {},
# }
# fields = schema["properties"]
# fields["_info"] = {
# "type": "textdisplay",
# "default": info_text,
# "readOnly": True,
# }
# ui_schema = {
# "ui:order": ["_info"],
# "ui:widget": "vertical_box",
# "ui:options": {
# "return_signal": self.PARAMETER_RETURN_SIGNAL,
# # "update_signal": self.PARAMETER_UPDATE_SIGNAL,
# # "update_on_change": "selected",
# },
# }
# self._return_parameters = gevent.event.AsyncResult()
# try:
# dispatcher.connect(
# self.receive_ok_cancel,
# self.PARAMETER_RETURN_SIGNAL,
# dispatcher.Any,
# )
# responses = dispatcher.send(
# self.PARAMETERS_NEEDED,
# self,
# schema,
# ui_schema,
# )
# if not responses:
# self._return_parameters.set_exception(
# RuntimeError(
# "Signal %s is not connected" % self.PARAMETERS_NEEDED
# )
# )
#
# result = self._return_parameters.get()
# if result is StopIteration:
# return StopIteration
# finally:
# dispatcher.disconnect(
# self.receive_ok_cancel,
# self.PARAMETER_RETURN_SIGNAL,
# dispatcher.Any,
# )
# self._return_parameters = None

settings = goniostatRotation.axisSettings.copy()
if goniostatTranslation is not None:
Expand Down
Loading
Loading