Home
Phabricator
Search
Configure Global Search
Log In
Diffusion
MITK
a2880a2a9216
Merge branch 'master' into T23077-ProjectShapeComparison2
a2880a2a9216
Actions
Edit Commit
Download Raw Diff
Edit Related Objects...
Edit Tasks
Subscribe
Mute Notifications
Award Token
Flag For Later
Tags
None
Referenced Files
None
Subscribers
None
Description
Merge branch 'master' into T23077-ProjectShapeComparison2
Conflicts:
Modules/ModuleList.cmake
Details
Provenance
•
hempe
Authored on Dec 22 2017, 11:55 AM
•
hempe
Pushed on Jan 12 2018, 1:21 PM
Parents
rMITK1e11667f18ac: Merge branch 'T23293-modernize-use-override'
rMITKccbbe1a05bd7: Calculate Curvature
Branches
Unknown
Tags
Unknown
Event Timeline
•
hempe
committed
rMITKa2880a2a9216: Merge branch 'master' into T23077-ProjectShapeComparison2
(authored by
•
hempe
).
Dec 22 2017, 11:55 AM
2017-12-22 11:55:24 (UTC+1)
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
1e11667f18ac
Merge branch 'T23293-modernize-use-override'
Author
kislinsk
Browse Repository
No Builds
No Audits
89f7ca4fb489
Apply clang-tidy modernize-use-override fixes
Author
kislinsk
Browse Repository
No Builds
No Audits
5505797eea62
Merge branch 'T23986-mpkh'
Author
kislinsk
Browse Repository
No Builds
No Audits
d3266c2d696a
Merge remote-tracking branch 'samsmu/SpecificCharacterSet' into T23986-mpkh
Author
kislinsk
Browse Repository
No Builds
No Audits
290860d30de9
Add this to member function call
Author
kislinsk
Browse Repository
No Builds
No Audits
9896ca013166
Merge remote-tracking branch 'samsmu/viewc_crash' into T23986-mpkh
Author
kislinsk
Browse Repository
No Builds
No Audits
dbfed4c1b343
Merge remote-tracking branch 'samsmu/emptyFileName_string' into T23986-mpkh
Author
kislinsk
Browse Repository
No Builds
No Audits
74ce1a4675e8
Throw if isRunning() or sendMessage() are called but not implemented
Author
kislinsk
Browse Repository
No Builds
No Audits
202630a41cf9
Merge remote-tracking branch 'samsmu/baseApp' into T23986-mpkh
Author
kislinsk
Browse Repository
No Builds
No Audits
7e77eec41fa5
Merge remote-tracking branch 'samsmu/io_transcode' into T23986-mpkh
Author
kislinsk
Browse Repository
No Builds
No Audits
b70c30e96d4c
Merge remote-tracking branch 'samsmu/orks' into T23986-mpkh
Author
kislinsk
Browse Repository
No Builds
No Audits
7b564900ef3b
Merge branch 'T23985-macOS'
Author
kislinsk
Browse Repository
No Builds
No Audits
751cad5cc159
Remove debug output
Author
kislinsk
Browse Repository
No Builds
No Audits
19500034a3d0
Merge remote-tracking branch 'MattClarkson/19784-mac-rendering' into T23985…
Author
kislinsk
Browse Repository
No Builds
No Audits
f26d293d9b70
Make platform specific switch compatible to macOS
Author
kislinsk
Browse Repository
No Builds
No Audits
cdd7adc13ffa
Remove unused parameter name
Author
kislinsk
Browse Repository
No Builds
No Audits
9f8b087070ea
Disable OSAtomic.h optimizations for macOS 10.12 and later
Author
kislinsk
Browse Repository
No Builds
No Audits
b7c20d3e8f55
Merge branch 'T23775-warnings-no-errors-for-apps'
Author
nolden
Browse Repository
No Builds
No Audits
a43a844682c2
Add WARNINGS_NO_ERRORS option for command line tool build
Author
nolden
Browse Repository
No Builds
No Audits
77d80814ea76
Fixed T23807
Author
floca
Browse Repository
No Builds
No Audits
4677df958140
Merge branch 'T23970-MatrixConvert'
Author
kislinsk
Browse Repository
No Builds
No Audits
58321587970e
Migrate to latest ITK
Author
kislinsk
Browse Repository
No Builds
No Audits
4b9a5cbb5f43
Merge branch 'T23775-ExtensionPoint'
Author
kislinsk
Browse Repository
No Builds
No Audits
1760aca2bbc7
Fix warnings and errors related to latest ITK upgrade
Author
kislinsk
Browse Repository
No Builds
No Audits
8f5fdc9e3c20
Merge branch 'T23580-Fix'
Author
kislinsk
Browse Repository
No Builds
No Audits
23a4ab715695
Add const cast
Author
kislinsk
Browse Repository
No Builds
No Audits
83154090868e
Merge branch 'T23580-Fix'
Author
kislinsk
Browse Repository
No Builds
No Audits
84543b153a16
Work around GCC compiler error
Author
kislinsk
Browse Repository
No Builds
No Audits
783101d8c437
Merge branch 'T23721-MasterIntegrationFixes'
Author
kislinsk
Browse Repository
No Builds
No Audits
f845df86a679
Explicitly call Identifiable ctor in BaseData cctor
Author
kislinsk
Browse Repository
No Builds
No Audits
201e36a92abb
Merge branch 'T23721-MasterIntegrationFixes'
Author
kislinsk
Browse Repository
No Builds
No Audits
8178ccc72b7f
Changed IIdentifiable to Identifiable and introduced UIDManipulator
Author
kislinsk
Browse Repository
No Builds
No Audits
27cdf9f0b768
Rename propertyName to propertyKey
Author
kislinsk
Browse Repository
No Builds
No Audits
90f160bbe315
Add superbuild binary directory to target include directories
Author
kislinsk
Browse Repository
No Builds
No Audits
310264659d6a
removed a lot of unneeded const_casts
Author
hentsch
Browse Repository
No Builds
No Audits
fe47bb8cba81
Merge branch 'T23967-ExtractParc'
Author
neher
Browse Repository
No Builds
No Audits
095ef4494d6c
Enable dcmtk and dcmqi for diffusion
Author
neher
Browse Repository
No Builds
No Audits
632eed4701bc
Fiber bundle envelope is label set image now
Author
neher
Browse Repository
No Builds
No Audits
d0937ff7b066
Add TDI tract filter
Author
neher
Browse Repository
No Builds
No Audits
fa2868552b57
Add parcellation based extraction
Author
neher
Browse Repository
No Builds
No Audits
5a0982dc5a5d
Merge branch 'T23898-Regu2'
Author
neher
Browse Repository
No Builds
No Audits
9d3d0e72e91b
Update tractgraphy ROI interpolation
Author
neher
Browse Repository
No Builds
No Audits
20ff7b0a8a45
Interpolator as parameter for speedup
Author
neher
Browse Repository
No Builds
No Audits
5cabdcb54bcf
Template fiber extraction filter
Author
neher
Browse Repository
No Builds
No Audits
81c42fdf7216
Fix detection of external projects
Author
kislinsk
Browse Repository
No Builds
No Audits
11b1c97127f8
Use itk image interpolator instead of own trilinear interpolation
Author
neher
Browse Repository
No Builds
No Audits
f5b359e4f281
fixed gcc compiler errors.
Author
floca
Browse Repository
No Builds
No Audits
fa4d594f821c
Support external ExternalProjects and pass MITK_EXTENSION_DIRS to MITK-build
Author
kislinsk
Browse Repository
No Builds
No Audits
8ee1255e348f
Handle modules like plugins in top-level CMakeLists.txt
Author
kislinsk
Browse Repository
No Builds
No Audits
e090d002a3d0
Rename mitk_modules to MITK_MODULES
Author
kislinsk
Browse Repository
No Builds
No Audits
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.