Merge branch 'T23431-MemoryConsumptionBug' into T24512-SetupPASimulationPipeline
2c94ff7afd1b
Actions

Description

Merge branch 'T23431-MemoryConsumptionBug' into T24512-SetupPASimulationPipeline

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

Details

Provenance

• groehl	Authored on Apr 4 2018, 4:15 PM
• groehl	Pushed on Apr 4 2018, 4:16 PM

Parents

rMITK95c8d57e15f7: add test that reproduces bug. Some general changes to the phantom tissue…
rMITK0a624b7bb266: fix mitkIOUtil call

Branches

Unknown

Tags

Unknown

Event Timeline

• groehl committed rMITK2c94ff7afd1b: Merge branch 'T23431-MemoryConsumptionBug' into T24512-SetupPASimulationPipeline (authored by • groehl).Apr 4 2018, 4:15 PM

Merged Changes

95c8d57e15f7 add test that reproduces bug. Some general changes to the phantom tissue…
Author
• groehl
Browse Repository
No Builds
No Audits

Changes (8)

Path

Size

Modules/

PhotoacousticsLib/

MitkPAPhantomGenerator/

PAPhantomGenerator.cpp

include/

mitkPAVolume.h

src/

Domain/

Volume/

mitkPAInSilicoTissueVolume.cpp

mitkPAVolume.cpp

Generator/

mitkPAPhantomTissueGenerator.cpp

test/

files.cmake

mitkPhotoacousticImageSavingTest.cpp

Plugins/

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

src/

internal/

PASimulator.cpp

rMITK2c94ff7afd1b

View Options

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/PAPhantomGenerator.cpp

View Options

Modules/PhotoacousticsLib/include/mitkPAVolume.h

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/test/files.cmake

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSavingTest.cpp

View Options

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

Merge branch 'T23431-MemoryConsumptionBug' into T24512-SetupPASimulationPipeline2c94ff7afd1bActions

Description

Details

Event Timeline

Merged Changes

Changes (8)

rMITK2c94ff7afd1b

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/PAPhantomGenerator.cpp

Modules/PhotoacousticsLib/include/mitkPAVolume.h

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

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

Modules/PhotoacousticsLib/src/Generator/mitkPAPhantomTissueGenerator.cpp

Modules/PhotoacousticsLib/test/files.cmake

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSavingTest.cpp

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

Merge branch 'T23431-MemoryConsumptionBug' into T24512-SetupPASimulationPipeline
2c94ff7afd1b
Actions