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.

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

Synch with upstream and fix formatting diffs #844

Closed
wants to merge 143 commits into from

Conversation

fcollot
Copy link

@fcollot fcollot commented Apr 10, 2024

Many of our fork changes have recently been ported to medInria, sometimes with minor changes. This PR synchs the fork to take these minor changes into account.
Also there are formatting differences between the two repos. In order to minimise these (which can be very frustrating when synching) we use the medInria formatting.

fcollot and others added 30 commits December 1, 2022 16:59
[Four-views] solve crash closing the views
[Zoom] proper zoom displaying data on xy and not xyz
[Tabs] handling of tabs: removal, switch
[N4Bias] manage process cancel if the user wants to quit the app
[Reslice] fix zoom error + code clarity
[Paint] create mask before trying to paint + hide a button
[3.3.1] release notes & version number with four view crash-fix
Set cmake minimum version to 17 for medInria project
[DCM] do not corrupt exported/imported dcm with odd axis
…nect

[Registration] selector toolbox empty connect
mathildemerle and others added 24 commits February 20, 2024 10:53
…Med3.4

[Reslice] background color for selected view
[DCMTK] repo not accessible anymore, switch to github
[DCM] same test as on med3.3 branch, quicker
[Video] put a better default frame rate
Co-authored-by: mathildemerle <mathilde.merle@ihu-liryc.fr>
medInria#829) (medInria#1222)

* {VoiCutter} keySym instead of keyCode and wait status

* [VoiCutter] solve min and max intensity and keys on mac & linux

Co-authored-by: mathildemerle <mathilde.merle@ihu-liryc.fr>
@fcollot fcollot changed the title Synch with upstream and fix indentations diffs Synch with upstream and fix formatting diffs Apr 10, 2024
@mathildemerle
Copy link

You don't want to create it on 4.1 branch by the way? I thought it was the dev branch for the next release (except small bug fix as 4.0.2)

@fcollot
Copy link
Author

fcollot commented Apr 11, 2024

yes sorry, my mistake

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants