Changesets: Import 2017-06-07 23:51:09

master 67a342fd

2016-12-08 16:24:28

jcfr

Details Diff
STYLE: vtkSegmentation: Fix unused "targetRepresentationName" warning

Warning fixed is:

/path/to/Slicer/Libs/vtkSegmentationCore/vtkSegmentation.cxx:957:63: warning: unused parameter ‘targetRepresentationName’ [-Wunused-parameter]
bool vtkSegmentation::CreateRepresentation(const std::string& targetRepresentationName,
^
Fixes 0004305

Suggested-by: Csaba Pinter <csaba.pinter@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25597 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkSegmentationCore/vtkSegmentation.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentation.h Diff File
mod - Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationConversionParametersWidget.cxx Diff File

master 41ef45bc

2016-12-08 16:10:42

johan.andruejol

Details Diff
ENH: Add util methods for easier programming of python widgets

LoadUI() allows to create a widget from a .ui file and findChild() allows
quick access to a particular widget by name.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25596 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/CMakeLists.txt Diff File
add - Applications/SlicerApp/Testing/Python/Resources/UI/UtilTest.ui Diff File
mod - Applications/SlicerApp/Testing/Python/UtilTest.py Diff File
mod - Base/Python/slicer/util.py Diff File

master bfdce1bf

2016-12-08 16:09:27

johan.andruejol

Details Diff
ENH: Add util method to set and fit slice views in python

Also add testing for those methods.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25595 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/CMakeLists.txt Diff File
add - Applications/SlicerApp/Testing/Python/UtilTest.py Diff File
mod - Base/Python/slicer/util.py Diff File

master dee6335f

2016-12-08 15:44:29

jcfr

Details Diff
STYLE: vtkSegmentationCore: Fix sign-compare warnings

This commit fixes warnings like these ones:

/path/to/Slicer/Libs/vtkSegmentationCore/vtkSegmentationHistory.cxx: In static member function ‘static void vtkSegmentationHistory::OnSegmentationModified(vtkObject*, long unsigned int, void*, void*)’:
/path/to/Slicer/Libs/vtkSegmentationCore/vtkSegmentationHistory.cxx:368:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (self->LastRestoredState != self->SegmentationStates.size())
^

/path/to/Slicer/Libs/vtkSegmentationCore/vtkSegmentation.cxx: In member function ‘vtkSegment* vtkSegmentation::GetNthSegment(int) const’:
/path/to/Slicer/Libs/vtkSegmentationCore/vtkSegmentation.cxx:614:26: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (index < 0 || index >= this->SegmentIds.size())
^

vtkOrientedImageDataResample.cxx: In instantiation of ‘void MergeImageGeneric2(vtkImageData*, vtkImageData*, int, const int*, int, double) [with BaseImageScalarType = double; ModifierImageScalarType = long long unsigned int]’:
/path/to/Slicer/Libs/vtkSegmentationCore/vtkOrientedImageDataResample.cxx:209:5: required from ‘void MergeImageGeneric(vtkImageData*, vtkImageData*, int, const int*, int, double) [with BaseImageScalarType = double]’
/path/to/Slicer/Libs/vtkSegmentationCore/vtkOrientedImageDataResample.cxx:1032:5: required from here
/path/to/Slicer/Libs/vtkSegmentationCore/vtkOrientedImageDataResample.cxx:176:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (*modifierImagePtr > maskThreshold)
^

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25594 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkSegmentationCore/vtkOrientedImageDataResample.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentation.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentation.h Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentationHistory.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentationHistory.h Diff File

master d448b1c9

2016-12-08 15:31:46

jcfr

Details Diff
STYLE: ExtensionsManagerModel: Refactor to ease reuse of isExtensionCompatible

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25593 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx Diff File

master 10b41a79

2016-12-08 15:31:45

jcfr

Details Diff
STYLE: ExtensionsManagerModel: Fix typo in doxygen comments

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25592 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerExtensionsManagerModel.h Diff File

master 6d1f4bb8

2016-12-07 14:45:14

lassoan

Details Diff
ENH: Added ViewGroup property to view nodes

ViewGroup is used for restricting scope of:
* linked slice view property changes (is slices are linked, a property change will only change views in the same group)
* crosshair jump to slice (if crosshair is moved with shift+mousemove and slice jump is enabled, only those slices will be moved that are in the same group as the view where the mouse was)
* slice intersection display (slice intersections will only shown of those slices that are in the same group)

Implementation:
* Added new ViewGroup member to abstract view node (string, empty by default)
* In default layouts "Three over three" and "Four over four" separated top/bottom rows (view IDs changed to Red+, Yellow+, Green+, 1+; unique node IDs were necessary because on layout change view group is not updated, so we cannot share view nodes between layouts the same group ID for all views)
* Updated vtkMRMLSliceNode::JumpAllSlices to only jump those slices that have matching viewgroup
* Updated vtkMRMLSliceLinkLogic::OnMRMLNodeModified(vtkMRMLNode* node) to make aware of groups
* Updated slice displayable manager to only show slice intersections in the same group (and mapped in layout)
* Updated 2D/3D displayable managers to only jump those slices on crosshair update (shift+mousemove) that are in the same group
* Updated GUI:
** Added View group view/edit to View Controllers module (Advanced section).
** Added viewGroup property to simple markups widget (that can restrict slice jumping to a specific view group)
* Added crosshair jump slice speed test to PerformanceTests module

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25591 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLAbstractViewNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLAbstractViewNode.h Diff File
mod - Libs/MRML/Core/vtkMRMLSliceNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLSliceNode.h Diff File
mod - Libs/MRML/DisplayableManager/vtkMRMLModelSliceDisplayableManager.cxx Diff File
mod - Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.cxx Diff File
mod - Libs/MRML/Logic/vtkMRMLApplicationLogic.cxx Diff File
mod - Libs/MRML/Logic/vtkMRMLApplicationLogic.h Diff File
mod - Libs/MRML/Logic/vtkMRMLLayoutLogic.cxx Diff File
mod - Libs/MRML/Logic/vtkMRMLSliceLinkLogic.cxx Diff File
mod - Libs/MRML/Widgets/CMakeLists.txt Diff File
mod - Libs/MRML/Widgets/DesignerPlugins/CMakeLists.txt Diff File
add - Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewInformationWidgetPlugin.cxx Diff File
add - Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewInformationWidgetPlugin.h Diff File
mod - Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsPlugin.h Diff File
mod - Libs/MRML/Widgets/Resources/UI/qMRMLSliceInformationWidget.ui Diff File
add - Libs/MRML/Widgets/Resources/UI/qMRMLThreeDViewInformationWidget.ui Diff File
mod - Libs/MRML/Widgets/qMRMLSliceInformationWidget.cxx Diff File
mod - Libs/MRML/Widgets/qMRMLSliceInformationWidget.h Diff File
mod - Libs/MRML/Widgets/qMRMLSliceInformationWidget_p.h Diff File
add - Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget.cxx Diff File
add - Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget.h Diff File
add - Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget_p.h Diff File
mod - Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.cxx Diff File
mod - Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.cxx Diff File
mod - Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.h Diff File
mod - Modules/Loadable/Markups/Widgets/qSlicerSimpleMarkupsWidget.cxx Diff File
mod - Modules/Loadable/Markups/Widgets/qSlicerSimpleMarkupsWidget.h Diff File
mod - Modules/Loadable/ViewControllers/Resources/UI/qSlicerViewControllersModuleWidget.ui Diff File
mod - Modules/Loadable/ViewControllers/qSlicerViewControllersModuleWidget.cxx Diff File
mod - Modules/Loadable/ViewControllers/qSlicerViewControllersModuleWidget.h Diff File
mod - Modules/Scripted/PerformanceTests/PerformanceTests.py Diff File

master e9058a56

2016-12-07 14:45:00

lassoan

Details Diff
ENH: Moved clickAndDrag to slicer.util

It is more accessible there.
Removed duplicates of clickAndDrag in other modules, now all of them use the one in slicer.util.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25590 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/JRC2013Vis.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNAQuantTutorial.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNAVisTutorial.py Diff File
mod - Applications/SlicerApp/Testing/Python/slicerCloseCrashBug2590.py Diff File
mod - Base/Python/slicer/ScriptedLoadableModule.py Diff File
mod - Base/Python/slicer/util.py Diff File

master ec8d1ec1

2016-12-06 17:49:45

lassoan

Details Diff
BUG: Fixed SegmentEditor module after core changes

Segment color storage is moved to segmentation object from display node.
SegmentEditor had to be updated accordingly.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25589 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Segmentations/EditorEffects/Python/SegmentEditorAutoCompleteEffect.py Diff File
mod - Modules/Loadable/Segmentations/EditorEffects/Python/SegmentEditorThresholdEffect.py Diff File
mod - Modules/Loadable/Segmentations/Testing/Python/SegmentationsModuleTest1.py Diff File

master 3243d958

2016-12-06 10:31:07

pinter

Details Diff
ENH: Make recommendedColorFromTerminology method accessible from python

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25588 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Terminologies/Widgets/qSlicerTerminologyNavigatorWidget.h Diff File

master 79256be7

2016-12-06 08:47:41

pinter

Details Diff
BUG: Fixed failing qSlicerTerminologiesModuleGenericTest

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25587 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Terminologies/Logic/vtkSlicerTerminologiesModuleLogic.cxx Diff File
mod - Modules/Loadable/Terminologies/Widgets/qSlicerTerminologyNavigatorWidget.cxx Diff File

master fe4d3b02

2016-12-05 13:41:40

pinter

Details Diff
ENH: Add fractional labelmap conversion rules to segmentations

From: Kyle Sunderland <1krs1@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25586 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkSegmentationCore/CMakeLists.txt Diff File
mod - Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.cxx Diff File
add - Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.cxx Diff File
add - Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h Diff File
add - Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.cxx Diff File
add - Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h Diff File
mod - Libs/vtkSegmentationCore/vtkOrientedImageDataResample.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkOrientedImageDataResample.h Diff File
add - Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.cxx Diff File
add - Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.h Diff File
mod - Libs/vtkSegmentationCore/vtkSegmentationConverter.h Diff File
mod - Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.cxx Diff File
mod - Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.h Diff File
mod - Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager2D.cxx Diff File
mod - Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager2D.h Diff File

master 510a2164

2016-12-02 15:33:46

pinter

Details Diff
COMP: Fixed hastily committed code

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25585 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkSegmentationCore/vtkSegment.cxx Diff File

master 8852114a

2016-12-02 15:17:50

lassoan

Details Diff
ENH: Auto-select background/foreground volume for W/L change in slice viewer

If only foreground or background volume is selected then adjust the W/L of that.
If both foreground and background volumes are selected in a slice view:
* if foreground volume visibility is >0, and the user clicks on an area where the foreground volume is visible then the foreground volume's W/L is adjusted
* otherwise (e.g., user clicks outside the foreground volume) background volume's W/L is adjusted

This solves the frequent issue of users accidentally changing W/L of the invisible background volume (covered by foreground volume).
It also makes it easier to change W/L of foreground and background volumes (user doesn't need to swap the foreground/background volumes manually).

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25584 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/DisplayableManager/vtkSliceViewInteractorStyle.cxx Diff File
mod - Libs/MRML/DisplayableManager/vtkSliceViewInteractorStyle.h Diff File

master 3e1ec361

2016-12-02 15:17:41

lassoan

Details Diff
ENH: Added vtkMRMLSliceLogic::SetForegroundWindowLevel

Similar to existing vtkMRMLSliceLogic::SetBackgroundWindowLevel

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25583 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Logic/vtkMRMLSliceLogic.cxx Diff File
mod - Libs/MRML/Logic/vtkMRMLSliceLogic.h Diff File

master 0ed27f7c

2016-12-02 15:08:18

pinter

Details Diff
BUG: Fixed bug related to segment color update

Segment color did not update, if segmentation was loaded from the scene, and color was being changed twice or more.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25582 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkSegmentationCore/vtkSegment.cxx Diff File
mod - Libs/vtkSegmentationCore/vtkSegment.h Diff File
mod - Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager2D.cxx Diff File
mod - Modules/Loadable/Segmentations/Widgets/qMRMLSegmentsTableView.cxx Diff File

master 666ada9e

2016-12-02 11:20:15

pinter

Details Diff
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

master cf1a293f

2016-11-28 16:42:47

pinter

Details Diff
ENH: Create color table for labelmap when exporting segmentation

When the binary labelmap from a segmentation was exported to a labelmap node, the colors were not propagated. Now a color table node is created (or just updated if it existed and it was user type) for the labelmap, and so the labels have the same colors as the segments they came from.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25580 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.cxx Diff File

master a6dce4f1

2016-11-28 14:57:42

lassoan

Details Diff
ENH: Added access to labels and units in nrrd files

Standard nrrd fields, now exposed in vtkTeem.
These fields are needed for Sequences extension but can be useful for other modules, too.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25579 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkTeem/vtkNRRDReader.cxx Diff File
mod - Libs/vtkTeem/vtkNRRDReader.h Diff File
mod - Libs/vtkTeem/vtkNRRDWriter.cxx Diff File
mod - Libs/vtkTeem/vtkNRRDWriter.h Diff File

master ad7cd396

2016-11-26 14:21:14

pieper

Details Diff
STYLE: update DICOMExtensions

fixed hard tabs

From: Andrey Fedorov <andrey.fedorov@gmail.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25578 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/DICOM/DICOMExtensions.json Diff File

master 17471e48

2016-11-26 14:21:12

pieper

Details Diff
ENH: update DICOMExtensions

Added new entries for QuantitativeReporting, which supports Parametric Maps and
certain types of Structured Reports, in addition to DICOM.

Also "prettified" JSON formatting.

From: Andrey Fedorov <andrey.fedorov@gmail.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25577 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/DICOM/DICOMExtensions.json Diff File

master baba8cdf

2016-11-25 23:17:54

pinter

Details Diff
BUG: Fixed hang when loading DICOM SEG with incomplete terminology

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25576 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Terminologies/Logic/vtkSlicerTerminologiesModuleLogic.cxx Diff File

master 89b2ad60

2016-11-24 14:49:02

pinter

Details Diff
BUG: Fixed terminology serialization in segment tags

The "|" separator character was used both for separating tags and terminology entry codes. Terminology entry codes now use "~" instead, so the tags are loaded from file correctly

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25575 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Terminologies/Widgets/qSlicerTerminologyNavigatorWidget.cxx Diff File

master 2dfc50cb

2016-11-24 12:39:44

pinter

Details Diff
ENH: Added capability to load anatomical context from DICOM SEG descriptor

Needed for adding terminology-related anatomical region information from DICOM SEG loading. The DICOM plugin that employs this feature is currently located at https://github.com/QIICR/Reporting/blob/master/Py/DICOMSegmentationPlugin.py

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25574 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Terminologies/Logic/vtkSlicerTerminologiesModuleLogic.cxx Diff File
mod - Modules/Loadable/Terminologies/Logic/vtkSlicerTerminologiesModuleLogic.h Diff File
mod - Modules/Loadable/Terminologies/Widgets/qSlicerTerminologyNavigatorWidget.cxx Diff File
mod - Modules/Loadable/Terminologies/Widgets/qSlicerTerminologyNavigatorWidget.h Diff File
mod - Modules/Loadable/Terminologies/Widgets/qSlicerTerminologySelectorButton.h Diff File

master 5c5201e5

2016-11-23 17:01:40

pinter

Details Diff
ENH: More UI elements disabled in read-only segment editor widget

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25573 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Segmentations/Widgets/qMRMLSegmentEditorWidget.cxx Diff File
 First  Prev  1 2 3 ... 10 ... 17 18 19 20 21 22 23 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 110 ... 120 ... 130 ... 133 134 135  Next  Last