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

Synch with upstream and fix formatting diffs #845

Merged
merged 143 commits into from
Apr 11, 2024
Merged

Synch with upstream and fix formatting diffs #845

merged 143 commits into from
Apr 11, 2024

Conversation

fcollot
Copy link

@fcollot fcollot commented Apr 11, 2024

see #844

fcollot and others added 30 commits December 1, 2022 16:59
@fcollot
Merge pull request medInria#1059 from fcollot/medInria3.4.x
63f4c1f 
rebase from medInria3.3.x
@fcollot
Add PYNCPP external project
cd67ade
@fcollot
[add PYNCPP] Minor changes following review
7a2f79f
@fcollot
Merge pull request medInria#1047 from fcollot/pyncpp2
dbe6c13 
Add PYNCPP external project
[Four-views] solve crash closing the views
2951229
[Zoom] proper zoom displaying data on xy and not xyz
b62f990
[Tabs] handling of tabs: removal, switch
7644d30
[Tabs] manage the case of removing the last tab before opening new ones
0adbb70
[N4Bias] manage process cancel if the user wants to quit the app
749d690
[Reslice] fix zoom error + code clarity
3d2201e
[Reslice] dimension -> size
89ce6a8
[Paint] create mask before trying to paint + hide a button
a1e9a52
[3.3.1] release notes & version number with four view crash-fix
3781705
[Git diff] solve differences between musicardio to medInria3.4
35f58d5
[DCM] do not corrupt exported/imported dcm with odd axis
bdb554b
@fcollot
set minimum cmake version to 19
5af77d8
[Registration] selector toolbox empty connect
07dbd8e
[DCMTKImageIO] redo GetPositionOnStackingAxisForImage to get closest …
5e7dd2a 
…axis
[DCM] get the index value from metadata string
0b62944
[DCMTKImageIO] debug if max abs value is not first
f2b6351
@Florent2305
Merge pull request medInria#1060 from mathildemerle/fourViews
7ad4fa3 
[Four-views] solve crash closing the views
@Florent2305
Merge pull request medInria#1064 from mathildemerle/xyZoom
5ffd5b4 
[Zoom] proper zoom displaying data on xy and not xyz
@Florent2305
Merge pull request medInria#1067 from mathildemerle/tabs
60c7630 
[Tabs] handling of tabs: removal, switch
@Florent2305
Merge pull request medInria#1069 from mathildemerle/n4bias
32d7778 
[N4Bias] manage process cancel if the user wants to quit the app
@Florent2305
Merge pull request medInria#1071 from mathildemerle/resliceZoom
8ffbea9 
[Reslice] fix zoom error + code clarity
@Florent2305
Merge pull request medInria#1074 from mathildemerle/paintMask3.4
6658ca2 
[Paint] create mask before trying to paint + hide a button
@Florent2305
Merge pull request medInria#1076 from mathildemerle/fourViewsNumber
ad6c116 
[3.3.1] release notes & version number with four view crash-fix
@Florent2305
Merge pull request medInria#1082 from medInria/fcollot-patch-1
e620855 
Set cmake minimum version to 17 for medInria project
@Florent2305
Merge pull request medInria#1083 from mathildemerle/dcmAxis
fc514de 
[DCM] do not corrupt exported/imported dcm with odd axis
@Florent2305
Merge pull request medInria#1086 from mathildemerle/registrationNoCon…
36a6285 
…nect

[Registration] selector toolbox empty connect
Florent2305 and others added 26 commits February 5, 2024 15:00
@Florent2305
Merge pull request medInria#1197 from mathildemerle/pythonCompilationMed
a5d2ed2 
[Python] commits to debug mostly python in medInria
@mathildemerle
[Video] put a better default frame rate
550d9e8
@mathildemerle
[DCM] same test as on med3.3 branch, quicker
83b4b55
@mathildemerle
[DCMTK] repo not accessible anymore, switch to github
4d2cc14
@mathildemerle
{Reslice} background color for selected view
91eca8e
@Florent2305
Merge pull request medInria#1207 from mathildemerle/resliceBackground…
4bf597e 
…Med3.4

[Reslice] background color for selected view
@Florent2305
Merge pull request medInria#1205 from mathildemerle/dcmtkRepoMed
b012522 
[DCMTK] repo not accessible anymore, switch to github
@Florent2305
Merge pull request medInria#1203 from mathildemerle/quickerTest
961b662 
[DCM] same test as on med3.3 branch, quicker
@Florent2305
Merge pull request medInria#1199 from mathildemerle/videoFrameRate
d803b23 
[Video] put a better default frame rate
@fcollot
Switch to <package_name>_ROOT (medInria#1212)
7da6c37
@fcollot
[Linux packaging] install external projects manually (medInria#1216)
7fce051
@fcollot
Fix python packaging (medInria#1213)
8cf05fa
@fcollot
Place superbuild options earlier (medInria#1215)
85d71d1
@fcollot @mathildemerle
[PolygonRoi] clear deactivating the tlbx (medInria#812) (medInria#1223)
d5a25cb 
Co-authored-by: mathildemerle <mathilde.merle@ihu-liryc.fr>
@fcollot @mathildemerle
[VoiCutter] solve keys, min and max intensity, and add waiting toolbox (
cc8485e 
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
added a patch for ITK to compile on visual studio 2019 (medInria#1221)
a52b3f8
@fcollot
Remove BUILD_ALWAYS from external projects (medInria#1220)
c28eb64
@fcollot
Use DICOM Ids to identify patients and studies (medInria#1219)
9c777e1
@fcollot
Add development settings (medInria#1218)
5e4208b
@fcollot
Order of settings widgets (medInria#1217)
f33f86b
@fcollot
Adapt ep initialization macro for non-cmake projects (medInria#1214)
314a619
@fcollot
Minor changes (spaces etc.) (medInria#1226)
84cc5a0
@fcollot
Icon in Windows taskbar (medInria#1225)
8b55376
@fcollot
Avoid removal of files during windows install (medInria#1224)
f075f9e
@fcollot
Merge branch 'medInria3.4.x' of https://github.com/medInria/medInria-…
98101ab 
…public into sync
@fcollot
merge fixes
084d34a
@fcollot fcollot merged commit b5c3b26 into Inria-Asclepios:4.1 Apr 11, 2024
@mathildemerle mathildemerle added this to the v4.1 milestone Apr 30, 2024
@mathildemerle mathildemerle mentioned this pull request Jun 7, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mathildemerle mathildemerle mathildemerle approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v4.1
Development

Successfully merging this pull request may close these issues.
5 participants
@fcollot @mathildemerle @Florent2305 @paulineMig @juliencastelneau