Diffusion MITK ef67c66f3c3a

Merge branch 'bug-12966-multible-progress-dialogs'
ef67c66f3c3a
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-12966-multible-progress-dialogs'

Details

Provenance

Authored on Aug 31 2012, 5:27 PM

Parents

rMITK8578a32ea4b4: Initialize render windows. Global reinit is no longer needed
rMITK8cfee9aedf1b: Merge branch 'bug-12935-ToFImageRecorderEnhancement'

Branches

Unknown

Tags

Unknown

Event Timeline

• bauerm committed rMITKef67c66f3c3a: Merge branch 'bug-12966-multible-progress-dialogs' (authored by • bauerm).Aug 31 2012, 5:27 PM

Merged Changes

8578a32ea4b4 Initialize render windows. Global reinit is no longer needed
Author
• bauerm
Browse Repository
No Builds
No Audits
217716cb8fe2 Added qt ressource for network error.
Author
• bauerm
Browse Repository
No Builds
No Audits
836669b15859 Adjusted signals and slots. Changed logic because it wasn't possible to get the…
Author
• bauerm
Browse Repository
No Builds
No Audits
12f1d24f24cb Putted progress and import dialog here.
Author
• bauerm
Browse Repository
No Builds
No Audits
d953a83f8b3e Removed progress dialog and adjusted signals and slots.
Author
• bauerm
Browse Repository
No Builds
No Audits
fbd3578fdf9f Removed import and progress dialog from QmitkDicomExternalDataWidget and put it…
Author
• bauerm
Browse Repository
No Builds
No Audits
deea829cb3de changed error text from server crashed to server closed
Author
• bauerm
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Packages

Modules/

DicomUI/

Qmitk/

QmitkDicomExternalDataWidget.cpp

O4: MITK Reviewer Group III

QmitkDicomExternalDataWidget.h

O4: MITK Reviewer Group III

QmitkDicomLocalStorageWidget.cpp

O4: MITK Reviewer Group III

QmitkDicomLocalStorageWidget.h

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.dicom./

resources/

org.mitk.gui.qt.dicom/

resources/

src/

internal/

DicomEventHandler.cpp

QmitkDicomDirectoryListener.cpp

QmitkDicomDirectoryListener.h

QmitkDicomEditor.cpp

QmitkDicomEditor.h

QmitkStoreSCPLauncher.cpp

rMITKef67c66f3c3a

Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp

Loading...

Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.h

Loading...

Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp

Loading...

Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.h

Loading...

Plugins/org.mitk.gui.qt.dicom./resources/dicom.qrc

Loading...

Plugins/org.mitk.gui.qt.dicom/resources/dicom.qrc

Loading...

Plugins/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp

Loading...

Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomDirectoryListener.cpp

Loading...

Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomDirectoryListener.h

Loading...

Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp

Loading...

Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.h

Loading...

Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkStoreSCPLauncher.cpp

Loading...