Merge branch 'bug-16236-fix-types-wo-testdata'
f771ce13fdd7
Actions

Description

Merge branch 'bug-16236-fix-types-wo-testdata'

Conflicts:
Modules/ImageStatistics/Testing/CMakeLists.txt
Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp
Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp
Modules/ImageStatistics/mitkImageStatisticsCalculator.h
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

Details

Provenance

saruji

Authored on Sep 2 2014, 11:52 AM

Parents

rMITK9094a2e36423: round when converting from double to int
rMITK0f1a16941d29: Merge branch 'bug-17959-UpdatingServerUrlDoesNotAffectUINEU'

Branches

Unknown

Tags

Unknown

Event Timeline

saruji committed rMITKf771ce13fdd7: Merge branch 'bug-16236-fix-types-wo-testdata' (authored by saruji).Sep 2 2014, 2:32 PM

Merged Changes

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

9094a2e36423 round when converting from double to int
Author
saruji
Browse Repository
No Builds
No Audits
2ab5b269a4a3 Check for negative variance from itk statistics filter
Author
saruji
Browse Repository
No Builds
No Audits
aaf25f46ac3a Adapt tolerance to maximum seen in tests
Author
maleike
Browse Repository
No Builds
No Audits
58044ff49312 Comment on required cleanup
Author
maleike
Browse Repository
No Builds
No Audits
849d4f2e1486 Fix handling of parameter types (still messy)
Author
maleike
Browse Repository
No Builds
No Audits
6e527312540e removed obsolete todo
Author
saruji
Browse Repository
No Builds
No Audits
1ab37a703ef0 Fix warnings
Author
maleike
Browse Repository
No Builds
No Audits
acdd208d4092 Fix calculation of statistics within hotspot region
Author
maleike
Browse Repository
No Builds
No Audits
c65571fbbe42 Fix test expectations, fail on exceptions
Author
maleike
Browse Repository
No Builds
No Audits
1002bb7941f1 removed convolution image member
Author
saruji
Browse Repository
No Builds
No Audits
f8d15ac96304 commented out not funtioning code for hotspot statistics calculation
Author
saruji
Browse Repository
No Builds
No Audits
39e168860836 mask Image has not the same region as the given convolution image
Author
saruji
Browse Repository
No Builds
No Audits
53ce74e6d2f9 fabs method takes double as input
Author
saruji
Browse Repository
No Builds
No Audits
24b717fcb2b9 Fix syntax of testcase definition
Author
maleike
Browse Repository
No Builds
No Audits
763b463da4f9 Rename variables, change formatting
Author
maleike
Browse Repository
No Builds
No Audits
714ac55226a7 Fix calculation of min/max index
Author
maleike
Browse Repository
No Builds
No Audits
a134e1c5ac42 Fix mask handling
Author
maleike
Browse Repository
No Builds
No Audits
f05e7e7847e6 Fix position verification
Author
maleike
Browse Repository
No Builds
No Audits
cbbbeefab1bc Update test cases
Author
maleike
Browse Repository
No Builds
No Audits
2da145a07952 Update to more clear test cases
Author
maleike
Browse Repository
No Builds
No Audits
6dddedb74013 Fix test definition
Author
maleike
Browse Repository
No Builds
No Audits
82b5671a5f1a Generate test cases via CMake
Author
maleike
Browse Repository
No Builds
No Audits
bc1d4269ef3c Fix documentation in details
Author
maleike
Browse Repository
No Builds
No Audits
d58fda45acb9 Improve test structure and output a bit
Author
maleike
Browse Repository
No Builds
No Audits
1a0f2c5c808d New XML-files for hotspot-test
Author
• grafa
Browse Repository
No Builds
No Audits
a5455fa80f54 fix compile errors on linux
Author
saruji
Browse Repository
No Builds
No Audits
4402e1e20f1c Merge remote-tracking branch 'origin/bug-16396-gaussian-image-generator-for…
Author
saruji
Browse Repository
No Builds
No Audits
4bbef6a835ac Changed value of epsilon
Author
• grafa
Browse Repository
No Builds
No Audits
0a9efdc8e2f9 Did some changes in the documentation
Author
• grafa
Browse Repository
No Builds
No Audits
161a0a3e0a4c Fixed bugs in Hotspot-Test and convolution-kernel-calculation, added variance…
Author
• grafa
Browse Repository
No Builds
No Audits
f40a6b186ba5 Added another comment
Author
• grafa
Browse Repository
No Builds
No Audits
df59160b24f2 Edited documentation, added comments and a new version of hotspotcase5-image
Author
• grafa
Browse Repository
No Builds
No Audits
9b3dcfef5c0b Added images for documentation
Author
• grafa
Browse Repository
No Builds
No Audits
6f2e8ed4ddfc Multi-label statistic-calculation is now supported in hotspot-test
Author
• grafa
Browse Repository
No Builds
No Audits
7c0c4cb3f803 Added case that it is optional if hotspot is completly inside image or not and…
Author
• grafa
Browse Repository
No Builds
No Audits
8768426dff46 Mark locations for addition of "m_HotspotMustBeCompletelyInsideImage"
Author
maleike
Browse Repository
No Builds
No Audits
53221077e1bb Added operator=() overload and copy constructor for Statistics
Author
• grafa
Browse Repository
No Builds
No Audits
6e1f94472f5f Simplify case of unmasked hotspot calculation
Author
maleike
Browse Repository
No Builds
No Audits
b5c544731d74 Mark TODOs for further Statistics class work
Author
maleike
Browse Repository
No Builds
No Audits
44c80ab2bc78 Calculate mask correctly at image borders (shrink if outside image)
Author
maleike
Browse Repository
No Builds
No Audits
8f97a4ea63ec Add TODOs for 2D case ; decide for distance calculation
Author
maleike
Browse Repository
No Builds
No Audits
6f9f193d2b20 Mark TODOs for calculating statistics per-label
Author
maleike
Browse Repository
No Builds
No Audits
cc0e40ff294d Added use of get-functions in statisticsview
Author
• grafa
Browse Repository
No Builds
No Audits
18093e54c35c Struct Statistics is now a class with get- and set-functions
Author
• grafa
Browse Repository
No Builds
No Audits
8b7f22e5f2ea removed redundant code in hotspot test, statisticscalculator does now return…
Author
• grafa
Browse Repository
No Builds
No Audits
3277d71a63ec Calculate hotspot position
Author
maleike
Browse Repository
No Builds
No Audits
bd658fc31037 Update convolution image only when input has changed
Author
maleike
Browse Repository
No Builds
No Audits
4130aca9442a Add flags for modified input radius
Author
maleike
Browse Repository
No Builds
No Audits
ac27d30f72b3 Change Statistics members (HotspotPeakIndex->HotspotIndex)
Author
maleike
Browse Repository
No Builds
No Audits
c65e588937fe set the values for the normal distribution vector
Author
• kovacheva
Browse Repository
No Builds
No Audits

Changes (47)

Path

Size

Packages

Documentation/

doxygen.conf.in

Modules/

ImageStatistics/

Testing/

Merge branch 'bug-16236-fix-types-wo-testdata'f771ce13fdd7Actions

Description

Details

Event Timeline

Merged Changes

Changes (47)

rMITKf771ce13fdd7

Documentation/doxygen.conf.in

Modules/ImageStatistics/Testing/CMakeLists.txt

Modules/ImageStatistics/Testing/Data/Hotspot/GlobalPeakOutsideSegmentation_10_20.xml

Modules/ImageStatistics/Testing/Data/Hotspot/GlobalPeakOutsideSegmentation_25_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/GlobalPeakOutsideSegmentation_40_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/MaxOutsidePeak_10_20.xml

Modules/ImageStatistics/Testing/Data/Hotspot/MaxOutsidePeak_25_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/MaxOutsidePeak_40_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_10_20.xml

Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_25_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_40_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/PeakNearBorder_10_20.xml

Modules/ImageStatistics/Testing/Data/Hotspot/PeakNearBorder_25_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/PeakNearBorder_40_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_10_20.xml

Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_25_30.xml

Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_40_30.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case1.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case2.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case3.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case4.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case5.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case6.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case7.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case8.xml

Modules/ImageStatistics/Testing/Data/neue Bilder/Hotspot_Case9.xml

Modules/ImageStatistics/Testing/files.cmake

Modules/ImageStatistics/Testing/mitkImageStatisticsHotspotTest.cpp

Modules/ImageStatistics/Testing/mitkMultiGaussianTest.cpp

Modules/ImageStatistics/images/convolutionkernelsupersampling.jpg

Modules/ImageStatistics/images/hotspotexample.JPG

Modules/ImageStatistics/images/mitkimagestatisticshotspottestcase1.jpg

Modules/ImageStatistics/images/mitkimagestatisticshotspottestcase2.jpg

Modules/ImageStatistics/images/mitkimagestatisticshotspottestcase3.jpg

Modules/ImageStatistics/images/mitkimagestatisticshotspottestcase5.jpg

Modules/ImageStatistics/images/mitkimagestatisticshotspottestcase6.jpg

Modules/ImageStatistics/itkMultiGaussianImageSource.h

Modules/ImageStatistics/itkMultiGaussianImageSource.hxx

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

Modules/ImageStatistics/mitkImageStatisticsCalculator.h

Modules/ImageStatistics/mitkImageStatisticsHotspotTest.dox

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

Merge branch 'bug-16236-fix-types-wo-testdata'
f771ce13fdd7
Actions