Merge branch 'T19600-ActiveLearning' into T19600-ActiveLearning-new-master
90bb124781c4
Actions

Description

Merge branch 'T19600-ActiveLearning' into T19600-ActiveLearning-new-master

Details

Provenance

• petersej	Authored on Mar 29 2017, 7:12 PM
• petersej	Pushed on Mar 30 2017, 11:04 AM

Parents

rMITK82001cc598a3: Merge branch 'T22653-FiberfoxVolumeDisplay'
rMITK3db9f26c1153: Merge branch 'T19600-ActiveLearning' of https://phabricator.mitk.

Branches

Unknown

Tags

Unknown

Event Timeline

• petersej committed rMITK90bb124781c4: Merge branch 'T19600-ActiveLearning' into T19600-ActiveLearning-new-master (authored by • petersej).Mar 29 2017, 7:12 PM

Merged Changes

3db9f26c1153 Merge branch 'T19600-ActiveLearning' of https://phabricator.mitk.
Author
• petersej
Browse Repository
No Builds
No Audits
f23fe824de1c Start implementing presets
Author
• petersej
Browse Repository
No Builds
No Audits
6a97e976ab42 Change region opacity and pixel type
Author
• petersej
Browse Repository
No Builds
No Audits
80a77518cfdb Add opening filter, needs testing
Author
• petersej
Browse Repository
No Builds
No Audits
8331a8eaefcb Multiply sigma by mean spacing
Author
• petersej
Browse Repository
No Builds
No Audits
2f35f35c0de2 Set structure tensor outer scale to 1.3 * inner
Author
• petersej
Browse Repository
No Builds
No Audits
867e932cc40f Features all work
Author
• petersej
Browse Repository
No Builds
No Audits
ff59baccb8e2 Backup before fixing structure tensor
Author
• petersej
Browse Repository
No Builds
No Audits
cae85debbf3b Region not working
Author
• petersej
Browse Repository
No Builds
No Audits
d2a433d68d40 Size slider, uncertainty method
Author
• petersej
Browse Repository
No Builds
No Audits
d3f3b66818ce Check geometry before extracting slice again
Author
• petersej
Browse Repository
No Builds
No Audits
56e416b65b35 Fix brush size
Author
• petersej
Browse Repository
No Builds
No Audits
58e4dd0db341 Interpolation works
Author
• petersej
Browse Repository
No Builds
No Audits
067a4da9c63c Painting works, need refactoring
Author
• petersej
Browse Repository
No Builds
No Audits
32d3808f1321 Interactor painting should work
Author
• petersej
Browse Repository
No Builds
No Audits
4b60cf241b27 Implement new interpolation method
Author
• petersej
Browse Repository
No Builds
No Audits
1f3e1b03640c Added structure tensor filter from ITK
Author
• petersej
Browse Repository
No Builds
No Audits
71e3da7de4a7 Implement export
Author
• petersej
Browse Repository
No Builds
No Audits
a157c2b795db MILESTONE: Working version
Author
• petersej
Browse Repository
No Builds
No Audits
40c752788a62 Return prediction as image vector
Author
• petersej
Browse Repository
No Builds
No Audits
37fbe462f15a Rendering of vector image crashes
Author
• petersej
Browse Repository
No Builds
No Audits
42847ddb6d07 Threaded prediction works
Author
• petersej
Browse Repository
No Builds
No Audits
84c205d044cf Start moving prediction to separate thread
Author
• petersej
Browse Repository
No Builds
No Audits
8e07ff50ce43 Prediction works
Author
• petersej
Browse Repository
No Builds
No Audits
712a0a79b7d3 Moved away from LabelSetImage
Author
• petersej
Browse Repository
No Builds
No Audits
620e5f983d7e Save commit
Author
• petersej
Browse Repository
No Builds
No Audits
88379edc4079 Prediction works, rendering does not
Author
• petersej
Browse Repository
No Builds
No Audits
07cda2ffdc51 Moved work from bug-19600-Active-Learning-Module
Author
• petersej
Browse Repository
No Builds
No Audits

Changes (56)

Path

Size

Packages

Modules/

Classification/

mitkAbstractClassifierPredictionFilter.h

mitkActiveLearningInteractor.h

mitkActiveLearningSuggestRegionFilter.h

mitkPredictionConfidenceFilter.h

mitkPredictionEntropyFilter.h

mitkPredictionMarginFilter.h

mitkPredictionUncertaintyFilter.h

mitkSelectHighestUncertaintyRegionFilter.h

mitkAbstractClassifierPredictionFilter.cpp

mitkActiveLearningInteractor.cpp

mitkActiveLearningSuggestRegionFilter.cpp

mitkPredictionConfidenceFilter.cpp

mitkPredictionEntropyFilter.cpp

mitkPredictionMarginFilter.cpp

mitkPredictionUncertaintyFilter.cpp

mitkSelectHighestUncertaintyRegionFilter.cpp

test

files.cmake

mitkActiveLearningTest.cpp

	CLActiveLearning/	test/
	CLLibSVM/	test/

CMakeLists.txt

CLMiniApps/

CLActiveLearningApp.cpp

CLUtilities/

files.cmake

include/

itkStructureTensorImageFilter.h

src/

Features/

itkStructureTensorImageFilter.hxx

CLVigraRandomForest/

src/

Algorithm/

itkStructureTensorEigenvalueImageFilter.cpp

CMakeLists.txt

Multilabel/

mitkLabelSet.cpp

O1: MITK Reviewer Group I

mitkLabelSet.h

O1: MITK Reviewer Group I

mitkLabelSetImage.cpp

O1: MITK Reviewer Group I

mitkLabelSetImage.h

O1: MITK Reviewer Group I

Plugins/

PluginList.cmake

org.mitk.gui.qt.activelearning

CMakeLists.txt

files.cmake

manifest_headers.cmake

QmitkActiveLearning.cpp

QmitkActiveLearning.h

QmitkActiveLearningControls.ui

org_mitk_gui_qt_activelearning_Activator.cpp

org_mitk_gui_qt_activelearning_Activator.h

	Plugins/	org.mitk.gui.qt.activelearning/	resources/
	Applications/	PluginGenerator/	PluginTemplate/	documentation/	UserManual/

icon.xpm

rMITK90bb124781c4

View Options

Modules/Classification/CLActiveLearning/CMakeLists.txt

View Options

Modules/Classification/CLActiveLearning/files.cmake

View Options

Modules/Classification/CLActiveLearning/include/mitkAbstractClassifierPredictionFilter.h

View Options

Modules/Classification/CLActiveLearning/include/mitkActiveLearningInteractor.h

View Options

Modules/Classification/CLActiveLearning/include/mitkActiveLearningSuggestRegionFilter.h

View Options

Modules/Classification/CLActiveLearning/include/mitkPredictionConfidenceFilter.h

View Options

Modules/Classification/CLActiveLearning/include/mitkPredictionEntropyFilter.h

View Options

Modules/Classification/CLActiveLearning/include/mitkPredictionMarginFilter.h

View Options

Modules/Classification/CLActiveLearning/include/mitkPredictionUncertaintyFilter.h

View Options

Modules/Classification/CLActiveLearning/include/mitkSelectHighestUncertaintyRegionFilter.h

View Options

Modules/Classification/CLActiveLearning/resource/Interactions/Paint.xml

View Options

Modules/Classification/CLActiveLearning/resource/Interactions/PaintConfig.xml

View Options

Modules/Classification/CLActiveLearning/src/mitkAbstractClassifierPredictionFilter.cpp

View Options

Modules/Classification/CLActiveLearning/src/mitkActiveLearningInteractor.cpp

View Options

Modules/Classification/CLActiveLearning/src/mitkActiveLearningSuggestRegionFilter.cpp

View Options

Modules/Classification/CLActiveLearning/src/mitkPredictionConfidenceFilter.cpp

View Options

Modules/Classification/CLActiveLearning/src/mitkPredictionEntropyFilter.cpp

View Options

Modules/Classification/CLActiveLearning/src/mitkPredictionMarginFilter.cpp

View Options

Modules/Classification/CLActiveLearning/src/mitkPredictionUncertaintyFilter.cpp

View Options

Modules/Classification/CLActiveLearning/src/mitkSelectHighestUncertaintyRegionFilter.cpp

View Options

Modules/Classification/CLActiveLearning/test/CMakeLists.txt

View Options

Modules/Classification/CLActiveLearning/test/files.cmake

View Options

Modules/Classification/CLActiveLearning/test/mitkActiveLearningTest.cpp

View Options

Modules/Classification/CLMiniApps/CLActiveLearningApp.cpp

View Options

Modules/Classification/CLUtilities/files.cmake

View Options

Modules/Classification/CLUtilities/include/itkStructureTensorImageFilter.h

View Options

Modules/Classification/CLUtilities/src/Features/itkStructureTensorImageFilter.hxx

View Options

Modules/Classification/CLVigraRandomForest/src/Algorithm/itkStructureTensorEigenvalueImageFilter.cpp

View Options

Modules/Classification/CMakeLists.txt

View Options

Modules/Multilabel/mitkLabelSet.cpp

View Options

Modules/Multilabel/mitkLabelSet.h

View Options

Modules/Multilabel/mitkLabelSetImage.cpp

View Options

Modules/Multilabel/mitkLabelSetImage.h

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.qt.activelearning/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.activelearning/files.cmake

View Options

Plugins/org.mitk.gui.qt.activelearning/manifest_headers.cmake

View Options

Plugins/org.mitk.gui.qt.activelearning/plugin.xml

View Options

Plugins/org.mitk.gui.qt.activelearning/resources/erase_icon_100.png

View Options

Plugins/org.mitk.gui.qt.activelearning/resources/icon.xpm

View Options

Plugins/org.mitk.gui.qt.activelearning/resources/paint_icon_200.png

View Options

Plugins/org.mitk.gui.qt.activelearning/src/internal/QmitkActiveLearning.cpp

View Options

Plugins/org.mitk.gui.qt.activelearning/src/internal/QmitkActiveLearning.h

View Options

Plugins/org.mitk.gui.qt.activelearning/src/internal/QmitkActiveLearningControls.ui

View Options

Plugins/org.mitk.gui.qt.activelearning/src/internal/org_mitk_gui_qt_activelearning_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.activelearning/src/internal/org_mitk_gui_qt_activelearning_Activator.h

Merge branch 'T19600-ActiveLearning' into T19600-ActiveLearning-new-master90bb124781c4Actions

Description

Details

Event Timeline

Merged Changes

Changes (56)

rMITK90bb124781c4

Modules/Classification/CLActiveLearning/CMakeLists.txt

Modules/Classification/CLActiveLearning/files.cmake

Modules/Classification/CLActiveLearning/include/mitkAbstractClassifierPredictionFilter.h

Modules/Classification/CLActiveLearning/include/mitkActiveLearningInteractor.h

Modules/Classification/CLActiveLearning/include/mitkActiveLearningSuggestRegionFilter.h

Modules/Classification/CLActiveLearning/include/mitkPredictionConfidenceFilter.h

Modules/Classification/CLActiveLearning/include/mitkPredictionEntropyFilter.h

Modules/Classification/CLActiveLearning/include/mitkPredictionMarginFilter.h

Modules/Classification/CLActiveLearning/include/mitkPredictionUncertaintyFilter.h

Modules/Classification/CLActiveLearning/include/mitkSelectHighestUncertaintyRegionFilter.h

Modules/Classification/CLActiveLearning/resource/Interactions/Paint.xml

Modules/Classification/CLActiveLearning/resource/Interactions/PaintConfig.xml

Modules/Classification/CLActiveLearning/src/mitkAbstractClassifierPredictionFilter.cpp

Modules/Classification/CLActiveLearning/src/mitkActiveLearningInteractor.cpp

Modules/Classification/CLActiveLearning/src/mitkActiveLearningSuggestRegionFilter.cpp

Modules/Classification/CLActiveLearning/src/mitkPredictionConfidenceFilter.cpp

Modules/Classification/CLActiveLearning/src/mitkPredictionEntropyFilter.cpp

Modules/Classification/CLActiveLearning/src/mitkPredictionMarginFilter.cpp

Modules/Classification/CLActiveLearning/src/mitkPredictionUncertaintyFilter.cpp

Modules/Classification/CLActiveLearning/src/mitkSelectHighestUncertaintyRegionFilter.cpp

Modules/Classification/CLActiveLearning/test/CMakeLists.txt

Modules/Classification/CLActiveLearning/test/files.cmake

Modules/Classification/CLActiveLearning/test/mitkActiveLearningTest.cpp

Modules/Classification/CLMiniApps/CLActiveLearningApp.cpp

Modules/Classification/CLUtilities/files.cmake

Modules/Classification/CLUtilities/include/itkStructureTensorImageFilter.h

Modules/Classification/CLUtilities/src/Features/itkStructureTensorImageFilter.hxx

Modules/Classification/CLVigraRandomForest/src/Algorithm/itkStructureTensorEigenvalueImageFilter.cpp

Modules/Classification/CMakeLists.txt

Modules/Multilabel/mitkLabelSet.cpp

Modules/Multilabel/mitkLabelSet.h

Modules/Multilabel/mitkLabelSetImage.cpp

Modules/Multilabel/mitkLabelSetImage.h

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.activelearning/CMakeLists.txt

Plugins/org.mitk.gui.qt.activelearning/files.cmake

Plugins/org.mitk.gui.qt.activelearning/manifest_headers.cmake

Plugins/org.mitk.gui.qt.activelearning/plugin.xml

Plugins/org.mitk.gui.qt.activelearning/resources/erase_icon_100.png

Plugins/org.mitk.gui.qt.activelearning/resources/icon.xpm

Plugins/org.mitk.gui.qt.activelearning/resources/paint_icon_200.png

Plugins/org.mitk.gui.qt.activelearning/src/internal/QmitkActiveLearning.cpp

Plugins/org.mitk.gui.qt.activelearning/src/internal/QmitkActiveLearning.h

Plugins/org.mitk.gui.qt.activelearning/src/internal/QmitkActiveLearningControls.ui

Plugins/org.mitk.gui.qt.activelearning/src/internal/org_mitk_gui_qt_activelearning_Activator.cpp

Plugins/org.mitk.gui.qt.activelearning/src/internal/org_mitk_gui_qt_activelearning_Activator.h

Merge branch 'T19600-ActiveLearning' into T19600-ActiveLearning-new-master
90bb124781c4
Actions