Merge branch 'T19938-ProbeDesignXmlSchema' into bug-19608…
96912729cff3
Actions

Description

Merge branch 'T19938-ProbeDesignXmlSchema' into bug-19608-PhotoacousticSimulations

Conflicts:
Modules/PhotoacousticSimulation/files.cmake
Also moved some cpp files into src directory

Details

Provenance

• groehl	Authored on Sep 14 2016, 12:27 PM
• groehl	Pushed on Sep 14 2016, 12:25 PM

Parents

rMITK0bd8f86c5bd3: Adjust sigma to be the FWHM value.
rMITK0c5020451974: fix include guard renaming carelessness

Branches

Unknown

Tags

Unknown

Event Timeline

• groehl committed rMITK96912729cff3: Merge branch 'T19938-ProbeDesignXmlSchema' into bug-19608… (authored by • groehl).Sep 14 2016, 12:27 PM

Merged Changes

0bd8f86c5bd3 Adjust sigma to be the FWHM value.
Author
• groehl
Browse Repository
No Builds
No Audits
13c491cd2b6e remove mitk info macro.
Author
• groehl
Browse Repository
No Builds
No Audits
7785e1d9af8e getter and setter for variables
Author
• groehl
Browse Repository
No Builds
No Audits
300c9e2287bd replace MITK_INFO macro for this class
Author
• groehl
Browse Repository
No Builds
No Audits
b98082127983 Add test for simple creation of photons.
Author
• groehl
Browse Repository
No Builds
No Audits
73c58d5b9092 Tests are running now. Test implementation still due.
Author
• groehl
Browse Repository
No Builds
No Audits
4b6da71ac050 add test to check xml parsing functionality
Author
• groehl
Browse Repository
No Builds
No Audits
5d97c66336d3 major module restructuring to enable testing of probe xml parser
Author
• groehl
Browse Repository
No Builds
No Audits
35ab0e40e156 implement first steps to xml parsing of light source
Author
• groehl
Browse Repository
No Builds
No Audits
8ed3cb8c69b2 add tinyxml dependency
Author
• groehl
Browse Repository
No Builds
No Audits
0c1b8a2e94cb Added class skeleton for PhotoacousticProbe
Author
• groehl
Browse Repository
No Builds
No Audits

Changes (68)

Path

Size

Modules/

PhotoacousticSimulation/

Algorithms

mitkPhotoacoustic3dVolume.cpp

mitkPhotoacoustic3dVolume.h

mitkPhotoacousticFatTissueGenerator.cpp

mitkPhotoacousticFatTissueGenerator.h

mitkPhotoacousticNoiseGenerator.cpp

mitkPhotoacousticNoiseGenerator.h

mitkPhotoacousticTissueGenerator.cpp

mitkPhotoacousticTissueGenerator.h

mitkPhotoacousticVessel.cpp

mitkPhotoacousticVessel.h

mitkPhotoacousticVesselMeanderStrategy.cpp

mitkPhotoacousticVesselMeanderStrategy.h

mitkPhotoacousticVesselTree.cpp

mitkPhotoacousticVesselTree.h

mitkPhotoacousticVolume.cpp

mitkPhotoacousticVolume.h

MCxyz/

Testing/

mitkPhotoacousticPropertyCalculator.cpp

mitkPhotoacousticPropertyCalculator.h

mitkPhotoacousticSmartVector.cpp

mitkPhotoacousticSmartVector.h

mitkPhotoacousticStatefulObject.cpp

mitkPhotoacousticStatefulObject.h

files.cmake

src

ProbeDesign

mitkPhotoacousticLightSource.cpp

mitkPhotoacousticLightSource.h

mitkPhotoacousticProbe.cpp

mitkPhotoacousticProbe.h

	src/

Algorithms

mitkPhotoacoustic3dVolume.cpp

mitkPhotoacoustic3dVolume.h

mitkPhotoacousticFatTissueGenerator.cpp

mitkPhotoacousticFatTissueGenerator.h

mitkPhotoacousticNoiseGenerator.cpp

mitkPhotoacousticNoiseGenerator.h

mitkPhotoacousticTissueGenerator.cpp

mitkPhotoacousticTissueGenerator.h

mitkPhotoacousticVessel.cpp

mitkPhotoacousticVessel.h

mitkPhotoacousticVesselMeanderStrategy.cpp

mitkPhotoacousticVesselMeanderStrategy.h

mitkPhotoacousticVesselTree.cpp

mitkPhotoacousticVesselTree.h

mitkPhotoacousticVolume.cpp

mitkPhotoacousticVolume.h

Utils

mitkPhotoacousticPropertyCalculator.cpp

mitkPhotoacousticPropertyCalculator.h

mitkPhotoacousticSmartVector.cpp

mitkPhotoacousticSmartVector.h

mitkPhotoacousticStatefulObject.cpp

mitkPhotoacousticStatefulObject.h

rMITK96912729cff3

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacoustic3dVolume.cpp

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacoustic3dVolume.h

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticFatTissueGenerator.cpp

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticFatTissueGenerator.h

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticNoiseGenerator.cpp

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticNoiseGenerator.h

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticTissueGenerator.cpp

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticTissueGenerator.h

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVessel.cpp

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVessel.h

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVesselMeanderStrategy.cpp

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVesselMeanderStrategy.h

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVesselTree.cpp

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVesselTree.h

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVolume.cpp

View Options

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVolume.h

View Options

Modules/PhotoacousticSimulation/CMakeLists.txt

View Options

Modules/PhotoacousticSimulation/MCxyz/CMakeLists.txt

View Options

Modules/PhotoacousticSimulation/MCxyz/files.cmake

View Options

Modules/PhotoacousticSimulation/MCxyz/mitkMCxyz.cpp

View Options

Modules/PhotoacousticSimulation/Testing/CMakeLists.txt

View Options

Modules/PhotoacousticSimulation/Testing/Resources/allsources.xml

View Options

Modules/PhotoacousticSimulation/Testing/Resources/circlesource.xml

View Options

Modules/PhotoacousticSimulation/Testing/Resources/pointsource.xml

View Options

Modules/PhotoacousticSimulation/Testing/Resources/rectanglesource.xml

View Options

Modules/PhotoacousticSimulation/Testing/Resources/twopointsources.xml

View Options

Modules/PhotoacousticSimulation/Testing/files.cmake

View Options

Modules/PhotoacousticSimulation/Testing/mitkMcxyzXmlTest.cpp

View Options

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticPropertyCalculator.cpp

View Options

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticPropertyCalculator.h

View Options

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticSmartVector.cpp

View Options

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticSmartVector.h

View Options

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticStatefulObject.cpp

View Options

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticStatefulObject.h

View Options

Modules/PhotoacousticSimulation/files.cmake

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacoustic3dVolume.cpp

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacoustic3dVolume.h

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticFatTissueGenerator.cpp

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticFatTissueGenerator.h

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticNoiseGenerator.cpp

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticNoiseGenerator.h

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticTissueGenerator.cpp

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticTissueGenerator.h

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVessel.cpp

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVessel.h

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVesselMeanderStrategy.cpp

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVesselMeanderStrategy.h

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVesselTree.cpp

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVesselTree.h

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVolume.cpp

View Options

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVolume.h

View Options

Modules/PhotoacousticSimulation/src/ProbeDesign/mitkPhotoacousticLightSource.cpp

View Options

Modules/PhotoacousticSimulation/src/ProbeDesign/mitkPhotoacousticLightSource.h

View Options

Modules/PhotoacousticSimulation/src/ProbeDesign/mitkPhotoacousticProbe.cpp

View Options

Modules/PhotoacousticSimulation/src/ProbeDesign/mitkPhotoacousticProbe.h

View Options

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticPropertyCalculator.cpp

View Options

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticPropertyCalculator.h

View Options

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticSmartVector.cpp

View Options

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticSmartVector.h

View Options

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticStatefulObject.cpp

View Options

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticStatefulObject.h

Merge branch 'T19938-ProbeDesignXmlSchema' into bug-19608…96912729cff3Actions

Description

Details

Event Timeline

Merged Changes

Changes (68)

rMITK96912729cff3

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacoustic3dVolume.cpp

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacoustic3dVolume.h

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticFatTissueGenerator.cpp

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticFatTissueGenerator.h

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticNoiseGenerator.cpp

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticNoiseGenerator.h

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticTissueGenerator.cpp

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticTissueGenerator.h

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVessel.cpp

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVessel.h

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVesselMeanderStrategy.cpp

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVesselMeanderStrategy.h

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVesselTree.cpp

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVesselTree.h

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVolume.cpp

Modules/PhotoacousticSimulation/Algorithms/mitkPhotoacousticVolume.h

Modules/PhotoacousticSimulation/CMakeLists.txt

Modules/PhotoacousticSimulation/MCxyz/CMakeLists.txt

Modules/PhotoacousticSimulation/MCxyz/files.cmake

Modules/PhotoacousticSimulation/MCxyz/mitkMCxyz.cpp

Modules/PhotoacousticSimulation/Testing/CMakeLists.txt

Modules/PhotoacousticSimulation/Testing/Resources/allsources.xml

Modules/PhotoacousticSimulation/Testing/Resources/circlesource.xml

Modules/PhotoacousticSimulation/Testing/Resources/pointsource.xml

Modules/PhotoacousticSimulation/Testing/Resources/rectanglesource.xml

Modules/PhotoacousticSimulation/Testing/Resources/twopointsources.xml

Modules/PhotoacousticSimulation/Testing/files.cmake

Modules/PhotoacousticSimulation/Testing/mitkMcxyzXmlTest.cpp

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticPropertyCalculator.cpp

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticPropertyCalculator.h

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticSmartVector.cpp

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticSmartVector.h

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticStatefulObject.cpp

Modules/PhotoacousticSimulation/Utils/mitkPhotoacousticStatefulObject.h

Modules/PhotoacousticSimulation/files.cmake

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacoustic3dVolume.cpp

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacoustic3dVolume.h

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticFatTissueGenerator.cpp

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticFatTissueGenerator.h

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticNoiseGenerator.cpp

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticNoiseGenerator.h

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticTissueGenerator.cpp

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticTissueGenerator.h

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVessel.cpp

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVessel.h

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVesselMeanderStrategy.cpp

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVesselMeanderStrategy.h

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVesselTree.cpp

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVesselTree.h

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVolume.cpp

Modules/PhotoacousticSimulation/src/Algorithms/mitkPhotoacousticVolume.h

Modules/PhotoacousticSimulation/src/ProbeDesign/mitkPhotoacousticLightSource.cpp

Modules/PhotoacousticSimulation/src/ProbeDesign/mitkPhotoacousticLightSource.h

Modules/PhotoacousticSimulation/src/ProbeDesign/mitkPhotoacousticProbe.cpp

Modules/PhotoacousticSimulation/src/ProbeDesign/mitkPhotoacousticProbe.h

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticPropertyCalculator.cpp

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticPropertyCalculator.h

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticSmartVector.cpp

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticSmartVector.h

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticStatefulObject.cpp

Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticStatefulObject.h

Merge branch 'T19938-ProbeDesignXmlSchema' into bug-19608…
96912729cff3
Actions