Diffusion MITK f52dbaa1b0b3

Merge branch 'bug-18423-ToFScreenShotMaker'
f52dbaa1b0b3
Actions

Description

Merge branch 'bug-18423-ToFScreenShotMaker'

Details

Provenance

• kilgus

Authored on Jan 5 2015, 3:18 PM

Parents

rMITK7257f21ae308: Cleaning up.
rMITK6aec86121363: Merge branch 'bug-12997-UndoChanges'

Branches

Unknown

Tags

Unknown

Event Timeline

• kilgus committed rMITKf52dbaa1b0b3: Merge branch 'bug-18423-ToFScreenShotMaker' (authored by • kilgus).Jan 5 2015, 3:18 PM

Merged Changes

7257f21ae308 Cleaning up.
Author
• kilgus
Browse Repository
No Builds
No Audits
c64c1a66b400 Removed ToFImageBackground. Fixed issue with binary property.
Author
• kilgus
Browse Repository
No Builds
No Audits
a622475279dc Cleaning up and docu.
Author
• kilgus
Browse Repository
No Builds
No Audits
eba01d4f905c First version of ToFScreenshotMaker GUI. ToFImageGrabber is microService now.
Author
• kilgus
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Modules/

ToFHardware/

files.cmake

mitkToFImageGrabber.cpp

mitkToFImageGrabber.h

mitkToFImageSource.h

	ToFHardware/
	DataTypesExt/

	mitkToFImageSource.cpp
	mitkColorSequence.cpp

Plugins/

org.mitk.gui.qt.tofutil/

files.cmake

plugin.xml

resources/

	iconToFScrenshotMaker.xpm
	iconToFUtilView.xpm

src/

internal/

QmitkToFImageBackground.cpp

QmitkToFImageBackground.h

QmitkToFScreenshotMaker.cpp

QmitkToFScreenshotMaker.h

QmitkToFScreenshotMakerControls.ui

QmitkToFUtilView.cpp

mitkPluginActivator.cpp

rMITKf52dbaa1b0b3

View Options

Modules/ToFHardware/files.cmake

View Options

Modules/ToFHardware/mitkToFImageGrabber.cpp

View Options

Modules/ToFHardware/mitkToFImageGrabber.h

View Options

Modules/ToFHardware/mitkToFImageSource.cpp

View Options

Modules/ToFHardware/mitkToFImageSource.h

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.tofutil/resources/iconToFScrenshotMaker.xpm

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.cpp

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.h

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFScreenshotMaker.cpp

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFScreenshotMaker.h

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFScreenshotMakerControls.ui

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.cpp

Merge branch 'bug-18423-ToFScreenShotMaker'f52dbaa1b0b3Actions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITKf52dbaa1b0b3

Modules/ToFHardware/files.cmake

Modules/ToFHardware/mitkToFImageGrabber.cpp

Modules/ToFHardware/mitkToFImageGrabber.h

Modules/ToFHardware/mitkToFImageSource.cpp

Modules/ToFHardware/mitkToFImageSource.h

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

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

Plugins/org.mitk.gui.qt.tofutil/resources/iconToFScrenshotMaker.xpm

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.cpp

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.h

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFScreenshotMaker.cpp

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFScreenshotMaker.h

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFScreenshotMakerControls.ui

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Plugins/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.cpp

Merge branch 'bug-18423-ToFScreenShotMaker'
f52dbaa1b0b3
Actions