Diffusion MITK ae663da0c8b0

Merge remote-tracking branch 'origin/master' into bug-14443…
ae663da0c8b0
Actions

Description

Merge remote-tracking branch 'origin/master' into bug-14443-MakeImageAccessThreadSafe

Details

Provenance

• goerres

Authored on Jun 26 2013, 2:23 PM

Parents

rMITKdc5e13e9e9b4: removed unnecessary steps
rMITK8650c1f728e6: Merge branch 'bug-15359-RemoveMisleadingErrors'

Branches

Unknown

Tags

Unknown

Event Timeline

• goerres committed rMITKae663da0c8b0: Merge remote-tracking branch 'origin/master' into bug-14443… (authored by • goerres).Jun 26 2013, 2:23 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

8650c1f728e6 Merge branch 'bug-15359-RemoveMisleadingErrors'
Author
• mersmann
Browse Repository
No Builds
No Audits
2181568ab336 Merge branch 'bug-14383-fix-external-dependency-handling-of-modules'
Author
zelzer
Browse Repository
No Builds
No Audits
5a128701c970 Properly pass down additional search paths to external projects.
Author
zelzer
Browse Repository
No Builds
No Audits
9f6a8afeaf71 Added ToF Hardware options for external projects.
Author
zelzer
Browse Repository
No Builds
No Audits
8f915e05727f Use absolute path for template batch file.
Author
zelzer
Browse Repository
No Builds
No Audits
0fc64a399059 Stream-lined the library search path CMake function and its usage.
Author
zelzer
Browse Repository
No Builds
No Audits
6dfc4a320f1a Merge branch 'bug-14821-use-correct-library-prefix-during-preloading'
Author
zelzer
Browse Repository
No Builds
No Audits
1494f942f45b Use a platform specific library prefix for pre-loaded CTK libraries.
Author
zelzer
Browse Repository
No Builds
No Audits
e553e57ff96a Merge branch 'bug-15358-documentation-changes-integration'
Author
• goch
Browse Repository
No Builds
No Audits
022e51be7ee1 Merge branch 'bug-15433-deduplicate-tags' into bug-15358-documentation-changes…
Author
• goch
Browse Repository
No Builds
No Audits
aeffa56b731d Merge branch 'bug-15245-connectomics-statistics-crashes-after-generating…
Author
• goch
Browse Repository
No Builds
No Audits
dcd04ed273e8 Check index to be in range an reinitialize counter for each new run
Author
• goch
Browse Repository
No Builds
No Audits
1cb02a99fcd9 Fixed ITK search path and intermediate path issues.
Author
zelzer
Browse Repository
No Builds
No Audits
7de14c389cf3 Glob all "plug-ins" in the install tree.
Author
zelzer
Browse Repository
No Builds
No Audits
9327608a8322 Improved install support for ToF hardware driver.
Author
zelzer
Browse Repository
No Builds
No Audits
d52fb4cad8b0 Added CMake function for retreiving a list of library search paths.
Author
zelzer
Browse Repository
No Builds
No Audits
7b4a247df83a Merge branch 'bug-15077-enable-override-startapp-batch-script'
Author
zelzer
Browse Repository
No Builds
No Audits
77e9c1168972 Check for existence of start<_APP_NAME>.bat.in
Author
clarkson
Browse Repository
No Builds
No Audits
f11754a8439c Merge branch 'bug-10324-add-4d-support-to-step6'
Author
zelzer
Browse Repository
No Builds
No Audits
441cf1310cd6 Added 4d instantiations of the region growing template.
Author
zelzer
Browse Repository
No Builds
No Audits
44ec17bfc5aa Merge branch 'bug-15386-RemoveObsoleteInteractionLeftOvers'
Author
• metzger
Browse Repository
No Builds
No Audits
ccb00a597929 Merge branch 'bug-15386-ClippingPlaneFixes'
Author
• metzger
Browse Repository
No Builds
No Audits
f221f6bb98c7 Add new variable for the "back"transformation from world to index geometry.
Author
• metzger
Browse Repository
No Builds
No Audits
62d86dd90d2e Merge branch 'bug-15365-segmentation-selection-weird'
Author
• fetzer
Browse Repository
No Builds
No Audits
d4af86d0a79b Merge branch 'bug-15369-crash-on-accept-3d-interpolation'
Author
• fetzer
Browse Repository
No Builds
No Audits
c66e86e141a1 Merge branch 'bug-15370-position-nodes-not-working'
Author
• fetzer
Browse Repository
No Builds
No Audits
f805a6d8298f Fixed not working position nodes
Author
• fetzer
Browse Repository
No Builds
No Audits
f2d223407ecc If a new segmentation is created it is now set as selected item of the combobox
Author
• fetzer
Browse Repository
No Builds
No Audits
904fd155d848 Deactivating tool if working node becomes invisible
Author
• fetzer
Browse Repository
No Builds
No Audits
0712ff4ebe87 Fixed wrong warning label for segmentation
Author
• fetzer
Browse Repository
No Builds
No Audits
d9e7e8c6a35c Only show interpolation result if workingdata is really visible
Author
• fetzer
Browse Repository
No Builds
No Audits
dcb6bc177232 Minor improvements
Author
• fetzer
Browse Repository
No Builds
No Audits
128f660c5228 Adding delete event observer for new segmentations
Author
• fetzer
Browse Repository
No Builds
No Audits
c42a4548e3c8 Removing observers in dtor
Author
• fetzer
Browse Repository
No Builds
No Audits
1d41bb2d6dcf SurfaceInterpolationController is now listening for delete event of selected…
Author
• fetzer
Browse Repository
No Builds
No Audits
011e3c823c1f Fixed visibility warning for segmentation
Author
• fetzer
Browse Repository
No Builds
No Audits
906384e88bbd Show or hide 3d interpolation if working node visibility is changed
Author
• fetzer
Browse Repository
No Builds
No Audits
4e66e8f07814 Made ShowInterpolationResult a public function
Author
• fetzer
Browse Repository
No Builds
No Audits
0a31fa18ef55 Removed unused variable
Author
• fetzer
Browse Repository
No Builds
No Audits
f9ef71dc77bd Disable interpolation widget if working data is null
Author
• fetzer
Browse Repository
No Builds
No Audits
d363735e89b5 Hide previous interpolation when a new contour id is set for the 3d…
Author
• fetzer
Browse Repository
No Builds
No Audits
9f2f2114b276 Add check for invalid working data when accepting the 3d interpolation
Author
• fetzer
Browse Repository
No Builds
No Audits
4df712cc2071 Some code cleaning
Author
• fetzer
Browse Repository
No Builds
No Audits
a2c8c10b73f7 Merge branch 'bug-15410-RemoveRearrangeSliceMethod'
Author
neher
Browse Repository
No Builds
No Audits
88379750fa6c COMP: changed all vectory to same itk type
Author
neher
Browse Repository
No Builds
No Audits
220ba90cd3c0 Merge branch 'bug-15410-RemoveRearrangeSliceMethod'
Author
neher
Browse Repository
No Builds
No Audits
3ca08dfc55a1 COMP: changed spacing to mitkvector3d
Author
neher
Browse Repository
No Builds
No Audits
9ac7e98d2d7d Merge branch 'bug-15410-RemoveRearrangeSliceMethod'
Author
neher
Browse Repository
No Builds
No Audits
54b8ed7a7e6b COMP: removed method
Author
neher
Browse Repository
No Builds
No Audits
04b32a50cb58 Merge branch 'bug-15409-DirectFiberDirectionEvaluation'
Author
neher
Browse Repository
No Builds
No Audits

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.

Merge remote-tracking branch 'origin/master' into bug-14443…ae663da0c8b0Actions

Description

Details

Event Timeline

Merged Changes

Very Large Commit

Merge remote-tracking branch 'origin/master' into bug-14443…
ae663da0c8b0
Actions