Merge branch 'T19861-labSetupQuicksave' into T19861…
ea249ce3b804
Actions

Description

Merge branch 'T19861-labSetupQuicksave' into T19861-labSetupQuicksaveIntegrationSeptember

Details

Provenance

• kirchnth	Authored on Sep 22 2017, 3:35 PM
• kirchnth	Pushed on Sep 22 2017, 4:35 PM

Parents

rMITK2f3ae2848aeb: Merge branch 'T23211-FibFit'
rMITK0c39761dcf24: new filter cuts of the area imaged behind the transducer (or is supposed to)…

Branches

Unknown

Tags

Unknown

Event Timeline

• kirchnth committed rMITKea249ce3b804: Merge branch 'T19861-labSetupQuicksave' into T19861… (authored by • kirchnth).Sep 22 2017, 3:35 PM

Merged Changes

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 (8)

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

OpenCL/

mitkOclFilter.cpp

PhotoacousticsHardware/

CMakeLists.txt

US/

USHardwareDiPhAS/

mitkUSDiPhASImageSource.cpp

mitkUSDiPhASImageSource.h

Plugins/

org.mitk.gui.qt.lasercontrol/

CMakeLists.txt

rMITKea249ce3b804

View Options

CMake/BuildConfigurations/camiPhotoacousticsSetup.cmake

View Options

CMake/FindOpenCL.cmake

View Options

Modules/Core/src/IO/mitkItkImageIO.cpp

View Options

Modules/OpenCL/mitkOclFilter.cpp

View Options

Modules/PhotoacousticsHardware/CMakeLists.txt

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.cpp

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.h

View Options

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

Merge branch 'T19861-labSetupQuicksave' into T19861…ea249ce3b804Actions

Description

Details

Event Timeline

Merged Changes

Changes (8)

rMITKea249ce3b804

CMake/BuildConfigurations/camiPhotoacousticsSetup.cmake

CMake/FindOpenCL.cmake

Modules/Core/src/IO/mitkItkImageIO.cpp

Modules/OpenCL/mitkOclFilter.cpp

Modules/PhotoacousticsHardware/CMakeLists.txt

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.h

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

Merge branch 'T19861-labSetupQuicksave' into T19861…
ea249ce3b804
Actions