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

master 8f875644

2017-04-03 11:28:55

pinter

Details Diff
STYLE: Updated subject hierarchy tooltip and help text

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25897 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDefaultPlugin.cxx Diff File
mod - Modules/Scripted/DICOMLib/SubjectHierarchyPlugins/qSlicerSubjectHierarchyDICOMPlugin.cxx Diff File

master a8ef6385

2017-04-03 11:23:15

pinter

Details Diff
ENH: Removed explicit level member from subject hierarchy item

The reason for this is that level was somewhat confusing: all items for data nodes had series level by default, but it was not explicitly specified what it caused, and also the role of subseries level was unclear. Moreover as level was a member, it was expected to be non-empty, however in some cases it was not useful
Level is still available and used, but it's now a subject hierarchy item attribute, which is not mandatory. Convenience functions were preserved for level getting, setting, and checking, and added for creating patient, study, and folder items. So level argument was removed from functions where it was not useful, and the code is now a bit simpler

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25896 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyCorePluginsSelfTest.py Diff File
mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyGenericSelfTest.py Diff File
mod - Libs/MRML/Core/vtkMRMLSubjectHierarchyConstants.h Diff File
mod - Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.h Diff File
mod - Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.cxx Diff File
mod - Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.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/Testing/Cxx/vtkSlicerSubjectHierarchyModuleLogicTest.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyModel.cxx 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/qSlicerSubjectHierarchyFolderPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyFolderPlugin.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyParseLocalDataPlugin.h Diff File
mod - Modules/Scripted/DICOMLib/DICOMPlugin.py Diff File
mod - Modules/Scripted/DICOMLib/SubjectHierarchyPlugins/qSlicerSubjectHierarchyDICOMPlugin.cxx Diff File
mod - Modules/Scripted/DICOMLib/SubjectHierarchyPlugins/qSlicerSubjectHierarchyDICOMPlugin.h Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMExportDialog.cxx Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMExportDialog.h Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMTagEditorWidget.cxx Diff File

master 14292f78

2017-03-31 12:26:29

pinter

Details Diff
BUG: Fixed randomizing order of dropped items in subject hierarchy

If multiple items were selected, and drag&dropped under a new parent, the order of the items under the new parent was randomized (to reproduce it was enough to load several MRHeads, drop them under a study in one move, then invoking DICOM export on the study - the items were in random order). Now it is fixed, and the order is preserved. Code complexity also decreased slightly.

Also style fix in terminology logic, and minor fix in DICOM export dialog UI

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25895 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyModel.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyModel_p.h Diff File
mod - Modules/Loadable/Terminologies/Logic/vtkSlicerTerminologiesModuleLogic.cxx Diff File
mod - Modules/Scripted/DICOMLib/Widgets/Resources/UI/qSlicerDICOMExportDialog.ui Diff File

master b171786f

2017-03-31 09:07:11

pinter

Details Diff
BUG: Fixed CLI subject hierarchy crash with no reference node

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

master c356108b

2017-03-30 14:18:59

pieper

Details Diff
BUG: update CTK with dicom fix

Exceptions thrown from ctk could cause spurious
errors, for example when checking for extensions.
This fix causes CTK to always return a usable
result to no error checking is needed in slicer.

https://github.com/commontk/CTK/issues/706

From: Steve Pieper <pieper@isomics.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25893 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_CTK.cmake Diff File

master 18a17001

2017-03-29 20:37:33

lassoan

Details Diff
BUG: Fixed vtkOrientedImageData::GetExtent

In some cases, component 1, 3, 5 of vtkOrientedImageData was incorrectly computed as -1.

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

master a101c64a

2017-03-29 16:42:01

pinter

Details Diff
BUG: Subject hierarchy tree view programmatic selection setting fixed

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25891 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyModel.h Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyTreeView.cxx Diff File

master 4605982f

2017-03-29 13:15:34

pinter

Details Diff
BUG: Fixed color model header labels

Regression caused by https://github.com/Slicer/Slicer/pull/657

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

master 53307674

2017-03-29 11:36:06

pinter

Details Diff
BUG: Delete branch dialog in SH only appears if more than one item is deleted

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

master 9473e0e9

2017-03-29 11:34:13

pinter

Details Diff
ENH: Importing exported DICOM back to database is made optional

When DICOM data was exported, the written files were imported back to the database every time. It is a lengthy operation, and as it is not needed in every case, it needed to be made optional. A checkbox has been added to the export dialog, the state of which is stored in application settings to keep the option across sessions. It is off by default to make exporting fast.

Also, fixes were made in the export of the whole scene.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25888 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyPluginLogic.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModuleWidget.cxx Diff File
mod - Modules/Scripted/DICOMLib/DICOMExportScene.py Diff File
mod - Modules/Scripted/DICOMLib/Widgets/Resources/UI/qSlicerDICOMExportDialog.ui Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMExportDialog.cxx Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMExportDialog.h Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMTagEditorWidget.cxx Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMTagEditorWidget.h Diff File

master b1e0144f

2017-03-28 21:01:56

jcfr

Details Diff
BUG: Fix indent in ExecutionModelTourTest input MRML scene

This commit fixes the source files conflicts reported on the dashboard by
updating the input file to account for changes introduced
by r25870 (STYLE: Indentation related changes)

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25887 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Testing/Data/Input/ExecutionModelTourTest.mrml Diff File

master 4249bcea

2017-03-28 17:27:51

lassoan

Details Diff
ENH: Updated CTK to latest version

Contains ctkFittedTextBrowser API improvements for collapsible text display.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25886 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_CTK.cmake Diff File

master 888a7501

2017-03-28 14:37:17

pieper

Details Diff
COMP: avoid undefined symbol in Qt5 with Q_ASSERT

Apparently in Qt4 built in release mode Q_ASSERT is a noop in
release mode so the compiler never sees the variable.
But Qt5 there is a compile error about missing variable 'd'.

From: Steve Pieper <pieper@isomics.com>

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

master cf734f91

2017-03-28 12:20:06

pinter

Details Diff
ENH: Improved subject hierarchy tree view controls

- Space bar toggles visibility of selected items
- Up/down arrow keys trigger selection actions (highlighting, plugin handler member updates - this was a bug)

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

master 8e5d924d

2017-03-28 12:11:06

pieper

Details Diff
BUG: superscript 2 in string in units label can cause crash

Confirmed crash on Qt5.7 on both windows and mac builds.
Crash occurred when looking up model index for node
combo box of units settings panel. The same code
worked in Qt4, but may have been causing undetected
memory issue. Memory corruption is strongly implicated
in the Qt5 crash because addition of debug statements would
in some cases bypass the crash.

Co-authored-by: Andras Lasso <lasso@queensu.ca>
Co-authored-by: Csaba Pinter <csaba.pinter@queensu.ca>

From: Steve Pieper <pieper@isomics.com>

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

master b3f89209

2017-03-28 04:21:03

jcfr

Details Diff
ENH: CircleCI: Attempt to reduce used memory switching from -j5 to -j3

Suggested-by: Matt McCormick <matt.mccormick@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25882 3bd1e089-480b-0410-8dfb-8563597acbee
mod - circle.yml Diff File

master 39e5a684

2017-03-28 03:54:09

jcfr

Details Diff
STYLE: Add ScriptedEditorEffect to SlicerGenerateExtensionTemplates

This commit adds "ScriptedEditorEffect" to the list of templates
considered when executing the SlicerGenerateExtensionTemplates target.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25881 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerExtensionTemplatesGenerator.cmake Diff File
add - Extensions/EditorExtensionTemplate.s4ext Diff File
mod - Extensions/Testing/EditorExtensionTemplate/CMakeLists.txt Diff File
mod - Extensions/Testing/EditorExtensionTemplate/EditorExtensionTemplate.png Diff File
add - Utilities/Templates/Modules/ScriptedEditorEffect/CMakeLists.txt Diff File
add - Utilities/Templates/Modules/ScriptedEditorEffect/TemplateKeyEffect.png Diff File
add - Utilities/Templates/Modules/ScriptedEditorEffect/TemplateKeyEffect.py Diff File
add - Utilities/Templates/Modules/ScriptedEditorEffect/Testing/CMakeLists.txt Diff File

master 668d7bbf

2017-03-28 03:54:05

jcfr

Details Diff
BUG: ExtensionWizard: Support --templateKey type param in upper or lower case

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25880 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Utilities/Scripts/SlicerWizard/TemplateManager.py Diff File

master a665b13c

2017-03-28 03:54:03

jcfr

Details Diff
STYLE: Add ScriptedSegmentEditorEffect to SlicerGenerateExtensionTemplates

This commit adds "ScriptedSegmentEditorEffect" to the list of templates
considered when executing the SlicerGenerateExtensionTemplates target.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25879 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerExtensionTemplatesGenerator.cmake Diff File
add - Extensions/ScriptedSegmentEditorEffectExtensionTemplate.s4ext Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/CMakeLists.txt Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectExtensionTemplate.png Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectModuleTemplate/CMakeLists.txt Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectModuleTemplate/SegmentEditorScriptedSegmentEditorEffectModuleTemplate.py Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectModuleTemplate/SegmentEditorScriptedSegmentEditorEffectModuleTemplateLib/CMakeLists.txt Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectModuleTemplate/SegmentEditorScriptedSegmentEditorEffectModuleTemplateLib/SegmentEditorEffect.png Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectModuleTemplate/SegmentEditorScriptedSegmentEditorEffectModuleTemplateLib/SegmentEditorEffect.py Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectModuleTemplate/SegmentEditorScriptedSegmentEditorEffectModuleTemplateLib/__init__.py Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectModuleTemplate/Testing/CMakeLists.txt Diff File
add - Extensions/Testing/ScriptedSegmentEditorEffectExtensionTemplate/ScriptedSegmentEditorEffectModuleTemplate/Testing/Python/CMakeLists.txt Diff File

master 00f2eb3b

2017-03-28 03:53:59

jcfr

Details Diff
STYLE: Consolidate Extensions/Testing with Utilities/Templates

This commit backports the changes directly made to scriped loadable module
template in "Extensions/Testing" in r25357 (ENH: Make it simpler to add doc
link to Python scripted modules) into the corresponding template living in
"Templates/Modules/Scripted".

It then integrates the changes obtained after re-running the
SlicerGenerateExtensionTemplates target.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25878 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/CLIExtensionTemplate/CMakeLists.txt Diff File
mod - Extensions/Testing/LoadableExtensionTemplate/CMakeLists.txt Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/CMakeLists.txt Diff File
mod - Utilities/Templates/Modules/Scripted/TemplateKey.py Diff File

master fb97ce10

2017-03-27 17:57:43

pinter

Details Diff
ENH: Enabled tractography labelmap option in subject hierarchy plugin

Also fixed minor issues: node names are now unique when exporting segmentation to labelmap or models from subject hierarchy, and fixed Qt slot warning in volumes SH plugin

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25877 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.cxx Diff File
mod - Modules/Loadable/Volumes/SubjectHierarchyPlugins/qSlicerSubjectHierarchyDiffusionTensorVolumesPlugin.cxx Diff File
mod - Modules/Loadable/Volumes/SubjectHierarchyPlugins/qSlicerSubjectHierarchyVolumesPlugin.cxx Diff File
mod - Modules/Loadable/Volumes/SubjectHierarchyPlugins/qSlicerSubjectHierarchyVolumesPlugin.h Diff File

master 264694b7

2017-03-27 16:31:48

pinter

Details Diff
ENH: Added labelmap and model export options to SH for segmentations

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25876 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Segmentations/Resources/UI/qSlicerSegmentationsModule.ui Diff File
mod - Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.cxx Diff File
mod - Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.h Diff File
mod - Modules/Loadable/Segmentations/Widgets/qMRMLSegmentEditorWidget.cxx Diff File
mod - Modules/Loadable/Segmentations/qSlicerSegmentationsModuleWidget.cxx Diff File

master 471c00b3

2017-03-27 14:10:20

lassoan

Details Diff
ENH: Display thumbnails in SampleData module

It makes the module nicer and the button easier to hit.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25875 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/SampleData/CMakeLists.txt Diff File
add - Modules/Scripted/SampleData/Resources/Icons/BaselineVolume.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/CTACardio.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/CTChest.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/DTIBrain.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/DTIVolume.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/MRBrainTumor1.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/MRBrainTumor2.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/MRHead.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/MRProstate.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/Panoramix-cropped.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/PreDentalSurgery.png Diff File
add - Modules/Scripted/SampleData/Resources/Icons/dwi.png Diff File
mod - Modules/Scripted/SampleData/SampleData.py Diff File

master 2f221be1

2017-03-27 13:45:04

pinter

Details Diff
ENH: Indicate master volume in Segmentations module and make selections

A label shows the master (reference) volume in the Segmentations module under the selected segmentation node, and the combobox of the reference volume for exporting to labelmap is populated

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25874 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkSegmentationCore/vtkSegmentation.cxx Diff File
mod - Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.cxx Diff File
mod - Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.h Diff File
mod - Modules/Loadable/Segmentations/Resources/UI/qSlicerSegmentationsModule.ui Diff File
mod - Modules/Loadable/Segmentations/qSlicerSegmentationsModuleWidget.cxx Diff File
mod - Modules/Loadable/Segmentations/qSlicerSegmentationsModuleWidget.h Diff File

master 7a170f80

2017-03-26 23:22:02

lassoan

Details Diff
ENH: Added single snapshot option to ScreenCapture

If "single" toggle button is pressed then only a single image of the current state is captured (with filename auto-increment).

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25873 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/ScreenCapture/ScreenCapture.py Diff File
 First  Prev  1 2 3 ... 5 6 7 8 9 10 11 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 110 ... 120 ... 130 ... 133 134 135  Next  Last