Merge branch 'T24606-MergeSpectralUnmixing'
c28b29ac4a1f
Actions

Description

Merge branch 'T24606-MergeSpectralUnmixing'

Details

Provenance

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

Parents

rMITKdfe34914f050: Merge branch 'master' into T24606-MergeSpectralUnmixing
rMITK6cdf4503348a: Merge branch 'T24679-PAUSMotionCompensation'

Branches

Tags

Event Timeline

holzwart committed rMITKc28b29ac4a1f: Merge branch 'T24606-MergeSpectralUnmixing' (authored by holzwart).Jul 30 2018, 3:14 PM

Merged Changes

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

dfe34914f050 Merge branch 'master' into T24606-MergeSpectralUnmixing
Author
holzwart
Browse Repository
No Builds
No Audits
fba6d2bc7c89 adds signal to enable gui (fixed bug)
Author
holzwart
Browse Repository
No Builds
No Audits
65abc803d95d fixed bugs in test
Author
holzwart
Browse Repository
No Builds
No Audits
b876b4ba980a Merge branch 'T24606-SpectralUnmixingFilter' into T24606-MergeSpectralUnmixing
Author
holzwart
Browse Repository
No Builds
No Audits
6830e7beeada adds significance level to so2 filter
Author
holzwart
Browse Repository
No Builds
No Audits
3125db623bed fixed build warnings/errors for gcc
Author
• kirchnth
Browse Repository
No Builds
No Audits
b6242df7aa21 adds a rounding correction to the sO2 filter and changes some GUI default values
Author
holzwart
Browse Repository
No Builds
No Audits
f6c09c1bed07 test for correct outputs.
Author
holzwart
Browse Repository
No Builds
No Audits
bf088f006a64 simplified check preconditions and checks now if pixel type is float correctly…
Author
holzwart
Browse Repository
No Builds
No Audits
af2b5f20afa6 add SO2 filter test for wrong inputs.
Author
holzwart
Browse Repository
No Builds
No Audits
99428241123e implemented many exception tests and added so far unhandeled exceptions to…
Author
holzwart
Browse Repository
No Builds
No Audits
787b2c8f246d fixed smaller bugs during testing.
Author
holzwart
Browse Repository
No Builds
No Audits
cf028da4045a pulled test on latest changes of plugin to be able to start adding test cases…
Author
holzwart
Browse Repository
No Builds
No Audits
78e9d46a8256 added qt waitcurser.
Author
holzwart
Browse Repository
No Builds
No Audits
59236f5c053a better error handling for llt and ldlt algorihtm.
Author
holzwart
Browse Repository
No Builds
No Audits
718d98e55075 refactoring of SO2 filter class.
Author
holzwart
Browse Repository
No Builds
No Audits
b0bc3a6f24ef add relative error settings to Plugin.
Author
holzwart
Browse Repository
No Builds
No Audits
c9f27410a404 added ToolTips into the GUI.
Author
holzwart
Browse Repository
No Builds
No Audits
cde60c59c65f fixed a implementation bug from refacotring the write buffer.
Author
holzwart
Browse Repository
No Builds
No Audits
422235a6cdf6 updated user manual.
Author
holzwart
Browse Repository
No Builds
No Audits
b2288bdd0242 fixed error handling for usage in the working thread.
Author
holzwart
Browse Repository
No Builds
No Audits
59e108fd655a reimplementation of the write buffer outside the loop over all pixels to save…
Author
holzwart
Browse Repository
No Builds
No Audits
f72d72a0058d refactoring of the SU plugin.
Author
holzwart
Browse Repository
No Builds
No Audits
335539addec9 workthread works now for SU Plugin. Class needs refactoring now.
Author
holzwart
Browse Repository
No Builds
No Audits
a3844ee50e2b reasonable error handling of the Plugin with a QMessageBox.
Author
holzwart
Browse Repository
No Builds
No Audits
976dad21007d finaly solved output problem and add relative error image to output.
Author
holzwart
Browse Repository
No Builds
No Audits
3b47b81304cb solved 'number of output problem'.
Author
holzwart
Browse Repository
No Builds
No Audits
6fbb8afb61cc fixed spacing.
Author
holzwart
Browse Repository
No Builds
No Audits
895b06931fd5 documentation and small changes of the SO2 filter.
Author
holzwart
Browse Repository
No Builds
No Audits
771b02179424 added verbose mode and added show/hide for GUI tables (weights, SO2Settings).
Author
holzwart
Browse Repository
No Builds
No Audits
a899c255254c docu and refactoring(more encapsulation) of the spectral unmixing Plugin.
Author
holzwart
Browse Repository
No Builds
No Audits
04a60cc3511e start with refactoring of Plugin.
Author
holzwart
Browse Repository
No Builds
No Audits
4638ebc18621 additional small changes for the vigra/linear filter and test.
Author
holzwart
Browse Repository
No Builds
No Audits
5a05a5fa3c7a documentation and small changes of the linear spectral unmixing filter as well…
Author
holzwart
Browse Repository
No Builds
No Audits
90e208ccb17c documentation and small changes of the spectral unmixing vigra filter.
Author
holzwart
Browse Repository
No Builds
No Audits
8a06a8a346e5 transfered weights method into vigra class.
Author
holzwart
Browse Repository
No Builds
No Audits
4d36b1f3c1e6 documentation and small changes of the spectral unmixing filter base.
Author
holzwart
Browse Repository
No Builds
No Audits
d5bb1c7779ec minor changes.
Author
holzwart
Browse Repository
No Builds
No Audits
d5428e5a43d9 add float-double cast to vigra class.
Author
holzwart
Browse Repository
No Builds
No Audits
e49298735935 GetFilterInstance Method + renew ouput counter.
Author
holzwart
Browse Repository
No Builds
No Audits
86f17959c4b9 SO2 test works now.
Author
holzwart
Browse Repository
No Builds
No Audits
76c5159c8cda SO2 filter can deal with NAN now.
Author
holzwart
Browse Repository
No Builds
No Audits
32fba71b258d try to implement SO2 settings to test.
Author
holzwart
Browse Repository
No Builds
No Audits
d1bf9b785440 insert SO2 test.
Author
holzwart
Browse Repository
No Builds
No Audits
81dc92b4fb82 now Test allows to test all algorithms in one go.
Author
holzwart
Browse Repository
No Builds
No Audits
f2cfc29a216c minor changes.
Author
holzwart
Browse Repository
No Builds
No Audits
2cabe112ecc2 add Test for Vigra and Simplex class.
Author
holzwart
Browse Repository
No Builds
No Audits
e247fdbb10c2 finalized weighted LS and add write into Simplex file.
Author
holzwart
Browse Repository
No Builds
No Audits
df04799da50d extend sequencing to SO2 filter + add sequence counter.
Author
holzwart
Browse Repository
No Builds
No Audits
f51648aab0a7 add sequenctial image processing.
Author
holzwart
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

Modules/

PhotoacousticsLib/

files.cmake

include/

mitkPALinearSpectralUnmixingFilter.h

mitkPAPropertyCalculator.h

mitkPASpectralUnmixingFilterBase.h

mitkPASpectralUnmixingFilterLagrange.h

mitkPASpectralUnmixingFilterSimplex.h

mitkPASpectralUnmixingFilterVigra.h

mitkPASpectralUnmixingSO2.h

src/

SUFilter

mitkPALinearSpectralUnmixingFilter.cpp

mitkPASpectralUnmixingFilterBase.cpp

mitkPASpectralUnmixingFilterLagrange.cpp

mitkPASpectralUnmixingFilterSimplex.cpp

mitkPASpectralUnmixingFilterVigra.cpp

mitkPASpectralUnmixingSO2.cpp

Utils/

mitkPAPropertyCalculator.cpp

test/

files.cmake

mitkSpectralUnmixingTest.cpp

Plugins/

PluginList.cmake

org.mitk.gui.qt.photoacoustics.spectralunmixing

manifest_headers.cmake

SpectralUnmixingControls.ui

org_mitk_gui_qt_photoacoustics_spectralunmixing_Activator.cpp

org_mitk_gui_qt_photoacoustics_spectralunmixing_Activator.h

rMITKc28b29ac4a1f

View Options

Modules/PhotoacousticsLib/files.cmake

View Options

Modules/PhotoacousticsLib/include/mitkPALinearSpectralUnmixingFilter.h

View Options

Modules/PhotoacousticsLib/include/mitkPAPropertyCalculator.h

View Options

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterBase.h

View Options

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterLagrange.h

View Options

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterSimplex.h

View Options

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterVigra.h

View Options

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingSO2.h

View Options

Modules/PhotoacousticsLib/src/SUFilter/mitkPALinearSpectralUnmixingFilter.cpp

View Options

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingFilterBase.cpp

View Options

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingFilterLagrange.cpp

View Options

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingFilterSimplex.cpp

View Options

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingFilterVigra.cpp

View Options

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingSO2.cpp

View Options

Modules/PhotoacousticsLib/src/Utils/mitkPAPropertyCalculator.cpp

View Options

Modules/PhotoacousticsLib/test/files.cmake

View Options

Modules/PhotoacousticsLib/test/mitkSpectralUnmixingTest.cpp

View Options

Plugins/PluginList.cmake

View Options

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

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/GUI.PNG

View Options

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

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/cpp.PNG

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/header.PNG

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/icon.png

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/plugin.PNG

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/resources/spectralunmixing.svg

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/SpectralUnmixing.cpp

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/SpectralUnmixing.h

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/SpectralUnmixingControls.ui

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/org_mitk_gui_qt_photoacoustics_spectralunmixing_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/org_mitk_gui_qt_photoacoustics_spectralunmixing_Activator.h

Merge branch 'T24606-MergeSpectralUnmixing'c28b29ac4a1fActions

Description

Details

Event Timeline

Merged Changes

Changes (43)

rMITKc28b29ac4a1f

Modules/PhotoacousticsLib/files.cmake

Modules/PhotoacousticsLib/include/mitkPALinearSpectralUnmixingFilter.h

Modules/PhotoacousticsLib/include/mitkPAPropertyCalculator.h

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterBase.h

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterLagrange.h

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterSimplex.h

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterVigra.h

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingSO2.h

Modules/PhotoacousticsLib/src/SUFilter/mitkPALinearSpectralUnmixingFilter.cpp

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingFilterBase.cpp

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingFilterLagrange.cpp

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingFilterSimplex.cpp

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingFilterVigra.cpp

Modules/PhotoacousticsLib/src/SUFilter/mitkPASpectralUnmixingSO2.cpp

Modules/PhotoacousticsLib/src/Utils/mitkPAPropertyCalculator.cpp

Modules/PhotoacousticsLib/test/files.cmake

Modules/PhotoacousticsLib/test/mitkSpectralUnmixingTest.cpp

Plugins/PluginList.cmake

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

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/GUI.PNG

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

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/cpp.PNG

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/header.PNG

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/icon.png

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/documentation/UserManual/plugin.PNG

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

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

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

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

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/resources/spectralunmixing.svg

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/SpectralUnmixing.cpp

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/SpectralUnmixing.h

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/SpectralUnmixingControls.ui

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/org_mitk_gui_qt_photoacoustics_spectralunmixing_Activator.cpp

Plugins/org.mitk.gui.qt.photoacoustics.spectralunmixing/src/internal/org_mitk_gui_qt_photoacoustics_spectralunmixing_Activator.h

Merge branch 'T24606-MergeSpectralUnmixing'
c28b29ac4a1f
Actions