Diffusion MITK 45f1a1c788c0

COMP: Merge branch 'bug-18250-MovieMaker'
45f1a1c788c0
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

COMP: Merge branch 'bug-18250-MovieMaker'

Conflicts:
Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.cpp

Details

Provenance

Authored on Nov 25 2014, 11:24 PM

Parents

rMITK3c64636697ff: Merge branch 'bug-18250-MovieMaker' of mitk.org:MITK into bug-18250-MovieMaker
rMITKb4713a023113: Merge branch 'bug-12997-SingleThreadImageRecorder'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK45f1a1c788c0: COMP: Merge branch 'bug-18250-MovieMaker' (authored by kislinsk).Nov 25 2014, 11:24 PM

Merged Changes

3c64636697ff Merge branch 'bug-18250-MovieMaker' of mitk.org:MITK into bug-18250-MovieMaker
Author
kislinsk
Browse Repository
No Builds
No Audits
ed5887088315 Made new movie maker plugin ready for release (experimental).
Author
kislinsk
Browse Repository
No Builds
No Audits
8df0ae8c1d2c WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
59be45d06998 WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
e948c5d940ab WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
ed80777f4836 WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
5eded4d3d495 Merge branch 'bug-18250-MovieMaker' of mitk.org:MITK into bug-18250-MovieMaker
Author
kislinsk
Browse Repository
No Builds
No Audits
2bb8781ca77b WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
74f5dbe45af7 WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
049f85338f69 Merge branch 'master' into bug-18250-MovieMaker
Author
kislinsk
Browse Repository
No Builds
No Audits
a1c922e0b07f Merge branch 'master' into bug-18250-MovieMaker
Author
kislinsk
Browse Repository
No Builds
No Audits
9209c99282ac Merge branch 'master' into bug-18250-MovieMaker
Author
kislinsk
Browse Repository
No Builds
No Audits
e3a3851bbb97 Merge branch 'master' into bug-18250-MovieMaker
Author
kislinsk
Browse Repository
No Builds
No Audits
82f575df6ab7 Merge branch 'master' into bug-18250-MovieMaker
Author
kislinsk
Browse Repository
No Builds
No Audits
86412883240b WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
15b9327a055a WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
e2cb3178c869 Merge branch 'master' into bug-18250-MovieMaker
Author
kislinsk
Browse Repository
No Builds
No Audits
3243d0ffa292 WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
1408ef5eeb76 WIP
Author
kislinsk
Browse Repository
No Builds
No Audits
31714352193f Continued implementing new movie maker.
Author
kislinsk
Browse Repository
No Builds
No Audits
6f754e516699 Continued implementing new movie maker (WIP).
Author
kislinsk
Browse Repository
No Builds
No Audits
6b7ed71fca0d Continued implementing new movie maker.
Author
kislinsk
Browse Repository
No Builds
No Audits
53be58151022 Continued implementing new movie maker.
Author
kislinsk
Browse Repository
No Builds
No Audits
ea5aa4c3ff28 Continued implementing new movie maker.
Author
kislinsk
Browse Repository
No Builds
No Audits
a2db44daea8d Continued implementing new movie maker.
Author
kislinsk
Browse Repository
No Builds
No Audits
eb12e3909a3d Began implementing new movie maker plugin.
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (71)

Path

Size

Packages

Plugins/

org.mitk.gui.qt.ext/

resources/

icons/

tango/

O1: MITK Reviewer Group I

scalable/

actions/

O1: MITK Reviewer Group I

list-remove.svg

O1: MITK Reviewer Group I

media-playback-pause.svg

O1: MITK Reviewer Group I

media-playback-start.svg

O1: MITK Reviewer Group I

media-playback-stop.svg

O1: MITK Reviewer Group I

media-record.svg

O1: MITK Reviewer Group I

media-seek-backward.svg

O1: MITK Reviewer Group I

media-seek-forward.svg

O1: MITK Reviewer Group I

media-skip-backward.svg

O1: MITK Reviewer Group I

media-skip-forward.svg

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

applications-multimedia.svg

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

camera-photo.svg

O1: MITK Reviewer Group I

camera-video.svg

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

image-x-generic.svg

O1: MITK Reviewer Group I

video-x-generic.svg

O1: MITK Reviewer Group I

org_mitk_icons.qrc

O1: MITK Reviewer Group I

src/

internal/

QmitkExternalProgramsPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkExternalProgramsPreferencePage.h

O1: MITK Reviewer Group I

QmitkExternalProgramsPreferencePage.ui

O1: MITK Reviewer Group I

org.mitk.gui.qt.moviemaker/

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

QmitkMovieMaker.dox

O3: MITK Reviewer Group II

QmitkMovieMaker_ControlArea.png

O3: MITK Reviewer Group II

QmitkMovieMaker_Icon.png

O3: MITK Reviewer Group II

QmitkMovieMaker_ScreenshotMakerInterface.png

O3: MITK Reviewer Group II

QmitkScreenshotMaker.dox

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

manifest_headers.cmake

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

resources/

QmitkMovieMaker.qrc

O3: MITK Reviewer Group II

QmitkMovieMakerClasses.png

O3: MITK Reviewer Group II

QmitkMovieMakerGUI.png

O3: MITK Reviewer Group II

camera-video.png

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

src/

internal/

QmitkAnimationItem.cpp

O3: MITK Reviewer Group II

QmitkAnimationItem.h

O3: MITK Reviewer Group II

QmitkAnimationItemDelegate.cpp

O3: MITK Reviewer Group II

QmitkAnimationItemDelegate.h

O3: MITK Reviewer Group II

QmitkAnimationWidget.cpp

O3: MITK Reviewer Group II

QmitkAnimationWidget.h

O3: MITK Reviewer Group II

QmitkFFmpegWriter.cpp

O3: MITK Reviewer Group II

QmitkFFmpegWriter.h

O3: MITK Reviewer Group II

QmitkMovieMaker.cpp

O3: MITK Reviewer Group II

QmitkMovieMaker.h

O3: MITK Reviewer Group II

QmitkMovieMakerControls.ui

O3: MITK Reviewer Group II

QmitkMovieMakerView.cpp

O3: MITK Reviewer Group II

QmitkMovieMakerView.h

O3: MITK Reviewer Group II

QmitkMovieMakerView.ui

O3: MITK Reviewer Group II

QmitkOrbitAnimationItem.cpp

O3: MITK Reviewer Group II

QmitkOrbitAnimationItem.h

O3: MITK Reviewer Group II

QmitkOrbitAnimationWidget.cpp

O3: MITK Reviewer Group II

QmitkOrbitAnimationWidget.h

O3: MITK Reviewer Group II

QmitkOrbitAnimationWidget.ui

O3: MITK Reviewer Group II

QmitkSliceAnimationItem.cpp

O3: MITK Reviewer Group II

QmitkSliceAnimationItem.h

O3: MITK Reviewer Group II

QmitkSliceAnimationWidget.cpp

O3: MITK Reviewer Group II

QmitkSliceAnimationWidget.h

O3: MITK Reviewer Group II

QmitkSliceAnimationWidget.ui

O3: MITK Reviewer Group II

mitkMovieMakerPluginActivator.cpp

O3: MITK Reviewer Group II

rMITK45f1a1c788c0

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/index.theme

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/list-add.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/list-remove.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-playback-pause.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-playback-start.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-playback-stop.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-record.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-seek-backward.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-seek-forward.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-skip-backward.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-skip-forward.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/categories/applications-multimedia.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/devices/camera-photo.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/devices/camera-video.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/mimetypes/image-x-generic.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/mimetypes/video-x-generic.svg

Loading...

Plugins/org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc

Loading...

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.cpp

Loading...

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.h

Loading...

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.ui

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker.dox

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_ControlArea.png

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_Icon.png

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_ScreenshotMakerInterface.png

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkScreenshotMaker.dox

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation/doxygen

Loading...

Plugins/org.mitk.gui.qt.moviemaker/documentation/doxygen/modules.dox

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.moviemaker/manifest_headers.cmake

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMaker.qrc

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerClasses.png

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerGUI.png

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/camera-video.png

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/delay.svg

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/duration.svg

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/icon.png

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/icon.xpm

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/pause.xpm

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/play.xpm

Loading...

Plugins/org.mitk.gui.qt.moviemaker/resources/stop.xpm

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkAnimationItem.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkAnimationItem.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkAnimationItemDelegate.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkAnimationItemDelegate.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkAnimationWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkAnimationWidget.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkFFmpegWriter.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkFFmpegWriter.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerControls.ui

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.ui

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkOrbitAnimationItem.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkOrbitAnimationItem.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkOrbitAnimationWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkOrbitAnimationWidget.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkOrbitAnimationWidget.ui

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkSliceAnimationItem.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkSliceAnimationItem.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkSliceAnimationWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkSliceAnimationWidget.h

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkSliceAnimationWidget.ui

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.cpp

Loading...