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

P11 char Qt #460

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

P11 char Qt #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
11b5e51
Disabled view of Shutterless
Jun 15, 2024
de9217f
Added Additional robot actions to the sample changer
Jun 27, 2024
eaf698b
Black
Jun 27, 2024
cbbbd48
Fixing explicit int conversion in python > 3.10
Sep 3, 2024
efe9f22
Removed unused brick
Sep 10, 2024
489a935
Add changesto handle limits according to the changes in P11Transmissi…
Sep 13, 2024
7e072d4
Update of p11 proposal brick to display the proposal in case the ispy…
Sep 13, 2024
94a21a0
Black
Sep 13, 2024
3273fff
Added changes that are reflecting handling of NState instead of Multy…
Sep 13, 2024
c5ae78f
added the changes corresponding to the refactoring in core PR#966
Sep 20, 2024
5879cf8
Fix for mockup start
Sep 26, 2024
6179a13
Fixes for the python dropping explicit type conversion - issue in mxc…
Sep 26, 2024
a654e64
Black
Sep 26, 2024
537f8e1
Fixing proper logging
Sep 26, 2024
e56b329
Updated the mach info brick
Sep 27, 2024
90d9cc8
Added category DESY in the respective bricks:wq
Sep 27, 2024
686779e
Added P11 specific mach_info_brick
Sep 27, 2024
569cd0d
Restored the original repo version that was committed after changes t…
Sep 27, 2024
564784d
Added change of color in p11 mach info brick if values are out of ran…
Oct 1, 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
2 changes: 1 addition & 1 deletion mxcubeqt/bricks/aperture_brick.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def init_aperture(self):
aperture_size_list = HWR.beamline.beam.aperture.get_diameter_size_list()
self.aperture_diameter_combo.clear()
for aperture_size in aperture_size_list:
self.aperture_diameter_combo.addItem("%d%s" % (aperture_size, unichr(956)))
self.aperture_diameter_combo.addItem("%s%s" % (aperture_size, unichr(956)))

aperture_position_list = HWR.beamline.beam.aperture.get_position_list()
self.aperture_position_combo.clear()
Expand Down
7 changes: 2 additions & 5 deletions mxcubeqt/bricks/desy/digital_zoom_brick.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@


class DigitalZoomBrick(BaseWidget):

STATE_COLORS = (
colors.LIGHT_YELLOW, # INITIALIZING
colors.LIGHT_GREEN, # ON
Expand Down Expand Up @@ -129,16 +128,15 @@ def setToolTip(self, name=None, state=None):
self.label.setToolTip(tip)

def motor_state_changed(self, state):

# self.positions_combo.setEnabled(self.motor_hwobj.is_ready())

if self.motor_hwobj.is_ready:
colors.set_widget_color(
self.positions_combo, colors.LIGHT_GREEN, qt_import.QPalette.Button,
self.positions_combo, colors.LIGHT_GREEN, qt_import.QPalette.Button
)
else:
colors.set_widget_color(
self.positions_combo, colors.LIGHT_GRAY, qt_import.QPalette.Button,
self.positions_combo, colors.LIGHT_GRAY, qt_import.QPalette.Button
)

# self.setToolTip(state=state)
Expand Down Expand Up @@ -242,7 +240,6 @@ def position_selected(self, index):
self.previous_position_button.setEnabled(index >= 0)

def predefined_position_changed(self, position, offset):

if self.positions:
for index, item in enumerate(self.positions):
if position.name == item.name:
Expand Down
Loading