Diffusion MITK f1ff717fd9d1

Merge branch 'T24196-Integration'
f1ff717fd9d1
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'T24196-Integration'

Details

Provenance

floca	Authored on May 15 2018, 12:14 PM
floca	Pushed on May 15 2018, 12:16 PM

Parents

rMITK6d81cd93b50f: Merge branch 'master' into T24196-Integration
rMITK4f92a9f6a1ec: mitkImageDataItem: changed data type of size member to increase possible image…

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITKf1ff717fd9d1: Merge branch 'T24196-Integration' (authored by floca).May 15 2018, 12:14 PM

Merged Changes

6d81cd93b50f Merge branch 'master' into T24196-Integration
Author
floca
Browse Repository
No Builds
No Audits
ff1bd198f8df Merge branch 'master' into T24196-Integration
Author
floca
Browse Repository
No Builds
No Audits
625a70e780ad add icon for clearing optinal single selection widget
Author
floca
Browse Repository
No Builds
No Audits
e7452a5d0c45 fixed review issues (D126)
Author
floca
Browse Repository
No Builds
No Audits
1cdf31ad33da Improved rendering of QmitkSingleNodeSelectionWidget
Author
floca
Browse Repository
No Builds
No Audits
002e3abff74d Added clear feature to the SingleNodeSelectionWidget
Author
floca
Browse Repository
No Builds
No Audits
3f5e6793498d Draft to improve design of single selection widget.
Author
floca
Browse Repository
No Builds
No Audits
590f839cfeab Handle cases with no preferences
Author
floca
Browse Repository
No Builds
No Audits
86fa53dc508a Fixed gcc errors/warnings.
Author
floca
Browse Repository
No Builds
No Audits
93b54b17efcb Use preference information in QmitkNodeSelectionDialog
Author
floca
Browse Repository
No Builds
No Audits
d98ebdfe759d Add preference page for node selection
Author
floca
Browse Repository
No Builds
No Audits
8953aa6160bf Removes stub tabs (history and favorites)
Author
floca
Browse Repository
No Builds
No Audits
2cbd7fc9e09f Switched QmitkNodeSelection to use services
Author
floca
Browse Repository
No Builds
No Audits
4836ab1cb232 Added service support for DataStorageInspectors
Author
floca
Browse Repository
No Builds
No Audits
867a28e037ee Added warning comment regarding T24348
Author
floca
Browse Repository
No Builds
No Audits
b86e6ce7cad0 Remove visibility checkbox from models
Author
floca
Browse Repository
No Builds
No Audits
8f5018d6e9d7 Add expand all to the tree inspector
Author
floca
Browse Repository
No Builds
No Audits
75620200ec39 Added simple tree model and a inspector using it
Author
floca
Browse Repository
No Builds
No Audits
62a552fa3300 Extracted TreeItem from QmitkDataStorageTreeModel to reuse it
Author
floca
Browse Repository
No Builds
No Audits
964d2440510a Correct AbstractDataStorageModel
Author
floca
Browse Repository
No Builds
No Audits
d488d15ac0a9 delete selection dialog directly after usage
Author
floca
Browse Repository
No Builds
No Audits
36bda3775814 fixed little typo
Author
floca
Browse Repository
No Builds
No Audits
71f232341e24 Added missing Q_OBJECT and fixed docu
Author
floca
Browse Repository
No Builds
No Audits
907e0e0c36ce Move new selection widgets to org.mitk.gui.qt.common
Author
floca
Browse Repository
No Builds
No Audits
663213c8e224 Renamed ViewWidgets to Inspectors to avoid confusion with other "view" types.
Author
floca
Browse Repository
No Builds
No Audits
01d233584365 Advanced draft of selection widgets (single / multi) Extended test plugin.
Author
floca
Browse Repository
No Builds
No Audits
893ef01313a3 Some minor improvments. Refactired EqualNodeSelection() as global function to…
Author
floca
Browse Repository
No Builds
No Audits
3cc3fdaf4774 fixed ViewWidget interfaces.
Author
floca
Browse Repository
No Builds
No Audits
f8613fb28c91 interim transfer
Author
floca
Browse Repository
No Builds
No Audits
744387d943ea Changed private function name to allow the use of the new Qt connect mechanism.
Author
floca
Browse Repository
No Builds
No Audits
d9f1492b4c8a Merge remote-tracking branch 'origin/T23749-Base-class-for-data-storage-viewer'…
Author
floca
Browse Repository
No Builds
No Audits
7985acefd7dc first draft for single slot selection
Author
floca
Browse Repository
No Builds
No Audits
39993e250f89 Add checkbox listener options.
Author
metzger
Browse Repository
No Builds
No Audits
9e11b76d928e Merge remote-tracking branch 'origin/T23749-Base-class-for-data-storage-viewer'…
Author
floca
Browse Repository
No Builds
No Audits
4a3b0a32ebfa Review suggestions: Separate mitkThrow() message for invalid model and view
Author
kalali
Browse Repository
No Builds
No Audits
7e7f34f80b87 Review suggestions: use data model from the given view; change slot/signal…
Author
kalali
Browse Repository
No Builds
No Audits
23a97e5aa475 Separate model-view selection and selection-bus selection
Author
kalali
Browse Repository
No Builds
No Audits
d61b682ec565 Merge branch 'T23752-Selection-connector-for-data-storage-view' into T23749…
Author
kalali
Browse Repository
No Builds
No Audits
4c37f9ec94f1 Add local selection handling to the selection-connector-class
Author
kalali
Browse Repository
No Builds
No Audits
9747e5db7e1a Change the provided abstract class to a model instead of a base widget
Author
kalali
Browse Repository
No Builds
No Audits
5bf61d3d9a17 Added suggestions from code review
Author
kalali
Browse Repository
No Builds
No Audits
7167ead2228a Test plugin to use the default list model with the selection connector class
Author
kalali
Browse Repository
No Builds
No Audits
dbd44030ccf1 Provide data storage selection connector to connect a concrete data storage…
Author
kalali
Browse Repository
No Builds
No Audits
d215acc1d25b Initial commit: Provide concrete default list view with default list model
Author
kalali
Browse Repository
No Builds
No Audits
03f08793da58 Minor bugs fixed
Author
kalali
Browse Repository
No Builds
No Audits
dab8aa4b04e1 T23749: Initial commit of the data storage viewer base class
Author
kalali
Browse Repository
No Builds
Audited

Changes (71)

Path

Size

Packages

Modules/

QtWidgets/

O3: MITK Reviewer Group II

include/

QmitkAbstractDataStorageInspector.h

O3: MITK Reviewer Group II

QmitkAbstractDataStorageModel.h

O3: MITK Reviewer Group II

QmitkDataStorageDefaultListModel.h

O3: MITK Reviewer Group II

QmitkDataStorageInspectorGenerator.h

O3: MITK Reviewer Group II

QmitkDataStorageInspectorProviderBase.h

O3: MITK Reviewer Group II

QmitkDataStorageInspectorProviderBase.tpp

O3: MITK Reviewer Group II

QmitkDataStorageListInspector.h

O3: MITK Reviewer Group II

QmitkDataStorageSimpleTreeModel.h

O3: MITK Reviewer Group II

QmitkDataStorageTreeInspector.h

O3: MITK Reviewer Group II

QmitkDataStorageTreeModel.h

O3: MITK Reviewer Group II

QmitkDataStorageTreeModelInternalItem.h

O3: MITK Reviewer Group II

QmitkIDataStorageInspectorProvider.h

O3: MITK Reviewer Group II

QmitkModelViewSelectionConnector.h

O3: MITK Reviewer Group II

src/

QmitkAbstractDataStorageInspector.cpp

O3: MITK Reviewer Group II

QmitkAbstractDataStorageModel.cpp

O3: MITK Reviewer Group II

QmitkDataStorageDefaultListModel.cpp

O3: MITK Reviewer Group II

QmitkDataStorageInspectorGenerator.cpp

O3: MITK Reviewer Group II

QmitkDataStorageListInspector.cpp

O3: MITK Reviewer Group II

QmitkDataStorageListInspector.ui

O3: MITK Reviewer Group II

QmitkDataStorageSimpleTreeModel.cpp

O3: MITK Reviewer Group II

QmitkDataStorageTreeInspector.cpp

O3: MITK Reviewer Group II

QmitkDataStorageTreeInspector.ui

O3: MITK Reviewer Group II

QmitkDataStorageTreeModel.cpp

O3: MITK Reviewer Group II

QmitkDataStorageTreeModelInternalItem.cpp

O3: MITK Reviewer Group II

QmitkIDataStorageInspectorProvider.cpp

O3: MITK Reviewer Group II

QmitkModelViewSelectionConnector.cpp

O3: MITK Reviewer Group II

mitkQtWidgetsActivator.cpp

O3: MITK Reviewer Group II

mitkQtWidgetsActivator.h

O3: MITK Reviewer Group II

Plugins/

PluginList.cmake

org.mitk.gui.qt.common/

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

src/

QmitkAbstractNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkAbstractNodeSelectionWidget.h

O1: MITK Reviewer Group I

QmitkMultiNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkMultiNodeSelectionWidget.h

O1: MITK Reviewer Group I

QmitkMultiNodeSelectionWidget.ui

O1: MITK Reviewer Group I

QmitkNodeSelectionButton.cpp

O1: MITK Reviewer Group I

QmitkNodeSelectionButton.h

O1: MITK Reviewer Group I

QmitkNodeSelectionDialog.cpp

O1: MITK Reviewer Group I

QmitkNodeSelectionDialog.h

O1: MITK Reviewer Group I

QmitkNodeSelectionDialog.ui

O1: MITK Reviewer Group I

QmitkNodeSelectionPreferenceHelper.cpp

O1: MITK Reviewer Group I

QmitkNodeSelectionPreferenceHelper.h

O1: MITK Reviewer Group I

QmitkSelectionServiceConnector.cpp

O1: MITK Reviewer Group I

QmitkSelectionServiceConnector.h

O1: MITK Reviewer Group I

QmitkSingleNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkSingleNodeSelectionWidget.h

O1: MITK Reviewer Group I

QmitkSingleNodeSelectionWidget.ui

O1: MITK Reviewer Group I

internal/

QmitkCommonActivator.cpp

O1: MITK Reviewer Group I

QmitkNodeSelectionConstants.cpp

O1: MITK Reviewer Group I

QmitkNodeSelectionConstants.h

O1: MITK Reviewer Group I

QmitkNodeSelectionPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkNodeSelectionPreferencePage.h

O1: MITK Reviewer Group I

QmitkNodeSelectionPreferencePage.ui

O1: MITK Reviewer Group I

org.mitk.gui.qt.datastorageviewertest

manifest_headers.cmake

DataStorageViewer_48.png

QmitkDataStorageViewerTestControls.ui

QmitkDataStorageViewerTestView.cpp

QmitkDataStorageViewerTestView.h

mitkPluginActivator.cpp

mitkPluginActivator.h

rMITKf1ff717fd9d1

Modules/QtWidgets/files.cmake

Loading...

Modules/QtWidgets/include/QmitkAbstractDataStorageInspector.h

Loading...

Modules/QtWidgets/include/QmitkAbstractDataStorageModel.h

Loading...

Modules/QtWidgets/include/QmitkDataStorageDefaultListModel.h

Loading...

Modules/QtWidgets/include/QmitkDataStorageInspectorGenerator.h

Loading...

Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h

Loading...

Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.tpp

Loading...

Modules/QtWidgets/include/QmitkDataStorageListInspector.h

Loading...

Modules/QtWidgets/include/QmitkDataStorageSimpleTreeModel.h

Loading...

Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h

Loading...

Modules/QtWidgets/include/QmitkDataStorageTreeModel.h

Loading...

Modules/QtWidgets/include/QmitkDataStorageTreeModelInternalItem.h

Loading...

Modules/QtWidgets/include/QmitkIDataStorageInspectorProvider.h

Loading...

Modules/QtWidgets/include/QmitkModelViewSelectionConnector.h

Loading...

Modules/QtWidgets/src/QmitkAbstractDataStorageInspector.cpp

Loading...

Modules/QtWidgets/src/QmitkAbstractDataStorageModel.cpp

Loading...

Modules/QtWidgets/src/QmitkDataStorageDefaultListModel.cpp

Loading...

Modules/QtWidgets/src/QmitkDataStorageInspectorGenerator.cpp

Loading...

Modules/QtWidgets/src/QmitkDataStorageListInspector.cpp

Loading...

Modules/QtWidgets/src/QmitkDataStorageListInspector.ui

Loading...

Modules/QtWidgets/src/QmitkDataStorageSimpleTreeModel.cpp

Loading...

Modules/QtWidgets/src/QmitkDataStorageTreeInspector.cpp

Loading...

Modules/QtWidgets/src/QmitkDataStorageTreeInspector.ui

Loading...

Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp

Loading...

Modules/QtWidgets/src/QmitkDataStorageTreeModelInternalItem.cpp

Loading...

Modules/QtWidgets/src/QmitkIDataStorageInspectorProvider.cpp

Loading...

Modules/QtWidgets/src/QmitkModelViewSelectionConnector.cpp

Loading...

Modules/QtWidgets/src/mitkQtWidgetsActivator.cpp

Loading...

Modules/QtWidgets/src/mitkQtWidgetsActivator.h

Loading...

Plugins/PluginList.cmake

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.common/resources/times.svg

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.h

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.h

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.ui

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionButton.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionButton.h

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.h

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.ui

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionPreferenceHelper.h

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkSelectionServiceConnector.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkSelectionServiceConnector.h

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h

Loading...

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.ui

Loading...

Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.h

Loading...

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp

Loading...

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.h

Loading...

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.ui

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.datastorageviewertest/resources/DataStorageViewer_48.png

Loading...

Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestControls.ui

Loading...

Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestView.cpp

Loading...

Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestView.h

Loading...

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

Loading...

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

Loading...