Import 2017-06-07 23:51:09: master 666ada9e

Diff Back to Repository
Author Committer Branch Timestamp Parent
pinter pinter master 2016-12-02 11:20:15 master cf1a293f
Changeset

ENH: Color member in vtkSegment is now used as main color information

vtkSegment::Color (renamed from DefaultColor) holds the displayed color information instead of the Color member in SegmentDisplayProperties in segmentation display node.
Also Color member in SegmentDisplayProperties is now renamed to OverrideColor, and it is only used if different color is needed to be shown in different views, otherwise it is kept unset (default SEGMENT_COLOR_NO_OVERRIDE values)

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25581 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLSegmentationDisplayNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLSegmentationDisplayNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLSegmentationStorageNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLSegmentationStorageNode.h Diff File
mod - Libs/vtkSegmentationCore/vtkSegment.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkSegment.h Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentation.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentation.h Diff File
mod - Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.cxx Diff File
mod - Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager2D.cxx Diff File
mod - Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager3D.cxx Diff File
mod - Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.cxx Diff File
mod - Modules/Loadable/Segmentations/Testing/Python/SegmentationsModuleTest1.py Diff File
mod - Modules/Loadable/Segmentations/Widgets/qMRMLSegmentsTableView.cxx Diff File