Merge remote-tracking branch 'origin/T24512-SetupPASimulationPipeline' into…
375b34155f2f
Actions

Description

Merge remote-tracking branch 'origin/T24512-SetupPASimulationPipeline' into T24638-RefactoringOfPhotoacoustics

Conflicts:
Modules/PhotoacousticsAlgorithms/CMakeLists.txt

Details

Provenance

• groehl	Authored on Apr 18 2018, 3:33 PM
• groehl	Pushed on Apr 18 2018, 3:43 PM

Parents

rMITKe133ce70b3b7: Merge remote-tracking branch 'origin/T24638-RefactorPhotoacoutsicAlgorithms'…
rMITKf99a3a285412: resolve parameter clash and make verbose option more verbose

Branches

Unknown

Tags

Unknown

Event Timeline

• groehl committed rMITK375b34155f2f: Merge remote-tracking branch 'origin/T24512-SetupPASimulationPipeline' into… (authored by • groehl).Apr 18 2018, 3:33 PM

Merged Changes

f99a3a285412 resolve parameter clash and make verbose option more verbose
Author
• groehl
Browse Repository
No Builds
No Audits
746990051b5c added possibility to simulate empty volumes with phantom generator
Author
• groehl
Browse Repository
No Builds
No Audits
f6bba9e1cea9 implemented rudimentary version of a beamforming command line tool.
Author
• groehl
Browse Repository
No Builds
No Audits
949090c3e5bb create simple stump for a beamforming commandline tool for the…
Author
• groehl
Browse Repository
No Builds
No Audits
404bd6367cd2 - add a test to the PhotoacousticsLib test files - perform minor changes to the…
Author
• groehl
Browse Repository
No Builds
No Audits
56a995470ab4 fix mitkmcxyz bug add option to force y directionality of vessels
Author
• groehl
Browse Repository
No Builds
No Audits
2c94ff7afd1b Merge branch 'T23431-MemoryConsumptionBug' into T24512-SetupPASimulationPipeline
Author
• groehl
Browse Repository
No Builds
No Audits
95c8d57e15f7 add test that reproduces bug. Some general changes to the phantom tissue…
Author
• groehl
Browse Repository
No Builds
No Audits
0a624b7bb266 fix mitkIOUtil call
Author
• groehl
Browse Repository
No Builds
No Audits
23f9e9b60ff3 Merge branch 'T23431-SimulatePartialVolumeEffects' into T24512…
Author
• groehl
Browse Repository
No Builds
No Audits
372f15a6b0eb create a script to simulate the in vitro phantom
Author
• groehl
Browse Repository
No Builds
No Audits
da1a30bbb208 add additional verbose IO debug output
Author
• groehl
Browse Repository
No Builds
No Audits
f04993a153de tissue batch generator for ce-qpai rebuttal
Author
• groehl
Browse Repository
No Builds
No Audits
fe57ed978587 add multi and singlevessel parameters
Author
• groehl
Browse Repository
No Builds
No Audits
f6555f7248ab implemented batch generation of tissues and integrated simulation
Author
• groehl
Browse Repository
No Builds
No Audits
7d951ccb25e7 fix a bug, where some vessels would not be simulated due to new out of bounds…
Author
• groehl
Browse Repository
No Builds
No Audits
97be7d190ce5 add empty TissueBatchGenerator.
Author
• groehl
Browse Repository
No Builds
No Audits
945aca009e7a Vessel generator will now generate the same vessels independent of the voxel…
Author
• groehl
Browse Repository
No Builds
No Audits
9c92b40fd0a8 Merge branch 'T23431-SimulatePartialVolumeEffects' of ssh://phabricator.mitk.
Author
• groehl
Browse Repository
No Builds
No Audits
2cba5f44e22e make vessel generation independent of resolution - add explicit spacing…
Author
• groehl
Browse Repository
No Builds
No Audits
bff1cc6c72df implemented a gaussian resampling from 10x the original resolution
Author
• groehl
Browse Repository
No Builds
No Audits
89c489d3075d first construction of how to implement a rescaling version of the partial…
Author
• groehl
Browse Repository
No Builds
No Audits
b9b607ec93fe it kinda works, but some handcrafting had to be done. - not scientifically…
Author
• groehl
Browse Repository
No Builds
No Audits
f950e3b7f823 first attempt. I know this is a bad description
Author
• groehl
Browse Repository
No Builds
No Audits
9e5808590abd UI changes following the vessel refactoring - remove gaussian blur from plugin…
Author
• groehl
Browse Repository
No Builds
No Audits
113a1fb3b1c6 include first attempt at partial volume effect around spheres - lower min…
Author
• groehl
Browse Repository
No Builds
No Audits
683660012efd fix crash on startup - nullptr dereference in std::string constructor
Author
• groehl
Browse Repository
No Builds
No Audits

Changes (54)

Path

Size

Modules/

PhotoacousticsAlgorithms/

CMakeLists.txt

MitkPABeamformingTool

CMakeLists.txt

PABeamformingTool.cpp

files.cmake

PhotoacousticsLib/

CMakeLists.txt

MitkMCxyz/

MitkMCxyz.cpp

MitkPAPhantomGenerator

CMakeLists.txt

PAPhantomGenerator.cpp

files.cmake

MitkTissueBatchGenerator

CMakeLists.txt

TissueBatchGenerator.cpp

files.cmake

include/

mitkPAInSilicoTissueVolume.h

mitkPAPhantomTissueGenerator.h

mitkPATissueGeneratorParameters.h

mitkPAVector.h

mitkPAVessel.h

mitkPAVesselDrawer.h

mitkPAVesselProperties.h

mitkPAVolume.h

mitkPAVolumeManipulator.h

src/

Domain/

Vessel/

mitkPAVessel.cpp

mitkPAVesselMeanderStrategy.cpp

mitkPAVesselProperties.cpp

Volume/

mitkPAInSilicoTissueVolume.cpp

mitkPAVolume.cpp

Generator/

mitkPAPhantomTissueGenerator.cpp

mitkPASlicedVolumeGenerator.cpp

mitkPATissueGenerator.cpp

IO/

mitkPAIOUtil.cpp

Utils/

mitkPATissueGeneratorParameters.cpp

mitkPAVector.cpp

mitkPAVesselDrawer.cpp

mitkPAVolumeManipulator.cpp

test/

files.cmake

mitkPhotoacoustic3dVolumeTest.cpp

mitkPhotoacousticComposedVolumeTest.cpp

mitkPhotoacousticIOTest.cpp

mitkPhotoacousticImageSaving.cpp

mitkPhotoacousticImageSavingTest.cpp

mitkPhotoacousticNoiseGeneratorTest.cpp

mitkPhotoacousticTissueGeneratorTest.cpp

mitkPhotoacousticVesselTest.cpp

mitkPhotoacousticVesselTreeTest.cpp

mitkPhotoacousticVolumeTest.cpp

mitkSimulationBatchGeneratorTest.cpp

mitkSlicedVolumeGeneratorTest.cpp

Plugins/

org.mitk.gui.qt.photoacoustics.simulation/

src/

internal/

PASimulator.cpp

PASimulator.h

PASimulatorControls.ui

rMITK375b34155f2f

View Options

Modules/PhotoacousticsAlgorithms/CMakeLists.txt

View Options

Modules/PhotoacousticsAlgorithms/MitkPABeamformingTool/CMakeLists.txt

View Options

Modules/PhotoacousticsAlgorithms/MitkPABeamformingTool/PABeamformingTool.cpp

View Options

Modules/PhotoacousticsAlgorithms/MitkPABeamformingTool/files.cmake

View Options

Modules/PhotoacousticsLib/CMakeLists.txt

View Options

Modules/PhotoacousticsLib/MitkMCxyz/MitkMCxyz.cpp

View Options

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/CMakeLists.txt

View Options

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/PAPhantomGenerator.cpp

View Options

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/files.cmake

View Options

Modules/PhotoacousticsLib/MitkTissueBatchGenerator/CMakeLists.txt

View Options

Modules/PhotoacousticsLib/MitkTissueBatchGenerator/TissueBatchGenerator.cpp

View Options

Modules/PhotoacousticsLib/MitkTissueBatchGenerator/files.cmake

View Options

Modules/PhotoacousticsLib/files.cmake

View Options

Modules/PhotoacousticsLib/include/mitkPAInSilicoTissueVolume.h

View Options

Modules/PhotoacousticsLib/include/mitkPAPhantomTissueGenerator.h

View Options

Modules/PhotoacousticsLib/include/mitkPATissueGeneratorParameters.h

View Options

Modules/PhotoacousticsLib/include/mitkPAVector.h

View Options

Modules/PhotoacousticsLib/include/mitkPAVessel.h

View Options

Modules/PhotoacousticsLib/include/mitkPAVesselDrawer.h

View Options

Modules/PhotoacousticsLib/include/mitkPAVesselProperties.h

View Options

Modules/PhotoacousticsLib/include/mitkPAVolume.h

View Options

Modules/PhotoacousticsLib/include/mitkPAVolumeManipulator.h

View Options

Modules/PhotoacousticsLib/src/Domain/Vessel/mitkPAVessel.cpp

View Options

Modules/PhotoacousticsLib/src/Domain/Vessel/mitkPAVesselMeanderStrategy.cpp

View Options

Modules/PhotoacousticsLib/src/Domain/Vessel/mitkPAVesselProperties.cpp

View Options

Modules/PhotoacousticsLib/src/Domain/Volume/mitkPAInSilicoTissueVolume.cpp

View Options

Modules/PhotoacousticsLib/src/Domain/Volume/mitkPAVolume.cpp

View Options

Modules/PhotoacousticsLib/src/Generator/mitkPAPhantomTissueGenerator.cpp

View Options

Modules/PhotoacousticsLib/src/Generator/mitkPASlicedVolumeGenerator.cpp

View Options

Modules/PhotoacousticsLib/src/Generator/mitkPATissueGenerator.cpp

View Options

Modules/PhotoacousticsLib/src/IO/mitkPAIOUtil.cpp

View Options

Modules/PhotoacousticsLib/src/Utils/mitkPATissueGeneratorParameters.cpp

View Options

Modules/PhotoacousticsLib/src/Utils/mitkPAVector.cpp

View Options

Modules/PhotoacousticsLib/src/Utils/mitkPAVesselDrawer.cpp

View Options

Modules/PhotoacousticsLib/src/Utils/mitkPAVolumeManipulator.cpp

View Options

Modules/PhotoacousticsLib/test/files.cmake

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacoustic3dVolumeTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticComposedVolumeTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticIOTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSaving.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSavingTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticNoiseGeneratorTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticTissueGeneratorTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticVesselTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticVesselTreeTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticVolumeTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkSimulationBatchGeneratorTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkSlicedVolumeGeneratorTest.cpp

View Options

Plugins/org.mitk.gui.qt.photoacoustics.simulation/src/internal/PASimulator.cpp

View Options

Plugins/org.mitk.gui.qt.photoacoustics.simulation/src/internal/PASimulator.h

View Options

Plugins/org.mitk.gui.qt.photoacoustics.simulation/src/internal/PASimulatorControls.ui

Merge remote-tracking branch 'origin/T24512-SetupPASimulationPipeline' into…375b34155f2fActions

Description

Details

Event Timeline

Merged Changes

Changes (54)

rMITK375b34155f2f

Modules/PhotoacousticsAlgorithms/CMakeLists.txt

Modules/PhotoacousticsAlgorithms/MitkPABeamformingTool/CMakeLists.txt

Modules/PhotoacousticsAlgorithms/MitkPABeamformingTool/PABeamformingTool.cpp

Modules/PhotoacousticsAlgorithms/MitkPABeamformingTool/files.cmake

Modules/PhotoacousticsLib/CMakeLists.txt

Modules/PhotoacousticsLib/MitkMCxyz/MitkMCxyz.cpp

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/CMakeLists.txt

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/PAPhantomGenerator.cpp

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/files.cmake

Modules/PhotoacousticsLib/MitkTissueBatchGenerator/CMakeLists.txt

Modules/PhotoacousticsLib/MitkTissueBatchGenerator/TissueBatchGenerator.cpp

Modules/PhotoacousticsLib/MitkTissueBatchGenerator/files.cmake

Modules/PhotoacousticsLib/files.cmake

Modules/PhotoacousticsLib/include/mitkPAInSilicoTissueVolume.h

Modules/PhotoacousticsLib/include/mitkPAPhantomTissueGenerator.h

Modules/PhotoacousticsLib/include/mitkPATissueGeneratorParameters.h

Modules/PhotoacousticsLib/include/mitkPAVector.h

Modules/PhotoacousticsLib/include/mitkPAVessel.h

Modules/PhotoacousticsLib/include/mitkPAVesselDrawer.h

Modules/PhotoacousticsLib/include/mitkPAVesselProperties.h

Modules/PhotoacousticsLib/include/mitkPAVolume.h

Modules/PhotoacousticsLib/include/mitkPAVolumeManipulator.h

Modules/PhotoacousticsLib/src/Domain/Vessel/mitkPAVessel.cpp

Modules/PhotoacousticsLib/src/Domain/Vessel/mitkPAVesselMeanderStrategy.cpp

Modules/PhotoacousticsLib/src/Domain/Vessel/mitkPAVesselProperties.cpp

Modules/PhotoacousticsLib/src/Domain/Volume/mitkPAInSilicoTissueVolume.cpp

Modules/PhotoacousticsLib/src/Domain/Volume/mitkPAVolume.cpp

Modules/PhotoacousticsLib/src/Generator/mitkPAPhantomTissueGenerator.cpp

Modules/PhotoacousticsLib/src/Generator/mitkPASlicedVolumeGenerator.cpp

Modules/PhotoacousticsLib/src/Generator/mitkPATissueGenerator.cpp

Modules/PhotoacousticsLib/src/IO/mitkPAIOUtil.cpp

Modules/PhotoacousticsLib/src/Utils/mitkPATissueGeneratorParameters.cpp

Modules/PhotoacousticsLib/src/Utils/mitkPAVector.cpp

Modules/PhotoacousticsLib/src/Utils/mitkPAVesselDrawer.cpp

Modules/PhotoacousticsLib/src/Utils/mitkPAVolumeManipulator.cpp

Modules/PhotoacousticsLib/test/files.cmake

Modules/PhotoacousticsLib/test/mitkPhotoacoustic3dVolumeTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticComposedVolumeTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticIOTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSaving.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSavingTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticNoiseGeneratorTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticTissueGeneratorTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticVesselTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticVesselTreeTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticVolumeTest.cpp

Modules/PhotoacousticsLib/test/mitkSimulationBatchGeneratorTest.cpp

Modules/PhotoacousticsLib/test/mitkSlicedVolumeGeneratorTest.cpp

Plugins/org.mitk.gui.qt.photoacoustics.simulation/src/internal/PASimulator.cpp

Plugins/org.mitk.gui.qt.photoacoustics.simulation/src/internal/PASimulator.h

Plugins/org.mitk.gui.qt.photoacoustics.simulation/src/internal/PASimulatorControls.ui

Merge remote-tracking branch 'origin/T24512-SetupPASimulationPipeline' into…
375b34155f2f
Actions