Merge branch 'bug-3104-ImageStatisticsThreaded' into bug-3104…
0c440f09c7aa
Actions

Description

Merge branch 'bug-3104-ImageStatisticsThreaded' into bug-3104-IntegrationThreadedImageStatistics

Conflicts:
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

Details

Provenance

• mersmann

Authored on Jun 27 2012, 4:14 PM

Parents

rMITKe5451c002b1f: revert changes in classes.
rMITK5e4f10363242: Merge branch 'bug-12309-Failing_TbssIOTests'

Branches

Unknown

Tags

Unknown

Event Timeline

• mersmann committed rMITK0c440f09c7aa: Merge branch 'bug-3104-ImageStatisticsThreaded' into bug-3104… (authored by • mersmann).Jun 27 2012, 4:14 PM

Merged Changes

e5451c002b1f revert changes in classes.
Author
• mersmann
Browse Repository
No Builds
No Audits
8d633c09e418 Some code clean up and documentation.
Author
• mersmann
Browse Repository
No Builds
No Audits
78a11c4eb5cf Threaded update of image statistics calculation
Author
• mersmann
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

Packages

Plugins/

org.mitk.gui.qt.measurementtoolbox/

files.cmake

O1: MITK Reviewer Group I

src/

internal/

QmitkImageStatisticsCalculationThread.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsCalculationThread.h

O1: MITK Reviewer Group I

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsView.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.cpp

QmitkToFUtilView.h

rMITK0c440f09c7aa

View Options

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

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.h

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

View Options

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

View Options

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

Merge branch 'bug-3104-ImageStatisticsThreaded' into bug-3104…0c440f09c7aaActions

Description

Details

Event Timeline

Merged Changes

Changes (7)

rMITK0c440f09c7aa

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

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.h

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

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

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

Merge branch 'bug-3104-ImageStatisticsThreaded' into bug-3104…
0c440f09c7aa
Actions