Merge branch 'T29356-Infibtion' into T29356-InfibtionToMaster
66d50f918b54
Actions

Description

Merge branch 'T29356-Infibtion' into T29356-InfibtionToMaster

Details

Provenance

neher	Authored on Nov 9 2022, 10:47 AM
neher	Pushed on Nov 9 2022, 1:11 PM

Parents

rMITKDIFF6075f50866a7: Merge branch 'T29323-FixWindows'
rMITKDIFF817f5c843f06: Bug in calcualting uncertainty samples fixed.

Branches

Tags

Event Timeline

neher committed rMITKDIFF66d50f918b54: Merge branch 'T29356-Infibtion' into T29356-InfibtionToMaster (authored by neher).Nov 9 2022, 10:47 AM

Merged Changes

817f5c843f06 Bug in calcualting uncertainty samples fixed.
Author
r948e
Browse Repository
No Builds
No Audits
a6651fe7bb42 Reset Classifier available
Author
r948e
Browse Repository
No Builds
No Audits
feb91be0104a Update QmitkInteractiveFiberDissectionView.cpp
Author
r948e
Browse Repository
No Builds
No Audits
bbb4486e0583 Update mitkStreamlineFeatureExtractor.cpp, QmitkInteractiveFiberDissectionView.
Author
r948e
Browse Repository
No Builds
No Audits
b0891f25d5bd Update mitkStreamlineFeatureExtractor.cpp, files.cmake, and 4 more files...
Author
r948e
Browse Repository
No Builds
No Audits
bc1a87cf3cf2 Update mitkStreamlineInteractorBrush.cpp, mitkStreamlineInteractorBrush.h, and…
Author
r948e
Browse Repository
No Builds
No Audits
f3e51c216f09 Update files.cmake.autosave
Author
r948e
Browse Repository
No Builds
No Audits
d4c73b2e2144 Update files.cmake
Author
r948e
Browse Repository
No Builds
No Audits
775b9a42e573 Update .gitignore, mitkStreamlineInteractor.cpp, and 2 more files...
Author
r948e
Browse Repository
No Builds
No Audits
2e2db28505ef Remove Certain negative data from Testdata
Author
r948e
Browse Repository
No Builds
No Audits
a50f5b22422d adding visualisatzion of most certain data
Author
r948e
Browse Repository
No Builds
No Audits
62174a30077d Bug fixed regarding Prototypes
Author
r948e
Browse Repository
No Builds
No Audits
91ea93a66d66 Experiments with fixed number of Prototypes
Author
r948e
Browse Repository
No Builds
No Audits
112c3be2fdf4 Shuffle, when Resampling a Streamline. Validation added
Author
r948e
Browse Repository
No Builds
No Audits
6e693281a462 Update mitkFiberBundle.cpp, mitkStreamlineInteractor.cpp, and 6 more files...
Author
r948e
Browse Repository
No Builds
No Audits
9f5a37fa60f9 Update mitkFiberBundle.cpp, mitkFiberBundle.h, and mitkStreamlineInteractor.cpp
Author
r948e
Browse Repository
No Builds
No Audits
71874f0be51d Update mitkFiberBundle.cpp, mitkFiberBundle.h, and 8 more files...
Author
r948e
Browse Repository
No Builds
No Audits
ebef68e2a72d SFF Prototype selection implemented
Author
r948e
Browse Repository
No Builds
No Audits
5abf02440225 FFT for in uncertainty range implemented
Author
r948e
Browse Repository
No Builds
No Audits
2cde7f104461 Update mitkStreamlineFeatureExtractor.cpp, mitkStreamlineFeatureExtractor.h…
Author
r948e
Browse Repository
No Builds
No Audits
74587a3d5e86 Interacotor: Unlabel data
Author
r948e
Browse Repository
No Builds
No Audits
6ad0c3eb8fe3 2D picking implemented
Author
r948e
Browse Repository
No Builds
No Audits
0d6ad15fa6ec Change number of Resampling points to 40
Author
r948e
Browse Repository
No Builds
No Audits
38a557e9d7d3 Classifier runs
Author
r948e
Browse Repository
No Builds
No Audits
ff51e0d66704 Random Forest implemented with uncertainty labeling...
Author
r948e
Browse Repository
No Builds
No Audits
723eae6bfd5d Creation of uncertainty labes done
Author
r948e
Browse Repository
No Builds
No Audits
6dbab87b62ab Features are now saved, which reduces computing time.
Author
r948e
Browse Repository
No Builds
No Audits
6f4ab316a2e3 Back up. Random Forest makes Prediction, but its bad
Author
r948e
Browse Repository
No Builds
No Audits
d4d3e379429c First iteration of cycle implemented. Prediction is done on both training and…
Author
r948e
Browse Repository
No Builds
No Audits
175522efd683 Ready for Prediction, but test array is to big. Need to change type op cv::Mat
Author
r948e
Browse Repository
No Builds
No Audits
35d9069c6e1c Init of calculation D_mdf which is now possible between (hardcoded) Prototypes…
Author
r948e
Browse Repository
No Builds
No Audits
c3120574450b Bug Fix
Author
r948e
Browse Repository
No Builds
No Audits
d4b60269bf5e Merge branch 'CreateModule' into InteractiveFiberDissection
Author
r948e
Browse Repository
No Builds
No Audits
dea51d7c95d5 Init of DataInteractor for StreamlineLabel and FeatureExtractor
Author
r948e
Browse Repository
No Builds
No Audits
7ee5918e19e0 Init of StreamlineInteractor
Author
r948e
Browse Repository
No Builds
No Audits
6e131d3efdd8 Changes in cmake
Author
r948e
Browse Repository
No Builds
No Audits
0bb2d2222186 First steps for new Module
Author
r948e
Browse Repository
No Builds
No Audits
bb4c7d79a112 Tidy up IFDview
Author
r948e
Browse Repository
No Builds
No Audits
f933f75770e3 Init of Interactive FiberDissection
Author
r948e
Browse Repository
No Builds
No Audits

Changes (34)

Path

Size

.gitignore

Modules/

DiffusionCore/

IODataStructures/

mitkStreamlineInteractor.cpp

mitkStreamlineInteractor.h

mitkStreamlineInteractorBrush.cpp

mitkStreamlineInteractorBrush.h

MachineLearning

mitkStreamlineFeatureExtractor.cpp

mitkStreamlineFeatureExtractor.h

files.cmake

resource

Interactions

Streamline3DConfig.xml

Streamline3DStates.xml

StreamlineBrush3DConfig.xml

StreamlineBrush3DStates.xml

ModuleList.cmake

Plugins/

org.mitk.gui.qt.diffusionimaging.fiberprocessing/

resources/

	QmitkInteractiveFiberDissection.qrc
	QmitkFiberprocessing.qrc

brush.png

eraze.png

highlighter.png

src/

internal/

Perspectives/

QmitkFiberProcessingPerspective.cpp

QmitkInteractiveFiberDissectionView.cpp

QmitkInteractiveFiberDissectionView.h

QmitkInteractiveFiberDissectionViewControls.ui

mitkPluginActivator.cpp

rMITKDIFF66d50f918b54

View Options

.gitignore

View Options

Modules/DiffusionCore/IODataStructures/mitkFiberBundle.cpp

View Options

Modules/DiffusionCore/IODataStructures/mitkFiberBundle.h

View Options

Modules/FiberDissection/CMakeLists.txt

View Options

Modules/FiberDissection/Interactor/mitkStreamlineInteractor.cpp

View Options

Modules/FiberDissection/Interactor/mitkStreamlineInteractor.h

View Options

Modules/FiberDissection/Interactor/mitkStreamlineInteractorBrush.cpp

View Options

Modules/FiberDissection/Interactor/mitkStreamlineInteractorBrush.h

View Options

Modules/FiberDissection/MachineLearning/mitkStreamlineFeatureExtractor.cpp

View Options

Modules/FiberDissection/MachineLearning/mitkStreamlineFeatureExtractor.h

View Options

Modules/FiberDissection/files.cmake

View Options

Modules/FiberDissection/resource/Interactions/Streamline3DConfig.xml

View Options

Modules/FiberDissection/resource/Interactions/Streamline3DStates.xml

View Options

Modules/FiberDissection/resource/Interactions/StreamlineBrush3DConfig.xml

View Options

Modules/FiberDissection/resource/Interactions/StreamlineBrush3DStates.xml

View Options

Modules/ModuleList.cmake

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt.user

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/files.cmake

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/plugin.xml

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/QmitkInteractiveFiberDissection.qrc

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/brush.png

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/eraze.png

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/highlighter.png

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/Perspectives/QmitkFiberProcessingPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionViewControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/mitkPluginActivator.cpp

Merge branch 'T29356-Infibtion' into T29356-InfibtionToMaster66d50f918b54Actions

Description

Details

Event Timeline

Merged Changes

Changes (34)

rMITKDIFF66d50f918b54

.gitignore

Modules/DiffusionCore/IODataStructures/mitkFiberBundle.cpp

Modules/DiffusionCore/IODataStructures/mitkFiberBundle.h

Modules/FiberDissection/CMakeLists.txt

Modules/FiberDissection/Interactor/mitkStreamlineInteractor.cpp

Modules/FiberDissection/Interactor/mitkStreamlineInteractor.h

Modules/FiberDissection/Interactor/mitkStreamlineInteractorBrush.cpp

Modules/FiberDissection/Interactor/mitkStreamlineInteractorBrush.h

Modules/FiberDissection/MachineLearning/mitkStreamlineFeatureExtractor.cpp

Modules/FiberDissection/MachineLearning/mitkStreamlineFeatureExtractor.h

Modules/FiberDissection/files.cmake

Modules/FiberDissection/resource/Interactions/Streamline3DConfig.xml

Modules/FiberDissection/resource/Interactions/Streamline3DStates.xml

Modules/FiberDissection/resource/Interactions/StreamlineBrush3DConfig.xml

Modules/FiberDissection/resource/Interactions/StreamlineBrush3DStates.xml

Modules/ModuleList.cmake

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt.user

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/files.cmake

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/plugin.xml

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/QmitkInteractiveFiberDissection.qrc

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/brush.png

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/eraze.png

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/highlighter.png

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/Perspectives/QmitkFiberProcessingPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionViewControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/mitkPluginActivator.cpp

Merge branch 'T29356-Infibtion' into T29356-InfibtionToMaster
66d50f918b54
Actions