Diffusion MITK af922c6c83e9

Merge branch 'bug-10050-ctk-dicom-plugin' into bug-12235-integrate-dicom-plugin
af922c6c83e9
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-10050-ctk-dicom-plugin' into bug-12235-integrate-dicom-plugin

Conflicts:
CMakeExternals/CTK.cmake
CoreUI/Qmitk/QmitkDataStorageTreeModel.cpp
CoreUI/Qmitk/QmitkDataStorageTreeModel.h
Modules/Bundles/CMakeLists.txt
Modules/Bundles/PluginList.cmake
Modules/Bundles/org.mitk.gui.qt.ext/files.cmake
Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h
Modules/CMakeLists.txt

Details

Provenance

Authored on Jun 18 2012, 2:35 PM

Parents

rMITK531516d89549: use working ctk version for mitk
rMITK0c8959355596: stage file

Branches

Unknown

Tags

Unknown

Event Timeline

• bauerm committed rMITKaf922c6c83e9: Merge branch 'bug-10050-ctk-dicom-plugin' into bug-12235-integrate-dicom-plugin (authored by • bauerm).Jun 18 2012, 2:35 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

531516d89549 use working ctk version for mitk
Author
• bauerm
Browse Repository
No Builds
No Audits
6d589dea9ec5 applay changes from ctk to disable the ctk progress dialog
Author
• bauerm
Browse Repository
No Builds
No Audits
52452f69ee9f checkable
Author
• bauerm
Browse Repository
No Builds
No Audits
2b91fd5cc1fd implemented storescp parameters configuration
Author
• bauerm
Browse Repository
No Builds
No Audits
0646e979b9b7 apply ctk changes
Author
• bauerm
Browse Repository
No Builds
No Audits
7f2ed1c19904 exclude preference page
Author
• bauerm
Browse Repository
No Builds
No Audits
52bf81a651a4 added radio button to switch storescp process on and of
Author
• bauerm
Browse Repository
No Builds
No Audits
0e8413c4e1a8 improve code of dicom editor
Author
• bauerm
Browse Repository
No Builds
No Audits
2d752b418e6a exclude preference page from project
Author
• bauerm
Browse Repository
No Builds
No Audits
b55635869622 changed preference page [not working yet]
Author
• bauerm
Browse Repository
No Builds
No Audits
4cc9f0718115 get server parameters from ctk widget
Author
• bauerm
Browse Repository
No Builds
No Audits
6aea56571e83 changed ctk added getter for server parameters
Author
• bauerm
Browse Repository
No Builds
No Audits
2d45c7bb0348 added preference Page
Author
• bauerm
Browse Repository
No Builds
No Audits
dd05b109ba46 added cast
Author
• bauerm
Browse Repository
No Builds
No Audits
36f8f338dd4b implemented some methods of preference page
Author
• bauerm
Browse Repository
No Builds
No Audits
2323f83af1d3 adjusted includes
Author
• bauerm
Browse Repository
No Builds
No Audits
7cdfb56e8d4d added preference page
Author
• bauerm
Browse Repository
No Builds
No Audits
6e01663c6205 add preference page
Author
• bauerm
Browse Repository
No Builds
No Audits
a6e6e6fdf27a cleaned up some code and includes
Author
• bauerm
Browse Repository
No Builds
No Audits
8bda19573015 changed datastoragetreemodel: if dicom date is added the name will be composed…
Author
• bauerm
Browse Repository
No Builds
No Audits
245bcb6b3a24 changed eventbus from normal events to publish signal slot
Author
• bauerm
Browse Repository
No Builds
No Audits
88d80c13ab30 new handler
Author
• bauerm
Browse Repository
No Builds
No Audits
b2ca732c4e94 event handler test
Author
• bauerm
Browse Repository
No Builds
No Audits
d1cc927cff84 added functions for registration, handle event, set the context
Author
• bauerm
Browse Repository
No Builds
No Audits
58b643fa5730 add DicomEventHandler for testing purposes
Author
• bauerm
Browse Repository
No Builds
No Audits
fc7678746ba3 changed variable from pointer to class
Author
• bauerm
Browse Repository
No Builds
No Audits
cafc8e72d1bb adjust include path
Author
• bauerm
Browse Repository
No Builds
No Audits
3bd650eb7198 deleted target_libraries.cmake
Author
• bauerm
Browse Repository
No Builds
No Audits
f771e937c505 changed cmakelists
Author
• bauerm
Browse Repository
No Builds
No Audits
36bf4056972f added ctkpluginframework to cmakelists
Author
• bauerm
Browse Repository
No Builds
No Audits
485fd566fa66 added file target_libraries.cmake
Author
• bauerm
Browse Repository
No Builds
No Audits
3b75a821e2eb added publisher
Author
• bauerm
Browse Repository
No Builds
No Audits
f62e5e1a1d53 added new files to files.cmake
Author
• bauerm
Browse Repository
No Builds
No Audits
81a4547a96c6 added QmitkDicomDataEventPublisher
Author
• bauerm
Browse Repository
No Builds
No Audits
5a4fad905f60 changed database directory
Author
• bauerm
Browse Repository
No Builds
No Audits
206735abe818 don't start process detached
Author
• bauerm
Browse Repository
No Builds
No Audits
a3962a5ad35c No Mutex needed
Author
• bauerm
Browse Repository
No Builds
No Audits
b2add79d91e1 tried another algorithm
Author
• bauerm
Browse Repository
No Builds
No Audits
cf53f7d97ec1 changed signatures and connection
Author
• bauerm
Browse Repository
No Builds
No Audits
42d024955b5e changed signature of signal
Author
• bauerm
Browse Repository
No Builds
No Audits
1f6845a6cf39 changed signatures of start/add methods and signal
Author
• bauerm
Browse Repository
No Builds
No Audits
12755c63b051 improved methods and style
Author
• bauerm
Browse Repository
No Builds
No Audits
a6f9fae94244 added a StoreSCP launcher
Author
• bauerm
Browse Repository
No Builds
No Audits
f2ea01d590a8 added class QmitkStoreSCPLauncher. It will start a dcmtk storescp in another…
Author
• bauerm
Browse Repository
No Builds
No Audits
185fd7ef9af7 improved code by deleting some comments and unused methods
Author
• bauerm
Browse Repository
No Builds
No Audits
6b8e2b510572 added search functionality
Author
• bauerm
Browse Repository
No Builds
No Audits
59036422550c added a default setup method
Author
• bauerm
Browse Repository
No Builds
No Audits
9cf5568142ef change the handling of the database
Author
• bauerm
Browse Repository
No Builds
No Audits
3431e55696df refactor big methods to small meaningfull methods
Author
• bauerm
Browse Repository
No Builds
No Audits
8740ab5c6455 added method to get plugin context
Author
• bauerm
Browse Repository
No Builds
No Audits

Changes (53)

Path

Size

Packages

CMakeExternals/

O1: MITK Reviewer Group I

Modules/

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

QmitkDicomExternalDataWidget.cpp

O4: MITK Reviewer Group III

QmitkDicomExternalDataWidget.h

O4: MITK Reviewer Group III

QmitkDicomExternalDataWidgetControls.ui

O4: MITK Reviewer Group III

QmitkDicomLocalStorageWidget.cpp

O4: MITK Reviewer Group III

QmitkDicomLocalStorageWidget.h

O4: MITK Reviewer Group III

QmitkDicomLocalStorageWidgetControls.ui

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

Qmitk/

QmitkDataStorageTreeModel.cpp

QmitkDataStorageTreeModel.h

Plugins/

PluginList.cmake

org.mitk.gui.qt.dicom

manifest_headers.cmake

DicomEventHandler.cpp

DicomEventHandler.h

QmitkDicomDataEventPublisher.cpp

QmitkDicomDataEventPublisher.h

QmitkDicomDirectoryListener.cpp

QmitkDicomDirectoryListener.h

QmitkDicomEditor.cpp

QmitkDicomEditor.h

QmitkDicomEditorControls.ui

QmitkDicomPreferencePage.cpp

QmitkDicomPreferencePage.h

QmitkStoreSCPLauncher.cpp

QmitkStoreSCPLauncher.h

QmitkStoreSCPLauncherBuilder.cpp

QmitkStoreSCPLauncherBuilder.h

mitkPluginActivator.cpp

mitkPluginActivator.h

	org.mitk.gui.qt.dicom/	documentation/	Manual/
	org.mitk.gui.qt.igtexamples/	documentation/	UserManual/

org.mitk.gui.qt.ext/

O1: MITK Reviewer Group I

src/

QmitkExtWorkbenchWindowAdvisor.cpp

O1: MITK Reviewer Group I

QmitkExtWorkbenchWindowAdvisor.h

O1: MITK Reviewer Group I

QmitkOpenDicomEditorAction.cpp

O1: MITK Reviewer Group I

QmitkOpenDicomEditorAction.h

O1: MITK Reviewer Group I

	Plugins/	org.mitk.gui.qt.dicom/
	Applications/	PluginGenerator/


	PluginTemplate/

	resources/
	PluginTemplate/	documentation/	UserManual/

rMITKaf922c6c83e9

CMakeExternals/CTK.cmake

Loading...

Modules/CMakeLists.txt

Loading...

Modules/DicomUI/CMakeLists.txt

Loading...

Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp

Loading...

Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.h

Loading...

Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidgetControls.ui

Loading...

Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp

Loading...

Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.h

Loading...

Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidgetControls.ui

Loading...

Modules/DicomUI/files.cmake

Loading...

Modules/Qmitk/QmitkDataStorageTreeModel.cpp

Loading...

Modules/Qmitk/QmitkDataStorageTreeModel.h

Loading...

Plugins/PluginList.cmake

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.dicom/documentation/Manual/Manual.dox

Loading...

Plugins/org.mitk.gui.qt.dicom/documentation/Manual/icon.png

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

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/QmitkDicomEditorControls.ui

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkOpenDicomEditorAction.cpp

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkOpenDicomEditorAction.h

Loading...

t

Loading...