Merge branch 'T24251-IntegrationBranch' into T24251-IntegrationBranch2
130b8f2e1868
Actions

Description

Merge branch 'T24251-IntegrationBranch' into T24251-IntegrationBranch2

Conflicts:
Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.cpp

Details

Provenance

seitela	Authored on Feb 21 2018, 4:20 PM
seitela	Pushed on Feb 21 2018, 6:14 PM

Parents

rMITK3561951f2183: Merge branch 'T24227-IGTDocumentation'
rMITKde99e6fdf763: Complete changes in ultrasound in one commit added multiple outputs

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITK130b8f2e1868: Merge branch 'T24251-IntegrationBranch' into T24251-IntegrationBranch2 (authored by seitela).Feb 21 2018, 4:20 PM

Merged Changes

de99e6fdf763 Complete changes in ultrasound in one commit added multiple outputs
Author
• sattler
Browse Repository
No Builds
No Audits
801d498ee000 Merge branch 'T19861-labSetupQuicksaveIntegrationSeptember' into T24086…
Author
• sattler
Browse Repository
No Builds
No Audits
6c8aebd0b742 NO more saving of raw US images, and therefore no more crashes when recording
Author
• sattler
Browse Repository
No Builds
No Audits
2d2ebd4f22fa tgc is saved correctly multiple events can be saved without crash
Author
• sattler
Browse Repository
No Builds
No Audits
f61308a79b05 recalibrated OPO -Thomas
Author
• sattler
Browse Repository
No Builds
No Audits
b42f80d82bb7 ... the 2 was nonsensical
Author
• sattler
Browse Repository
No Builds
No Audits
f7bc75c4de9a made some Photoacoustics icons theme dependent
Author
• kirchnth
Browse Repository
No Builds
No Audits
709c68b64a88 Merge branch 'master' into T19860-labSetupQuicksaveIntegrationSeptember
Author
• sattler
Browse Repository
No Builds
No Audits
ea249ce3b804 Merge branch 'T19861-labSetupQuicksave' into T19861…
Author
• kirchnth
Browse Repository
No Builds
No Audits
0c39761dcf24 new filter cuts of the area imaged behind the transducer (or is supposed to)…
Author
• sattler
Browse Repository
No Builds
No Audits
d565c4624df3 only removed else() ect statements
Author
• sattler
Browse Repository
No Builds
No Audits
c113a3364957 unused variable warning fixed
Author
• sattler
Browse Repository
No Builds
No Audits
c6bb149a7d50 stupid typo -Thomas
Author
• sattler
Browse Repository
No Builds
No Audits
f61ac5c7d8d2 build configuration fixed to lab system
Author
• sattler
Browse Repository
No Builds
No Audits
953b5eecbf6c quicksave workaround for the Photoacoustics setup in the lab avoiding: T23189…
Author
• sattler
Browse Repository
No Builds
No Audits

Changes (29)

Path

Size

Packages

CMake/

BuildConfigurations/

camiPhotoacousticsSetup.cmake

O1: MITK Reviewer Group I

FindOpenCL.cmake

O1: MITK Reviewer Group I

Modules/

Core/

src/

IO/

mitkItkImageIO.cpp

O1: MITK Reviewer Group I

PhotoacousticsHardware/

CMakeLists.txt

Resources/

OpotekPhocusMobile.xml

US/

Testing/

mitkUSImageVideoSourceTest.cpp

USFilters/

mitkIGTLMessageToUSImageFilter.cpp

mitkIGTLMessageToUSImageFilter.h

mitkUSImageSource.cpp

mitkUSImageSource.h

mitkUSImageVideoSource.cpp

mitkUSImageVideoSource.h

USHardwareDiPhAS/

mitkUSDiPhASDevice.cpp

mitkUSDiPhASImageSource.cpp

mitkUSDiPhASImageSource.h

USModel/

mitkUSDevice.cpp

mitkUSDevice.h

mitkUSVideoDevice.h

USNavigation/

mitkUSCombinedModality.cpp

Plugins/

org.mitk.gui.qt.lasercontrol/

resources/

src/

internal/

QmitkLaserControlControls.ui

org.mitk.gui.qt.photoacoustics.pausviewer/

files.cmake

plugin.xml

resources/

iconPAUSViewer.svg

org.mitk.gui.qt.ultrasound/

src/

internal/

QmitkUltrasoundSupport.cpp

QmitkUltrasoundSupport.h

rMITK130b8f2e1868

View Options

CMake/BuildConfigurations/camiPhotoacousticsSetup.cmake

View Options

CMake/FindOpenCL.cmake

View Options

Modules/Core/src/IO/mitkItkImageIO.cpp

View Options

Modules/PhotoacousticsHardware/CMakeLists.txt

View Options

Modules/PhotoacousticsHardware/Resources/OpotekPhocusMobile.xml

View Options

Modules/US/Testing/mitkUSImageVideoSourceTest.cpp

View Options

Modules/US/USFilters/mitkIGTLMessageToUSImageFilter.cpp

View Options

Modules/US/USFilters/mitkIGTLMessageToUSImageFilter.h

View Options

Modules/US/USFilters/mitkUSImageSource.cpp

View Options

Modules/US/USFilters/mitkUSImageSource.h

View Options

Modules/US/USFilters/mitkUSImageVideoSource.cpp

View Options

Modules/US/USFilters/mitkUSImageVideoSource.h

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASDevice.cpp

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.cpp

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.h

View Options

Modules/US/USModel/mitkUSDevice.cpp

View Options

Modules/US/USModel/mitkUSDevice.h

View Options

Modules/US/USModel/mitkUSVideoDevice.h

View Options

Modules/US/USNavigation/mitkUSCombinedModality.cpp

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.lasercontrol/resources/iconLaserControl.svg

View Options

Plugins/org.mitk.gui.qt.lasercontrol/src/internal/QmitkLaserControlControls.ui

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/files.cmake

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/plugin.xml

View Options

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/iconPAUSViewer.svg

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.cpp

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.h

Merge branch 'T24251-IntegrationBranch' into T24251-IntegrationBranch2130b8f2e1868Actions

Description

Details

Event Timeline

Merged Changes

Changes (29)

rMITK130b8f2e1868

CMake/BuildConfigurations/camiPhotoacousticsSetup.cmake

CMake/FindOpenCL.cmake

Modules/Core/src/IO/mitkItkImageIO.cpp

Modules/PhotoacousticsHardware/CMakeLists.txt

Modules/PhotoacousticsHardware/Resources/OpotekPhocusMobile.xml

Modules/US/Testing/mitkUSImageVideoSourceTest.cpp

Modules/US/USFilters/mitkIGTLMessageToUSImageFilter.cpp

Modules/US/USFilters/mitkIGTLMessageToUSImageFilter.h

Modules/US/USFilters/mitkUSImageSource.cpp

Modules/US/USFilters/mitkUSImageSource.h

Modules/US/USFilters/mitkUSImageVideoSource.cpp

Modules/US/USFilters/mitkUSImageVideoSource.h

Modules/US/USHardwareDiPhAS/mitkUSDiPhASDevice.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.h

Modules/US/USModel/mitkUSDevice.cpp

Modules/US/USModel/mitkUSDevice.h

Modules/US/USModel/mitkUSVideoDevice.h

Modules/US/USNavigation/mitkUSCombinedModality.cpp

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

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

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

Plugins/org.mitk.gui.qt.lasercontrol/resources/iconLaserControl.svg

Plugins/org.mitk.gui.qt.lasercontrol/src/internal/QmitkLaserControlControls.ui

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/files.cmake

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/plugin.xml

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/iconPAUSViewer.svg

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.cpp

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.h

Merge branch 'T24251-IntegrationBranch' into T24251-IntegrationBranch2
130b8f2e1868
Actions