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

Dev/pyctbgui merge #960

Merged
merged 496 commits into from
Sep 10, 2024
Merged

Dev/pyctbgui merge #960

merged 496 commits into from
Sep 10, 2024

Conversation

thattil
Copy link
Member

@thattil thattil commented Sep 6, 2024 •
edited
Loading

  • Moved pyctbgui repos into here with all the commits
  • Removed old ctbgui
  • modified cmakelists and cmk.sh to point to the new pyctbgui
    TODO (@erikfrojdh ):
  • create cmake file for pyctbgui insted of makefile (also install when SLS_INSTALL_PYTHONEXT is enabled)

erikfrojdh and others added 30 commits July 18, 2023 16:44
@erikfrojdh
Merge branch 'main' into cext
e00cb55
@erikfrojdh
added rotation to the decoding
f5af733
@thattil
added color map, options and findex
7a77f2f
@thattil
minor
09db9c6
@thattil
move checks to before acquisition
2ebf23f
@erikfrojdh
added pixel map based decoder
02f1d1b
@erikfrojdh
cleanup
40df042
@erikfrojdh
no thread creation for single thread processing
79fc11d
@erikfrojdh
Merge pull request #102 from slsdetectorgroup/colormap_findex
cc08142 
color map, findex
@thattil
conflict merge fix
76984b1
@erikfrojdh
added rotation and test to compare
78016b3
@erikfrojdh
Merge branch 'cext' of github.com:slsdetectorgroup/pyctbgui into cext
a6652c2
@thattil
allow high and low water mark for zmq (also buffer size) for fast rea…
ddfc34d 
…douts
@erikfrojdh
removed roatation during decoding
8366837
@thattil
added Transpose to image and invert Y False to invert it
1b99a3f
@thattil
Merge pull request #101 from slsdetectorgroup/cext
71c5bbb 
Moving decoding to a c extension
@thattil
retains the zoomed state after the first image of gui, catch and disp…
6ccc716 
…lay exception if no detector connected
@erikfrojdh
Merge pull request #103 from slsdetectorgroup/zmq_buffer
4f32613 
option for low and fast readouts to handle zmq hwm and buffer size
@thattil
moved start frame to dockable widget, removed extra frame number labe…
26bb4b3 
…l, moved current measurement also to dockable widget, hide frame plot entirely when showing patternviewer
@thattil
first image dependin on which plot
da81bff
@erikfrojdh
Merge pull request #104 from slsdetectorgroup/zoom
8e2146f 
stay zoomed in
@erikfrojdh
Merge pull request #105 from slsdetectorgroup/visible_start
69e135c 
always visible start
@thattil
remember settings of main window size and position, dockewidget if do…
a3f877c 
…cked, its size and posisiotn as well, then update it next time the gui is opened
@thattil
change in comment
ccd7915
@thattil
Merge pull request #106 from slsdetectorgroup/settings_window
c39ddb5 
settings for window sizes
@thattil
using c decoder for moench 04 and matterhorn
bac6362
@thattil
catch exception from invalid image from decoder
511c955
@thattil
clean up
ad98eb4
@erikfrojdh
Merge pull request #107 from slsdetectorgroup/using_decoder
374a027 
using c decoder for moench 04 and matterhorn
@thattil
update row and col when choosing image type, neeeded to show values
70a891d
Bechir-Brahem and others added 20 commits September 14, 2023 15:36
@Bechir-Brahem
Merge branch 'test/setup-gui-tests' into feature/save-parameters
74d33e0
@Bechir-Brahem
save plot type
5e1ef62
@Bechir-Brahem
Merge remote-tracking branch 'origin/feature/save-plot-type' into fea…
d439a57 
…ture/save-plot-type
@Bechir-Brahem
red error on status bar when shape mismatch for loaded pedestal
dcd564b
@thattil
Merge pull request #156 from slsdetectorgroup/feature/pedestal-substr…
0ddbd11 
…action

add padestal substraction
@thattil
Merge branch 'main' into test/setup-gui-tests
f60b546
@Bechir-Brahem
fix makefile and docstrings
982bcab
@Bechir-Brahem
Merge branch 'test/setup-gui-tests' of github.com:slsdetectorgroup/py…
af52ac1 
…ctbgui into test/setup-gui-tests
@thattil
Merge pull request #157 from slsdetectorgroup/test/setup-gui-tests
c675990 
setup e2e tests (PR#2)
@thattil
Merge branch 'main' into feature/save-parameters
59245fd
@thattil
Merge branch 'main' into feature/save-plot-type
f563866
@Bechir-Brahem
fix PRs conversation
7b42a97
@Bechir-Brahem
move code into different function
6b6f68c
@Bechir-Brahem
Merge branch 'feature/save-plot-type' of github.com:slsdetectorgroup/…
6b9debc 
…pyctbgui into feature/save-plot-type
@thattil
Merge pull request #158 from slsdetectorgroup/feature/save-parameters
4840ed3 
load and save parameters (PR#3)
@Bechir-Brahem
Merge branch 'main' into feature/save-plot-type
da7757c
@thattil
Merge pull request #159 from slsdetectorgroup/feature/save-plot-type
130d3c7 
save plot type PR#4
@Bechir-Brahem
fix wrong function names for power supply
662f005
@erikfrojdh
Merge pull request #163 from slsdetectorgroup/fix/update_function_names
152691a 
fix wrong function names for power supply
@thattil
Add 'pyctbgui/' from commit '152691ae1483eb54d6e73146a73c702483c5b38c'
1056066 
git-subtree-dir: pyctbgui
git-subtree-mainline: 15e8c0d
git-subtree-split: 152691a
@thattil thattil linked an issue Sep 6, 2024 that may be closed by this pull request
Move pyctbgui into slsdetectorPackage #938
Closed
@thattil thattil modified the milestone: 9.0.0 Major Sep 6, 2024
erikfrojdh
erikfrojdh reviewed Sep 10, 2024
View reviewed changes
Copy link
Member

@erikfrojdh erikfrojdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

W should have a look a the files in pyctbgui/.github before merging some files can be removed.

pyctbgui/.clang-format Outdated Show resolved Hide resolved
pyctbgui/.github/ISSUE_TEMPLATE/bug_report.md Outdated Show resolved Hide resolved
pyctbgui/.github/ISSUE_TEMPLATE/change_request.md Outdated Show resolved Hide resolved
pyctbgui/.github/ISSUE_TEMPLATE/feature_request.md Outdated Show resolved Hide resolved
pyctbgui/.github/workflows/build-and-test-inplace.yml
@@ -0,0 +1,35 @@
name: Build inplace, run tests and linting
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to think how to integrate this in the general workflow

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok i will leave this folder

pyctbgui/nohup.out Outdated Show resolved Hide resolved
erikfrojdh
erikfrojdh approved these changes Sep 10, 2024
View reviewed changes
Copy link
Member

@erikfrojdh erikfrojdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Let's merge it and then modify as needed later

@thattil thattil merged commit 5b61ff2 into developer Sep 10, 2024
2 checks passed
@thattil thattil deleted the dev/pyctbgui_merge branch September 10, 2024 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erikfrojdh erikfrojdh erikfrojdh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Move pyctbgui into slsdetectorPackage
3 participants
@thattil @erikfrojdh @Bechir-Brahem