Commit Graph
154 Commits
Author SHA1 Message Date
leonarski_f 7594b208d5 GUI: updated labels in smart_rotation_panel.py 2025-10-24 17:33:01 +02:00
leonarski_f 87aed7a2ad GUI: added face_detection_panel.py 2025-10-24 17:32:21 +02:00
leonarski_f 28f7369a86 GUI: added face_detection hadnling to daq_worker.py 2025-10-24 17:31:21 +02:00
leonarski_f 0243d5c8b9 Merge branch 'daq_raster_predicition'
# Conflicts:
#	daq/src/aaredaq/daq.py
#	gui/src/aaregui/panels/rotation_data_collection.py
2025-10-20 12:48:47 +02:00
leonarski_f c3e454a504 Prediction (WIP) 2025-10-16 13:11:48 +02:00
GotthardG 4ef8203117 Adding prediction zmq and drawing in camera image 2025-10-16 13:11:48 +02:00
leonarski_f 834e180067 GUI: reverted to previous comit due to missing changes in smart_rotation_panel.py needs testing with data collection 2025-10-16 13:00:11 +02:00
leonarski_f 432dc8e3af GUI: set default sort column to Location 2025-10-16 12:42:07 +02:00
leonarski_f ae7b538072 DAQ/GUI: mount uses refernce tools if reference=True otherwise uses sample spreadsheet 2025-10-16 12:40:55 +02:00
leonarski_f e8c1040bec GUI: updated reference_tools_panel.py and connected update_daq_status 2025-10-16 12:40:03 +02:00
leonarski_f 4cd7c865f7 GUI: updates to reference_tools_panel.py WIP 2025-10-16 11:05:36 +02:00
leonarski_f cfea7df27c GUI: added reference tool panel to tell samples dock as a tab 2025-10-16 11:04:49 +02:00
leonarski_f 0a0b241488 GUI: connected load_reference_tools 2025-10-16 11:04:16 +02:00
GotthardG aabd435c6f DAQ: Implementation of reference-tools get methods from redis
GUI: Adding reference tools panel with mount and unmount functions
2025-10-15 15:18:29 +02:00
leonarski_f c7378f7e02 DAQ-WORKER: connected simplescanparameters with GUI panel and DAQ 2025-10-10 17:18:03 +02:00
leonarski_f 11bc0e5363 GUI: added parameters_changed and updated PONI values in defaults 2025-10-10 17:16:56 +02:00
leonarski_f f624fce97d GUI: added data to file path for rotation data collection 2025-10-10 17:16:21 +02:00
leonarski_f be0d9382d6 GUI: updated features to smart_rotation_panel.py 2025-10-10 17:14:47 +02:00
leonarski_f bb476669cc GUI: add data to filepath for rotation scan 2025-10-07 17:04:24 +02:00
leonarski_f f1f792d0e9 GUI: added functionality to add data to file_prefix for rotation scan only. 2025-10-07 14:48:08 +02:00
leonarski_f 694ecf54bd GUI: updated smart_rotation_panel functionality and included more widgets in the GUI 2025-10-07 13:05:50 +02:00
leonarski_f 3a24fc2aa1 GUI: connected smart_rotation_panel.py to main_window.py and data_collection_settings.py. Updated payload and values in smart_rotation_panel.py. 2025-10-01 17:12:25 +02:00
leonarski_f 19d5740c1f diffraction_geometry: updated resolution and det_dist calculation to use theta not 2theta 2025-10-01 17:06:43 +02:00
leonarski_f 4f2d18fbf8 Smart rotation panel: Make it looking a bit nicer 2025-10-01 09:09:57 +02:00
leonarski_f 7e1857f5c5 AUTOMATION PARAMETERS: simple/smart rotation panel added 2025-09-30 17:14:09 +02:00
leonarski_f 8b09789370 DAQ: Add min/max dtz 2025-09-30 11:54:12 +02:00
leonarski_f 64d7f3bfa9 GUI: Remove selected samples from the queue 2025-09-30 11:12:22 +02:00
leonarski_f b2a7cad463 GUI: Beamline busy is in a corner and irrespective of image zoom 2025-09-30 11:04:55 +02:00
leonarski_f 20e9a4d5ed GUI: Show only available transitions 2025-09-30 10:26:10 +02:00
leonarski_f 41f10aef22 GUI: Staff beamline controls are not created for non-staff user 2025-09-30 09:56:42 +02:00
appleb_m 456cd63420 GUI: changed dewer load/unload to dewer transfer to match state name 2025-09-29 16:57:25 +02:00
appleb_m 1e882c5cd5 GUI: tidied up status_bar.py state handling. 2025-09-29 16:57:01 +02:00
leonarski_f 078e85f812 AareGUI: Auth based on local user 2025-09-26 09:57:12 +02:00
leonarski_f f2ff0e04aa AareGUI: Smoothen exit from GUI by adding timeout on ZeroMQ 2025-09-25 09:12:59 +02:00
leonarski_f 76e4fa0bcd AareGUI: Fix default addresses for services 2025-09-25 08:54:59 +02:00
Martin Appleby d90d847506 DAQ: changed beamline busy to be constant 2025-09-22 11:47:34 +02:00
leonarski_f f857f8b8b7 GUI: camera_image.py added BEAMLINE BUSY message when beamline is in use. ALso change colour of the beam centre mark 2025-09-19 16:12:20 +02:00
leonarski_f c5a11f049a GUI: camera_thread.py update for USB-C camera. 2025-09-19 16:11:37 +02:00
leonarski_f 14cd289b55 GUI: status bar update from Takashi recommendations 2025-09-19 16:10:40 +02:00
leonarski_f 89f8574a6d GUI: updated zmq_address for OAV 2025-09-18 10:09:38 +02:00
leonarski_f 7e96b58b5b DAQ - jfjoch_viewer.py: fixed slot bug and changed load functions to use the http address instead of file path. 2025-09-18 10:09:01 +02:00
leonarski_f 7ee95747b8 AareGUI: Use files with the viewer 2025-09-14 11:50:11 +02:00
leonarski_f 7d2cdeca68 DAQ/GUI - JFJoch: fixed bug where image viewer wasnt taking the path, by changing to the http address 2025-09-11 14:42:15 +02:00
leonarski_f 23ff756769 DAQ/GUI - JFJoch: updated to jfjoch client rc73, added functionality to get profile radius, removed functionality for mosasicty. 2025-09-11 14:41:29 +02:00
leonarski_f dd462d0acd GUI: added back 1x zoom button 2025-09-11 14:34:18 +02:00
GotthardG d47ce8be84 Introduce DataCollectionParameters model with validation and update dependencies
Build and Publish / build (push) Successful in 24s
Added a new `DataCollectionParameters` model in `aaredaqlib` with extensive field validation and default handling for increased robustness. Updated `aaredaqlib`, `aaredb`, and related dependencies to version `0.2.4` for consistency across modules. Enhanced logging for better visibility during validation.
2025-08-20 15:13:05 +02:00
leonarski_f 05fe41ae93 DAQ: fixed bug in Image-_number function> ALso checks if image_angle is 0 to prevent a divide by 0 error. 2025-07-22 17:07:12 +02:00
leonarski_f 174881d160 DAQ: fixed bug where order of samples dropped into the queue would occasioanlly be arbitrary. 2025-07-21 15:55:29 +02:00
leonarski_f 177199c60a GUI: axis camera optimization 2025-07-17 14:27:19 +02:00
leonarski_f e3e1e97712 GUI: update abr_tweak_panel default abr step in um 2025-07-17 14:27:19 +02:00