bec/csaxs_bec
0
0
Fork 1
Code Issues 16 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

feat/enhance-gui #118

Merged
wyzula_j merged 5 commits from feat/enhance-gui into main 2026-03-11 22:08:06 +01:00
Conversation 2 Commits 5 Files Changed 8
+484 -330
wyzula_j commented 2025-12-12 15:04:02 +01:00
Owner
Copy Link
Copy Source

GUI enhanced for flomni setup. Tested already with @holler , has to be merged after #157

GUI enhanced for flomni setup. Tested already with @holler , has to be merged after #157
wyzula_j added 29 commits 2025-12-12 15:04:03 +01:00
wip adding toggles and extending message box ca27b07a2b
wip ids camera live mode signal 0be0159b2e
wip signal for fitting added to script 598403c131
wip proof of concept done in gui 38d7d64c76
wip Gui added tab with waveform a955fdea01
wip ids camera subscription callback ad4d0dc15b
wip ids camera subscription callback - run false 1ce93680b7
wip ids camera subscription callback - run false also put directly from init kwarg
CI for csaxs_bec / test (push) Successful in 1m22s
Details
68a4b2c45e
wip toggle for camera running works both directions
CI for csaxs_bec / test (push) Has been cancelled
Details
634a1c2926
wip delete flomni calculated
CI for csaxs_bec / test (push) Successful in 1m23s
Details
490ef32bb8
wip toggles working
CI for csaxs_bec / test (push) Successful in 1m18s
Details
128839322b
wip gui device new signal ba8e4d560c
wip gui signal cleanup 1 5b041125c7
wip added publish of params
CI for csaxs_bec / test (push) Successful in 1m24s
Details
23dc98cb38
final adjustments in gui device and fitting
CI for csaxs_bec / test (push) Successful in 1m24s
Details
0ad7a3fa41
wip fixed dev in x_ray_eye
CI for csaxs_bec / test (push) Successful in 1m23s
Details
860daeacba
wip refactor runtime enums and flags from qt
CI for csaxs_bec / test (push) Successful in 1m21s
Details
1a105092df
first test of gui and xray script
CI for csaxs_bec / test (push) Successful in 1m25s
Details
2020a76536
added fsh command for omny
CI for csaxs_bec / test (push) Successful in 1m24s
Details
0479aefdb0
wip refactored script and gui to use rpc calls directly to gui instead of going through epics gui device
CI for csaxs_bec / test (push) Successful in 1m15s
Details
c15fa3aece
replaced all epics put with direct gui access
CI for csaxs_bec / test (push) Successful in 1m22s
Details
080999cd8f
removed all epics calls in script and minor fixes
CI for csaxs_bec / test (push) Successful in 1m29s
Details
2e9f426b61
removed Epics communication, just a signal device now
CI for csaxs_bec / test (push) Successful in 1m25s
Details
68517d2a52
renamed device of alignment (not mention epics anymore)
CI for csaxs_bec / test (push) Successful in 1m24s
Details
237111d501
tests and fixes
CI for csaxs_bec / test (push) Failing after 1m1s
Details
cf3db9fb36
final fixes
CI for csaxs_bec / test (push) Failing after 56s
Details
0ef5b69f5c
fix(bec_widgets): removed omny alignment old gui 3146485194
fix(x_ray_align): cleanup of commented code
CI for csaxs_bec / test (push) Failing after 1m3s
Details
5e61171b2b
fix(x_ray_align): cleanup of commented code 2
CI for csaxs_bec / test (push) Failing after 1m1s
Details
CI for csaxs_bec / test (pull_request) Failing after 1m3s
Details
ab2c297368
wyzula_j self-assigned this 2025-12-12 15:04:10 +01:00
wyzula_j force-pushed feat/enhance-gui from ab2c297368 to 2c877e2372 2025-12-12 15:16:18 +01:00 Compare
wyzula_j force-pushed feat/enhance-gui from 2c877e2372 to 3d73b0a160 2025-12-16 00:23:18 +01:00 Compare
wyzula_j added 1 commit 2025-12-16 15:05:20 +01:00
wip webcam fix the stop
CI for csaxs_bec / test (pull_request) Failing after 1m24s
Details
CI for csaxs_bec / test (push) Failing after 1m29s
Details
59afe13cd5
wyzula_j force-pushed feat/enhance-gui from 59afe13cd5 to 3d73b0a160 2025-12-16 15:11:36 +01:00 Compare
bec_bl_push-gitea added 2 commits 2025-12-16 16:24:49 +01:00
colorbar changed to greys 4c70d254a6
set fixed on the script
CI for csaxs_bec / test (pull_request) Failing after 1m25s
Details
CI for csaxs_bec / test (push) Failing after 1m27s
Details
9cab880887
wyzula_j force-pushed feat/enhance-gui from 9cab880887 to 5a4b0fbb4c 2026-01-29 10:01:10 +01:00 Compare
bec_bl_push-gitea added 1 commit 2026-01-29 11:34:09 +01:00
wip adjusting to V3
CI for csaxs_bec / test (push) Failing after 1m25s
Details
CI for csaxs_bec / test (pull_request) Failing after 1m27s
Details
60286c8248
wyzula_j force-pushed feat/enhance-gui from 60286c8248 to 8b960d0365 2026-03-01 18:14:16 +01:00 Compare
wyzula_j force-pushed feat/enhance-gui from 8b960d0365 to cffc979858 2026-03-02 21:09:32 +01:00 Compare
wyzula_j force-pushed feat/enhance-gui from cffc979858 to 821917f7f8 2026-03-03 16:19:11 +01:00 Compare
wyzula_j added 1 commit 2026-03-04 10:46:10 +01:00
WIP transpose fix
CI for csaxs_bec / test (push) Failing after 1m55s
Details
CI for csaxs_bec / test (pull_request) Failing after 1m55s
Details
09425f7651
bec_bl_push-gitea added 1 commit 2026-03-04 14:18:34 +01:00
WIP gui final touch
CI for csaxs_bec / test (push) Failing after 1m51s
Details
CI for csaxs_bec / test (pull_request) Failing after 1m58s
Details
03e6cf3451
bec_bl_push-gitea added 1 commit 2026-03-04 14:24:25 +01:00
WIP comment how fitting dict is structured
CI for csaxs_bec / test (push) Failing after 1m52s
Details
CI for csaxs_bec / test (pull_request) Failing after 1m52s
Details
8808996c71
bec_bl_push-gitea added 1 commit 2026-03-04 15:40:25 +01:00
WIP added reading of fit
CI for csaxs_bec / test (pull_request) Failing after 1m52s
Details
CI for csaxs_bec / test (push) Failing after 1m56s
Details
db47f72c0e
wyzula_j force-pushed feat/enhance-gui from db47f72c0e to 749cf168e7 2026-03-11 16:31:46 +01:00 Compare
wyzula_j force-pushed feat/enhance-gui from 749cf168e7 to deaa469ce1 2026-03-11 16:50:46 +01:00 Compare
wyzula_j requested review from appel_c 2026-03-11 16:57:26 +01:00
wyzula_j requested review from wakonig_k 2026-03-11 16:57:26 +01:00
wyzula_j requested review from holler 2026-03-11 16:57:36 +01:00
wyzula_j requested review from perl_d 2026-03-11 16:57:42 +01:00
wyzula_j marked the pull request as ready for review 2026-03-11 16:58:56 +01:00
appel_c reviewed 2026-03-11 18:10:17 +01:00
appel_c left a comment
Owner
Copy Link
Copy Source

Comment for the Ophyd device.

Comment for the Ophyd device.
csaxs_bec/devices/omny/xray_epics_gui.py
@@ -73,1 +23,4 @@
fit_params_x = Cpt(Signal, value=np.zeros((2, 3)))
fit_params_y = Cpt(Signal, value=np.zeros((2, 3)))
# Generate width_y_0 to width_y_10
appel_c commented 2026-03-11 18:09:55 +01:00
Owner
Copy Link
Copy Source

I really think we should not use this type of syntax to create components. While this seems to work, it is difficult to read, and quite easy to overwrite an existing namespace in locals.

Please check DynamicDeviceComponent to easily create sub-devices. You will have an additional layer of nesting though, so other code may have to be adjusted aswell.

I really think we should not use this type of syntax to create components. While this seems to work, it is difficult to read, and quite easy to overwrite an existing namespace in locals. Please check DynamicDeviceComponent to easily create sub-devices. You will have an additional layer of nesting though, so other code may have to be adjusted aswell.
wyzula_j commented 2026-03-11 18:13:12 +01:00
Author
Owner
Copy Link
Copy Source

I would prefer to use this syntax for this particular device, it is just temporary solution and will be replaced completely eventually. Without nesting it will be easier to refactor. The complete solution will not be based on Ophyd at all for final product.

I would prefer to use this syntax for this particular device, it is just temporary solution and will be replaced completely eventually. Without nesting it will be easier to refactor. The complete solution will not be based on Ophyd at all for final product.
wyzula_j marked this conversation as resolved
wakonig_k approved these changes 2026-03-11 20:59:25 +01:00
wakonig_k left a comment
Owner
Copy Link
Copy Source

there is still a lot of commented-out code that we can probably remove

there is still a lot of commented-out code that we can probably remove
csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py
@@ -993,3 +990,2 @@
with open(os.path.join(dir_path, "ptychotomoalign_Ay.txt"), "r") as file:
tomo_alignment_fit[1][0] = file.readline()
# with open(os.path.join(dir_path, "ptychotomoalign_Ay.txt"), "r") as file:
wakonig_k commented 2026-03-11 20:53:54 +01:00
Owner
Copy Link
Copy Source

this should probably be removed... or is it kept for a reason?

this should probably be removed... or is it kept for a reason?
wyzula_j commented 2026-03-11 22:04:21 +01:00
Author
Owner
Copy Link
Copy Source

this I am not sure if it is not there for some further reason

this I am not sure if it is not there for some further reason
wyzula_j marked this conversation as resolved
csaxs_bec/bec_ipython_client/plugins/flomni/gui_tools.py
@@ -59,0 +45,4 @@
self.xeyegui = self.gui.flomni.new("XRayEye", object_name="xrayeye")
# start live
if not dev.cam_xeye.live_mode_enabled.get():
# dev.cam_xeye.live_mode = True
wakonig_k commented 2026-03-11 20:54:11 +01:00
Owner
Copy Link
Copy Source

remove?

remove?
wyzula_j marked this conversation as resolved
csaxs_bec/bec_ipython_client/plugins/flomni/gui_tools.py
@@ -98,2 +95,2 @@
#dev.cam_xeye.live_mode = False
self.gui.flomni.delete_all()
# dev.cam_flomni_overview.stop_live_mode()
# dev.cam_flomni_gripper.stop_live_mode()
wakonig_k commented 2026-03-11 20:54:41 +01:00
Owner
Copy Link
Copy Source

remove?

remove?
wyzula_j marked this conversation as resolved
csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py Outdated
@@ -51,3 +51,1 @@
self.flomni.flomnigui_show_xeyealign()
if not dev.cam_xeye.live_mode:
dev.cam_xeye.live_mode = True
# self.flomni.flomnigui_show_xeyealign()
wakonig_k commented 2026-03-11 20:55:17 +01:00
Owner
Copy Link
Copy Source

remove?

remove?
wyzula_j marked this conversation as resolved
csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py Outdated
@@ -119,2 +115,2 @@
self.flomni.flomnigui_show_xeyealign()
self.flomni.flomnigui_raise()
# self.flomni.flomnigui_show_xeyealign()
# self.flomni.flomnigui_raise()
wakonig_k commented 2026-03-11 20:55:34 +01:00
Owner
Copy Link
Copy Source

remove?

remove?
wyzula_j marked this conversation as resolved
wyzula_j added 1 commit 2026-03-11 22:05:15 +01:00
refactor: commented code removed
CI for csaxs_bec / test (pull_request) Successful in 1m57s
Details
CI for csaxs_bec / test (push) Successful in 1m55s
Details
315a32d9de
wyzula_j merged commit 315a32d9de into main 2026-03-11 22:08:06 +01:00
wyzula_j deleted branch feat/enhance-gui 2026-03-11 22:08:06 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
holler
perl_d
appel_c
wakonig_k
Labels
Clear labels
issue::not confirmed
Used if an issue has not yet been confirmed by a developer
 issue::not reproducible
Used if an issue is not reproducible
 issue::reproducible
Used if a developer was able to reproduce the issue
 priority::critical
Should be done as soon as possible
 priority::needed
An important update to the code base
 priority::nice to have
Not really needed but a good improvement
 scope::backend
An issue regarding the backend services
 scope::frontend
An issue regarding the user-facing services
 stage::in development
This issue is currently being worked on
 stage::on hold
Something is blocking the development
 stage::pre_release
For issues that have been merged into a pre-release branch and are waiting for their release.
stage::ready for review
For issues that have been resolved and are ready for review
 stage::selected for development
This issue has been selected for development but has not been scheduled yet
 stage::weekly backlog
This issue has been selected for development for the next development cycle
 type::bug
It's a bug!
 type::discussion
A discussion is wanted/needed
 type::doc
Improvements to the documentation
 type::feature
A new feature
 type::improvement
Neither a feature nor a bug but an improvement to the code base
 type::test
Missing tests or improvements to the test suite
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
acerbo_a (acerbo_a) appel_c (appel_c) bec-gitea celcer_t (celcer_t) debenjak_l (debenjak_l) diaz (diaz) divall_e (divall_e) guizar_m (guizar_m) haghta_s (haghta_s) holler (holler) lombosi_c (lombosi_c) menzel (menzel) perl_d (perl_d) usov_i (usov_i) wakonig_k (wakonig_k) wang_x1 (wang_x1) wyzula_j (wyzula_j) zamofing_t (zamofing_t)
No Assignees wyzula_j
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bec/csaxs_bec#118
Delete Branch "feat/enhance-gui"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?