Import 2017-06-07 23:51:09: master 9e34b647

Diff Back to Repository
Author Committer Branch Timestamp Parent
pinter pinter master 2014-07-28 18:06:04 master 41ee3bdf
Affected Issues 0003714: Multiple Subject nodes with study - fail to reparent study
Changeset

BUG: Subject hierarchy UI update issues fixed
Fixes 0003714

  • qMRMLSceneSubjectHierarchyModel::nodeIndex rewritten to generate correct indices, parentNode also fixed. Workarounds removed
  • New subject hierarchy nodes get simpler names
  • Setting icons is not so simple as it should be due to a bug in Qt (https://bugreports.qt-project.org/browse/QTBUG-20248), which raises the need to check if the icon to be set is the same as the current icon of an item. This introduces one more thing to remember to the developer. Thus, instead of having the plugins set icons on items, they just return it (or an empty one), and the model does the check. This way developing plugins is not harder than before.
  • Changed copyright information in all subject hierarchy files
  • Instead of having the potential nodes list on the bottom of the module, those nodes are shown in the subject hierarchy tree on the top-level without icons. They can be shown/hidden with a checkbox under the tree, and can be handled the same way as in the potential list before.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23489 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.cxx Diff File
mod - Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.h Diff File
mod - Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.cxx Diff File
mod - Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Logic/vtkSlicerSubjectHierarchyModuleLogic.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Logic/vtkSlicerSubjectHierarchyModuleLogic.h Diff File
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyConstants.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyConstants.h Diff File
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyNode.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyNode.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Resources/UI/qSlicerSubjectHierarchyModule.ui Diff File
mod - Modules/Loadable/SubjectHierarchy/Testing/Cxx/vtkSlicerSubjectHierarchyModuleLogicTest.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qMRMLPotentialSubjectHierarchyListViewPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qMRMLPotentialSubjectHierarchyListViewPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qMRMLSubjectHierarchyTreeViewPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qMRMLSubjectHierarchyTreeViewPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qSlicerSubjectHierarchyModuleWidgetsAbstractPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qSlicerSubjectHierarchyModuleWidgetsAbstractPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qSlicerSubjectHierarchyModuleWidgetsPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLPotentialSubjectHierarchyListView.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLPotentialSubjectHierarchyListView.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLScenePotentialSubjectHierarchyModel.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLScenePotentialSubjectHierarchyModel.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLScenePotentialSubjectHierarchyModel_p.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSceneSubjectHierarchyModel.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSceneSubjectHierarchyModel.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSceneSubjectHierarchyModel_p.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSortFilterPotentialSubjectHierarchyProxyModel.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSortFilterPotentialSubjectHierarchyProxyModel.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSortFilterSubjectHierarchyProxyModel.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSortFilterSubjectHierarchyProxyModel.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyTreeView.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyTreeView.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLTransformItemDelegate.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLTransformItemDelegate.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyAbstractPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyAbstractPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyChartsPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyChartsPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyCloneNodePlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyCloneNodePlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDICOMPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDICOMPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDefaultPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDefaultPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyParseLocalDataPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyParseLocalDataPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyPluginHandler.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyPluginHandler.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyRegisterPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyRegisterPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModule.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModule.h Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModuleWidget.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModuleWidget.h Diff File
mod - Modules/Loadable/Volumes/SubjectHierarchyPlugins/qSlicerSubjectHierarchyVolumesPlugin.cxx Diff File
mod - Modules/Loadable/Volumes/SubjectHierarchyPlugins/qSlicerSubjectHierarchyVolumesPlugin.h Diff File