Commit Graph
439 Commits
Author SHA1 Message Date
appleb_m 45e96b4a33 GUI: removed irrelevant logging from scan settings panel 2025-11-06 10:01:10 +01:00
appleb_m 504c640bf9 Dose calculation should not be 0 when sample unmounted. Now uses transmission 2025-11-06 10:00:42 +01:00
appleb_m 64053bdeec DAQ; raster defaults for automation updated 2025-11-06 10:00:19 +01:00
appleb_m 827743d89f GUI:updated default raster settings 2025-11-06 09:43:48 +01:00
appleb_m 05ce9ccd98 DAQ: updated default rotation settngs 2025-11-06 09:40:21 +01:00
appleb_m 5085477cf4 DAQ: updated default camera exposure settings for 6D 2025-11-06 09:40:07 +01:00
appleb_m 5376809685 GUI: scan_settings now uses new default fucnitons from number ine edits 2025-11-05 15:18:53 +01:00
appleb_m 52e25fd3d6 GUI: added defaults to numberlineedits and fixed a typo 2025-11-05 15:18:30 +01:00
appleb_m 83496f6e22 GUI: changed which camera view is visible during mounting 2025-11-05 15:17:59 +01:00
appleb_m c727e93c76 GUI: fixed bug in face detection panel where you couldnt see the labels for the number ine edit boces 2025-11-05 15:17:27 +01:00
martinappleby 9e4e6a3180 DAQ: added a function to set parameters during automation between smart parameters, spreadsheeta dn defaults 2025-11-05 14:34:08 +01:00
martinappleby 98d7e0bac3 DAQ: tidied up models for SimpleScanparameters and added optional filename for future work 2025-11-05 14:33:12 +01:00
martinappleby 190858e1fc DAQ: added a function to get parameters from the database for a given sample 2025-11-05 14:21:44 +01:00
appleb_m a08ea4bc5d GUI: "safety" added to parameters panels so they cannot be updated unless you re in control of teh GUI 2025-11-05 13:36:19 +01:00
appleb_m 10f881e0cf GUI: fixed bug where the line edits were not updated in the GUI when reloading parameters 2025-11-05 13:35:47 +01:00
appleb_m 3afd05ee3b GUI: added a force_update-function to number_line_edit.py 2025-11-05 13:34:55 +01:00
martinappleby 93fa4b5bd4 Merge remote-tracking branch 'origin/ParseSampleParamsFromDB' into ParseSampleParamsFromDB
# Conflicts:
#	gui/src/aaregui/panels/rotation_data_collection.py
2025-11-05 11:02:59 +01:00
martinappleby 0df121f03c COMMON: logger no longer looks for hardcoded yaml, but looks for a yaml in the format f"logging_{env}.yaml" where env is an environement varaible tos et the yaml to dev or prod and the path is dependnet on the logger_config file path. 2025-11-05 10:59:53 +01:00
martinappleby 612241999a GUI: raster updates from spreadsheet for now but maybe shouldn't 2025-11-05 10:58:34 +01:00
martinappleby 82c7355065 GUI: refactored rotation_data_collection.py panel to use data from scan_settings_panel 2025-11-05 10:57:14 +01:00
martinappleby cccf629618 GUI: reload_parameters, reload_parameters button and update_data-collection_parameters is now "owned" by scan_settings_panel.py 2025-11-05 10:56:47 +01:00
appleb_m 9f140dc08b GUI: rotation_data_collection.py fixedbug where self.sample was initialised not self._sample, if sample is None return to default parameters or if aaredb_params is None/doesn't exist. Also correct transmisison from percentage to decimal 2025-11-04 15:09:44 +01:00
martinappleby 1c3cfab2d8 GUI: update rotation_panel data collection parameters from database 2025-11-04 13:48:46 +01:00
martinappleby d61a94b48b DAQ: updated pyproject.toml to latest version of aaredb 2025-11-04 11:35:40 +01:00
appleb_m d86f6c5f32 GUI: main_window.py added second axis camera to views. WIP 2025-11-03 16:27:44 +01:00
appleb_m b12d60e27e DAQ: mlbox.py updated to mx-ml stream 2025-11-03 16:27:22 +01:00
appleb_m 6b23509445 GUI:" tell_sample_panel.py added filters to sample spreadsheet 2025-11-03 16:27:05 +01:00
appleb_m 8ef53955d4 GUI: status bad - upated avaialbe pgroups for staff to be all 2025-11-03 16:26:47 +01:00
appleb_m 3185df5d40 DAQ: added all p group request 2025-11-03 16:26:06 +01:00
appleb_m da821a5e3d GUI: daq_worker.py added handle all prgroups request for staff members 2025-11-03 16:25:50 +01:00
appleb_m 82a478925a aareDB: added resolution to detector_data 2025-11-03 16:25:19 +01:00
leonarski_f 482fac3431 DAQ: updated status so that DAQ status is masked by user level. WIP 2025-10-31 16:41:05 +01:00
leonarski_f 2d5f0160c6 DAQ: added logging to server.py 2025-10-31 16:40:00 +01:00
leonarski_f 70ccb4256f GUI: pgroup is now a combo box, or can be typed and has a completer. currently limited to user pgroups 2025-10-31 16:37:05 +01:00
leonarski_f 288712cfbb GUI: daq_worker - if identical message from handle_status_response only emit after _auth_error_min_interval has passed 2025-10-31 16:36:32 +01:00
leonarski_f 7dcafe1288 DAQ: fix bug where if target None we get an error 2025-10-31 16:35:30 +01:00
leonarski_f e2d8c524d7 GUI: added logging to smart panel, only rewrite smart params when they change 2025-10-31 16:34:26 +01:00
leonarski_f 3f805b0dd9 GUI: added logging to smart panel, only rewrite smart params when they change 2025-10-31 16:34:18 +01:00
leonarski_f 380bcb773e GUI: status_bar now ahs logic depending on current user and state of beamline 2025-10-31 16:33:07 +01:00
leonarski_f bb59e3fe96 DAQ: added face dtecetion correction in Y 2025-10-30 16:57:38 +01:00
leonarski_f a570b40225 GUI: updated logger in daq worker 2025-10-30 16:57:14 +01:00
leonarski_f 839468453c GUI: updated logger 2025-10-30 16:56:54 +01:00
leonarski_f 5260078db5 COMMON: updated logger_config.py to include a test and to log to connect the correct logger 2025-10-30 16:56:40 +01:00
leonarski_f 76ff311f94 GUI: added log_panel 2025-10-30 16:56:10 +01:00
leonarski_f 0deb44a227 GUI: main_window.py updated logging and hid settings from non staff users 2025-10-30 16:55:59 +01:00
leonarski_f 9285013229 GUI: changed message from session other to Guest Mode 2025-10-30 11:14:10 +01:00
leonarski_f 6d3c11fbd5 GUI: added message if session state is vacant or other 2025-10-30 11:10:34 +01:00
leonarski_f 4c8414cee9 GUI: main_window.py - added logdock from logpanel and enabled logging 2025-10-30 11:05:02 +01:00
leonarski_f 9a91942223 COMMON: added logging to camera_image.py 2025-10-30 11:04:06 +01:00
leonarski_f cbe049a8e9 COMMON: logger_config.py, added QT log handling to enable a logging panel in the GUI 2025-10-30 11:02:19 +01:00