Merge branch 'bug-11947-CreatePluginForManagmentOfUltrasoundDevices'
126654216520
Actions

Description

Merge branch 'bug-11947-CreatePluginForManagmentOfUltrasoundDevices'

Details

Provenance

Authored on Jun 28 2012, 5:14 PM

Parents

rMITK727ab2603dcd: Deactivating the Pipeline Tests again until they are reworked
rMITKfcfbfe0d98c0: Merge branch 'bug-7994-undo-functionality-for-segmentation'

Branches

Unknown

Tags

Unknown

Event Timeline

maerz committed rMITK126654216520: Merge branch 'bug-11947-CreatePluginForManagmentOfUltrasoundDevices' (authored by maerz).Jun 28 2012, 5:14 PM

Merged Changes

727ab2603dcd Deactivating the Pipeline Tests again until they are reworked
Author
maerz
Browse Repository
No Builds
No Audits
548d59d9ba83 Further Smartpointer casting corrections
Author
maerz
Browse Repository
No Builds
No Audits
a7488d1bff8d corrected smartpointer casting
Author
• kolbch
Browse Repository
No Builds
No Audits
071b34c78c8c Merge branch 'bug-12315-RewriteUSImageVideoSourceToStrictlyRelyOnHighgui' into…
Author
maerz
Browse Repository
No Builds
No Audits
7848c8e5b282 Deactivating Pipelinetest again, getting ready for major Pipeline rework
Author
maerz
Browse Repository
No Builds
No Audits
4295a0ad5025 Made video files work again
Author
maerz
Browse Repository
No Builds
No Audits
617f620e0df1 Plugin Cleanup, getting ready for ImageSource Migration
Author
maerz
Browse Repository
No Builds
No Audits
82345e40b882 Finally made USDevice Abstract
Author
maerz
Browse Repository
No Builds
No Audits
3ec6613d88b8 Fixing DeviceClass behaviour in NewVideoDeviceWidget
Author
maerz
Browse Repository
No Builds
No Audits
6af40662aec0 Removed duplicate class naming convention for Microservices in USDevice
Author
maerz
Browse Repository
No Builds
No Audits
072eea0f39a9 General Cleanup
Author
maerz
Browse Repository
No Builds
No Audits
c6d1b670d020 Further Cleanup
Author
maerz
Browse Repository
No Builds
No Audits
bb129ead33ce Cleanup of Ultrasoundsupport plugin, documentation
Author
maerz
Browse Repository
No Builds
No Audits
1e1c8516d749 First steps towards real-time imaging
Author
maerz
Browse Repository
No Builds
No Audits
ce4ecfac50bb Added preliminary icon
Author
maerz
Browse Repository
No Builds
No Audits
aafb75946151 Merge branch 'bug-11947-CreatePluginForManagmentOfUltrasoundDevices' of mitk.
Author
maerz
Browse Repository
No Builds
No Audits
8ab18b4bca34 Minor Changes to USImageVideoSource
Author
maerz
Browse Repository
No Builds
No Audits
b1fd6c0bfd63 Fixed linux spelling issues.
Author
• kilgus
Browse Repository
No Builds
No Audits
aba0910ec556 VideoSource correctly returns succession of images
Author
maerz
Browse Repository
No Builds
No Audits
55994318f531 several of smaller changes, bugfixes and minor improvements
Author
maerz
Browse Repository
No Builds
No Audits
a44bbd2fd2f8 Added a DeviceListWidget to abstract filtering of devices
Author
maerz
Browse Repository
No Builds
No Audits
0cf7066f012c Fully implemented activation / deactivation logic into DeviceManagerWidget
Author
maerz
Browse Repository
No Builds
No Audits
fd36ce7d9004 Merge branch 'bug-11075-micro-services-bug-fixes' into bug-11947…
Author
maerz
Browse Repository
No Builds
No Audits
818d740c0e75 Refine service property locking to avoid possible deadlocks.
Author
zelzer
Browse Repository
No Builds
No Audits
c2fc79458512 Test only for a specific service interface count.
Author
zelzer
Browse Repository
No Builds
No Audits
f75c9567eb50 Merge branch 'bug-11075-micro-services-unregistration' into bug-11947…
Author
maerz
Browse Repository
No Builds
No Audits
a8326920297f Baby steps to make DevcieManager support activity state of devices
Author
maerz
Browse Repository
No Builds
No Audits
9c1eea2b3f4d Connected the new Inputs in NewVideoDeviceWidget
Author
maerz
Browse Repository
No Builds
No Audits
5d98c9faa14c NewVideoDeviceWidget now has ability to create USDevice from VideoFile or from…
Author
maerz
Browse Repository
No Builds
No Audits
e4675fd068ee NewVideoDeviceWidget now correctly creates VideoDevices.
Author
maerz
Browse Repository
No Builds
No Audits
dc89c865011b Overhauled activation and connection management in USDevice. Plugin now shows…
Author
maerz
Browse Repository
No Builds
No Audits
7c95ef64d949 Removed debug code to generate fake devcies
Author
maerz
Browse Repository
No Builds
No Audits
4922836761e6 CreateNewDevice Widget now creates devices and registers them. Many…
Author
maerz
Browse Repository
No Builds
No Audits
51a5c7cfa3a4 Added event listening ability to DevicemanagerWidget
Author
maerz
Browse Repository
No Builds
No Audits
ccff73c9f78f DeviceManagerWidget refactored to use new Microservice Structure
Author
maerz
Browse Repository
No Builds
No Audits
50e631af12c5 Formular to enter new device specifics
Author
maerz
Browse Repository
No Builds
No Audits
5fc80573367f Created New Widget: UsNewVideoDeviceWidget to create Video Devices on the fly
Author
maerz
Browse Repository
No Builds
No Audits
3e0695112b77 Integrated Widget and Plugin, Basic SIgnal/Slot support etc...
Author
maerz
Browse Repository
No Builds
No Audits
7e2089d11419 First proper Slots & Signals for the DeviceManagerWidget, Basic Implementation…
Author
maerz
Browse Repository
No Builds
No Audits
8f48fbeb46ae Added new class "USDevcieService" that manages and allows connection to US…
Author
maerz
Browse Repository
No Builds
No Audits
b42b368b5410 Cleanup: Moved Model Files from mitkUS/USFIlters to mitkUS/USModel
Author
maerz
Browse Repository
No Builds
No Audits
601173182296 Added DeviceManager Widget to Plugin
Author
maerz
Browse Repository
No Builds
No Audits
0f6a9a1ee83d Created Module USUI
Author
maerz
Browse Repository
No Builds
No Audits
7d5755031db3 Created Plugin Ultrasound
Author
maerz
Browse Repository
No Builds
No Audits

Changes (64)

Path

Size

Modules/

CMakeLists.txt

US/

CMakeLists.txt

Testing/

mitkUSDeviceTest.cpp

mitkUSPipelineTest.cpp

USFilters/

mitkUSImageMetadata.cpp

mitkUSImageMetadata.h

mitkUSImageVideoSource.cpp

mitkUSProbe.cpp

mitkUSProbe.h

mitkUSVideoDevice.cpp

mitkUSVideoDevice.h

USModel

mitkUSVideoDevice.cpp

mitkUSVideoDevice.h

	USModel/
	USFilters/

mitkUSImageMetadata.cpp

mitkUSImageMetadata.h

mitkUSProbe.cpp

mitkUSProbe.h

USService

mitkUSDeviceService.cpp

mitkUSDeviceService.h

QmitkUSDeviceListWidget.cpp

QmitkUSDeviceListWidget.h

QmitkUSDeviceListWidgetControls.ui

QmitkUSDeviceManagerWidget.cpp

QmitkUSDeviceManagerWidget.h

QmitkUSDeviceManagerWidgetControls.ui

QmitkUSNewVideoDeviceWidget.cpp

QmitkUSNewVideoDeviceWidget.h

QmitkUSNewVideoDeviceWidgetControls.ui

files.cmake

Plugins/

PluginList.cmake

org.mitk.gui.qt.ultrasound

manifest_headers.cmake

UltrasoundSupport.cpp

UltrasoundSupport.h

UltrasoundSupportControls.ui

org_mitk_gui_qt_ultrasound_Activator.cpp

org_mitk_gui_qt_ultrasound_Activator.h

	Plugins/	org.mitk.gui.qt.ultrasound/		documentation/	UserManual/
	Applications/	PluginGenerator/	PluginTemplate/	documentation/	UserManual/

icon.xpm

rMITK126654216520

View Options

Modules/CMakeLists.txt

View Options

Modules/US/CMakeLists.txt

View Options

Modules/US/Testing/mitkUSDeviceTest.cpp

View Options

Modules/US/Testing/mitkUSPipelineTest.cpp

View Options

Modules/US/USFilters/mitkUSDevice.cpp

View Options

Modules/US/USFilters/mitkUSDevice.h

View Options

Modules/US/USFilters/mitkUSImage.cpp

View Options

Modules/US/USFilters/mitkUSImage.h

View Options

Modules/US/USFilters/mitkUSImageMetadata.cpp

View Options

Modules/US/USFilters/mitkUSImageMetadata.h

View Options

Modules/US/USFilters/mitkUSImageVideoSource.cpp

View Options

Modules/US/USFilters/mitkUSProbe.cpp

View Options

Modules/US/USFilters/mitkUSProbe.h

View Options

Modules/US/USFilters/mitkUSVideoDevice.cpp

View Options

Modules/US/USFilters/mitkUSVideoDevice.h

View Options

Modules/US/USModel/mitkUSDevice.cpp

View Options

Modules/US/USModel/mitkUSDevice.h

View Options

Modules/US/USModel/mitkUSImage.cpp

View Options

Modules/US/USModel/mitkUSImage.h

View Options

Modules/US/USModel/mitkUSImageMetadata.cpp

View Options

Modules/US/USModel/mitkUSImageMetadata.h

View Options

Modules/US/USModel/mitkUSProbe.cpp

View Options

Modules/US/USModel/mitkUSProbe.h

View Options

Modules/US/USModel/mitkUSVideoDevice.cpp

View Options

Modules/US/USModel/mitkUSVideoDevice.h

View Options

Modules/US/USService/mitkUSDeviceService.cpp

View Options

Modules/US/USService/mitkUSDeviceService.h

View Options

Modules/US/files.cmake

View Options

Modules/USUI/CMakeLists.txt

View Options

Modules/USUI/Qmitk/QmitkUSDeviceListWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSDeviceListWidget.h

View Options

Modules/USUI/Qmitk/QmitkUSDeviceListWidgetControls.ui

View Options

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h

View Options

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidgetControls.ui

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidgetControls.ui

View Options

Modules/USUI/files.cmake

View Options

Plugins/PluginList.cmake

View Options

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

View Options

Plugins/org.mitk.gui.qt.ultrasound/documentation/UserManual/Manual.dox

View Options

Plugins/org.mitk.gui.qt.ultrasound/documentation/UserManual/icon.xpm

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.h

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/org_mitk_gui_qt_ultrasound_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/org_mitk_gui_qt_ultrasound_Activator.h

Merge branch 'bug-11947-CreatePluginForManagmentOfUltrasoundDevices'126654216520Actions

Description

Details

Event Timeline

Merged Changes

Changes (64)

rMITK126654216520

Modules/CMakeLists.txt

Modules/US/CMakeLists.txt

Modules/US/Testing/mitkUSDeviceTest.cpp

Modules/US/Testing/mitkUSPipelineTest.cpp

Modules/US/USFilters/mitkUSDevice.cpp

Modules/US/USFilters/mitkUSDevice.h

Modules/US/USFilters/mitkUSImage.cpp

Modules/US/USFilters/mitkUSImage.h

Modules/US/USFilters/mitkUSImageMetadata.cpp

Modules/US/USFilters/mitkUSImageMetadata.h

Modules/US/USFilters/mitkUSImageVideoSource.cpp

Modules/US/USFilters/mitkUSProbe.cpp

Modules/US/USFilters/mitkUSProbe.h

Modules/US/USFilters/mitkUSVideoDevice.cpp

Modules/US/USFilters/mitkUSVideoDevice.h

Modules/US/USModel/mitkUSDevice.cpp

Modules/US/USModel/mitkUSDevice.h

Modules/US/USModel/mitkUSImage.cpp

Modules/US/USModel/mitkUSImage.h

Modules/US/USModel/mitkUSImageMetadata.cpp

Modules/US/USModel/mitkUSImageMetadata.h

Modules/US/USModel/mitkUSProbe.cpp

Modules/US/USModel/mitkUSProbe.h

Modules/US/USModel/mitkUSVideoDevice.cpp

Modules/US/USModel/mitkUSVideoDevice.h

Modules/US/USService/mitkUSDeviceService.cpp

Modules/US/USService/mitkUSDeviceService.h

Modules/US/files.cmake

Modules/USUI/CMakeLists.txt

Modules/USUI/Qmitk/QmitkUSDeviceListWidget.cpp

Modules/USUI/Qmitk/QmitkUSDeviceListWidget.h

Modules/USUI/Qmitk/QmitkUSDeviceListWidgetControls.ui

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidgetControls.ui

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidgetControls.ui

Modules/USUI/files.cmake

Plugins/PluginList.cmake

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

Plugins/org.mitk.gui.qt.ultrasound/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.ultrasound/documentation/UserManual/icon.xpm

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

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

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

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

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

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.h

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui

Plugins/org.mitk.gui.qt.ultrasound/src/internal/org_mitk_gui_qt_ultrasound_Activator.cpp

Plugins/org.mitk.gui.qt.ultrasound/src/internal/org_mitk_gui_qt_ultrasound_Activator.h

Merge branch 'bug-11947-CreatePluginForManagmentOfUltrasoundDevices'
126654216520
Actions