Merge branch 'master' into T24606-MergeSpectralUnmixing
dfe34914f050
Actions

Description

Merge branch 'master' into T24606-MergeSpectralUnmixing

Details

Provenance

holzwart	Authored on Jul 30 2018, 3:12 PM
holzwart	Pushed on Jul 30 2018, 3:17 PM

Parents

rMITKfba6d2bc7c89: adds signal to enable gui (fixed bug)
rMITK6cdf4503348a: Merge branch 'T24679-PAUSMotionCompensation'

Branches

Unknown

Tags

Unknown

Event Timeline

holzwart committed rMITKdfe34914f050: Merge branch 'master' into T24606-MergeSpectralUnmixing (authored by holzwart).Jul 30 2018, 3:12 PM

Merged Changes

6cdf4503348a Merge branch 'T24679-PAUSMotionCompensation'
Author
adler
Browse Repository
No Builds
No Audits
5cc9249cc224 Before flow computation matrix is scaled to char resolution
Author
adler
Browse Repository
No Builds
No Audits
b668999df75c Errors thrown in module are catched in the plugin
Author
adler
Browse Repository
No Builds
No Audits
dc22c97b984e User interface and plugin were finished
Author
adler
Browse Repository
No Builds
No Audits
ed09ab547695 Flow is reshaped to correct remapping map
Author
adler
Browse Repository
No Builds
No Audits
1079abff4b69 Code review feedback was applied
Author
adler
Browse Repository
No Builds
No Audits
cca41221cbac Wrappers for SetInput and GetInput were (re-)introduced
Author
adler
Browse Repository
No Builds
No Audits
fb375741a002 Manual setters and getters were replaced by the itk macros
Author
adler
Browse Repository
No Builds
No Audits
24ded783fbf4 Code commentary was added
Author
adler
Browse Repository
No Builds
No Audits
5e8f9e37ca10 Variable names were refactored to conform with style guide
Author
adler
Browse Repository
No Builds
No Audits
8a2dd50f6799 Setters and getters were added
Author
adler
Browse Repository
No Builds
No Audits
593a61cc48de Tests were filled with meaning
Author
adler
Browse Repository
No Builds
No Audits
18e9fa0e9638 Major refactoring was completed
Author
adler
Browse Repository
No Builds
No Audits
822e7cb10704 More test stumps were added
Author
adler
Browse Repository
No Builds
No Audits
f9fa9a3c71c4 Major refactoring started
Author
adler
Browse Repository
No Builds
No Audits
c11b2001318a Skeleton for tests of motion compensation was written
Author
adler
Browse Repository
No Builds
No Audits
6c99e80272d3 Debug messages were added
Author
adler
Browse Repository
No Builds
No Audits
538728bbe7f0 cv::Mat were deep copied
Author
adler
Browse Repository
No Builds
No Audits
19ecbcc07dec Plugin was made to communicate with module
Author
adler
Browse Repository
No Builds
No Audits
868bf8eec18d Main algorithm was implemented
Author
adler
Browse Repository
No Builds
No Audits
951f24311b90 2 selected images are enforced
Author
adler
Browse Repository
No Builds
No Audits
35b78cd36788 UI was adapted
Author
adler
Browse Repository
No Builds
No Audits
c36f2dceb29b Motion correction filter was included in plugin
Author
adler
Browse Repository
No Builds
No Audits
b83c82e6b865 Plugin dependency on PhotoacousticsAlgorithms was added
Author
adler
Browse Repository
No Builds
No Audits
a2c45bef3633 Motion correction class was added to paa module via cmake file
Author
adler
Browse Repository
No Builds
No Audits
77c84d5b0778 OpenCV was added as a dependency to the module
Author
adler
Browse Repository
No Builds
No Audits
f457b39c2bcc Motion correction class was created
Author
adler
Browse Repository
No Builds
No Audits
ac21d927157e Short documentation was written
Author
adler
Browse Repository
No Builds
No Audits
2f6d11db0f03 Missing text fields were added to ui
Author
adler
Browse Repository
No Builds
No Audits
f07be45affbf An icon was generated
Author
adler
Browse Repository
No Builds
No Audits
fe76d33ccab1 Created empty plugin
Author
adler
Browse Repository
No Builds
No Audits

Changes (28)

Path

Size

Modules/

PhotoacousticsAlgorithms/

CMakeLists.txt

files.cmake

include/

mitkPhotoacousticMotionCorrectionFilter.h

source/

mitkPhotoacousticMotionCorrectionFilter.cpp

test/

files.cmake

mitkPhotoacousticMotionCorrectionFilterTest.cpp

Plugins/

PluginList.cmake

org.mitk.gui.qt.photoacoustics.pausmotioncompensation

manifest_headers.cmake

PAUSMotionCompensation.cpp

PAUSMotionCompensation.h

PAUSMotionCompensationControls.ui

org_mitk_gui_qt_photoacoustics_pausmotioncompensation_Activator.cpp

org_mitk_gui_qt_photoacoustics_pausmotioncompensation_Activator.h

	Plugins/	org.mitk.gui.qt.photoacoustics.pausmotioncompensation/
	Applications/	PluginGenerator/

		documentation/	UserManual/
	PluginTemplate/	documentation/	UserManual/

icon.xpm

	resources/
	PluginTemplate/	documentation/	UserManual/

icon.xpm

rMITKdfe34914f050

View Options

Modules/PhotoacousticsAlgorithms/CMakeLists.txt

View Options

Modules/PhotoacousticsAlgorithms/files.cmake

View Options

Modules/PhotoacousticsAlgorithms/include/mitkPhotoacousticMotionCorrectionFilter.h

View Options

Modules/PhotoacousticsAlgorithms/source/mitkPhotoacousticMotionCorrectionFilter.cpp

View Options

Modules/PhotoacousticsAlgorithms/test/files.cmake

View Options

Modules/PhotoacousticsAlgorithms/test/mitkPhotoacousticMotionCorrectionFilterTest.cpp

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/documentation/UserManual/Manual.dox

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/documentation/UserManual/icon.xpm

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/documentation/doxygen/modules.dox

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/files.cmake

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/manifest_headers.cmake

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/plugin.xml

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/resources/icon.xpm

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/resources/pai.svg

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/PAUSMotionCompensation.cpp

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/PAUSMotionCompensation.h

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/PAUSMotionCompensationControls.ui

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/org_mitk_gui_qt_photoacoustics_pausmotioncompensation_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/org_mitk_gui_qt_photoacoustics_pausmotioncompensation_Activator.h

Merge branch 'master' into T24606-MergeSpectralUnmixingdfe34914f050Actions

Description

Details

Event Timeline

Merged Changes

Changes (28)

rMITKdfe34914f050

Modules/PhotoacousticsAlgorithms/CMakeLists.txt

Modules/PhotoacousticsAlgorithms/files.cmake

Modules/PhotoacousticsAlgorithms/include/mitkPhotoacousticMotionCorrectionFilter.h

Modules/PhotoacousticsAlgorithms/source/mitkPhotoacousticMotionCorrectionFilter.cpp

Modules/PhotoacousticsAlgorithms/test/files.cmake

Modules/PhotoacousticsAlgorithms/test/mitkPhotoacousticMotionCorrectionFilterTest.cpp

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/CMakeLists.txt

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/documentation/UserManual/icon.xpm

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/documentation/doxygen/modules.dox

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/files.cmake

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/manifest_headers.cmake

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/plugin.xml

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/resources/icon.xpm

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/resources/pai.svg

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/PAUSMotionCompensation.cpp

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/PAUSMotionCompensation.h

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/PAUSMotionCompensationControls.ui

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/org_mitk_gui_qt_photoacoustics_pausmotioncompensation_Activator.cpp

Plugins/org.mitk.gui.qt.photoacoustics.pausmotioncompensation/src/internal/org_mitk_gui_qt_photoacoustics_pausmotioncompensation_Activator.h

Merge branch 'master' into T24606-MergeSpectralUnmixing
dfe34914f050
Actions