 appleb_m
|
7fb870eac4
|
GUI: Fixed sorting for mount count in reference_tools_panel.py and also the unmoutn button is now correctly wired
|
2025-11-10 09:42:48 +01:00 |
|
|
appleb_m
|
22790b7b87
|
Merge branch 'master' into ReferenceToolSort
|
2025-11-10 09:11:21 +01:00 |
|
 martinappleby
|
fab7d95a22
|
DAQ: fix to handle automated raster parameters
|
2025-11-07 14:07:58 +01:00 |
|
|
martinappleby
|
9f0bc6e076
|
GUI: added error handling if GUI fails to open. Will need to test to see if it crashes if any other errors are raised!
|
2025-11-07 14:07:32 +01:00 |
|
|
martinappleby
|
02ad6269c6
|
GUI: fixed bug where reference_tools_panel.py would infinite loop due to refactoring of self._rows to self._samples
|
2025-11-07 14:02:17 +01:00 |
|
|
martinappleby
|
f6228dad5a
|
GUI: added more verbose error handling to JFJochDbusClient
|
2025-11-07 14:01:45 +01:00 |
|
|
martinappleby
|
39322cde80
|
GUI: block signal in numberlineedit when update-value or force_update-value is called
|
2025-11-07 14:00:57 +01:00 |
|
|
appleb_m
|
36f8fa9d58
|
GUI: bug fix, if sample is None default values are no longer enforced by the GUI, user can edit values again.
|
2025-11-07 11:16:33 +01:00 |
|
|
appleb_m
|
f95f92264e
|
DAQ: bug fix where res could be None but now is compared correctly.
|
2025-11-07 11:06:59 +01:00 |
|
|
martinappleby
|
f3b798b770
|
GUI: limit pgroup typing to only valid pgroups
|
2025-11-06 15:58:30 +01:00 |
|
|
martinappleby
|
337b59af39
|
GUI: attempt to make filters in the tell sample panel dependent on the other active filters
|
2025-11-06 15:53:22 +01:00 |
|
|
martinappleby
|
90a8f3f9b8
|
GUI: unmount button buf hopefully fixed by removing sampleshortinfo from signal
|
2025-11-06 15:48:07 +01:00 |
|
|
martinappleby
|
056f166b93
|
GUI: attempt at fixing the sorting function in refernce tools
|
2025-11-06 15:46:17 +01:00 |
|
|
appleb_m
|
bbaf12c9d5
|
DAQ: add some logic to automation parameters for raster.
|
2025-11-06 14:05:55 +01:00 |
|
|
appleb_m
|
e72f37d7ab
|
DAQ: Update dtz between raster and rotation. Wired transmission from params to scans. Added more verbose debug statements to automation.
|
2025-11-06 13:49:03 +01:00 |
|
|
appleb_m
|
f071ad6a88
|
DAQ: Update dtz between raster and rotation. Wired transmission from params to scans. Added more verbose debug statements to automation.
|
2025-11-06 13:48:41 +01:00 |
|
|
appleb_m
|
9d19c2c961
|
DAQ: correctly format logger
|
2025-11-06 13:47:02 +01:00 |
|
|
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 |
|