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

Search Browse Back to Index

master 54839d30

2015-06-17 11:44:41

jcfr

Details Diff 		STYLE: Editor-helperBox: Remove extraneous "applicationLogic" ivar

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24329 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 2c90ddad

2015-06-17 11:44:39

jcfr

Details Diff 		STYLE: Update Editor effects and tests to directly use EditUtil

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24328 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Markups/Testing/Python/NeurosurgicalPlanningTutorialMarkupsSelfTest.py Diff File
mod - Modules/Scripted/EditorLib/ChangeLabelEffect.py Diff File
mod - Modules/Scripted/EditorLib/FastMarchingEffect.py Diff File
mod - Modules/Scripted/EditorLib/IslandEffect.py Diff File
mod - Modules/Scripted/EditorLib/LabelEffect.py Diff File
mod - Modules/Scripted/EditorLib/MakeModelEffect.py Diff File
mod - Modules/Scripted/EditorLib/MorphologyEffect.py Diff File
mod - Modules/Scripted/EditorLib/PaintEffect.py Diff File
mod - Modules/Scripted/EditorLib/Testing/ThresholdThreadingTest.py Diff File
mod - Modules/Scripted/EditorLib/WatershedFromMarkerEffect.py Diff File

master aa71a55a

2015-06-17 11:44:35

jcfr

Details Diff 		STYLE: Editor-editUtil: Change EditUtil class method to be static

This simplifies the code avoiding to explicitly instantiate the EditUtil
class.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24327 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/Editor/Editor.py Diff File
mod - Modules/Scripted/EditorLib/EditBox.py Diff File
mod - Modules/Scripted/EditorLib/EditColor.py Diff File
mod - Modules/Scripted/EditorLib/EditOptions.py Diff File
mod - Modules/Scripted/EditorLib/EditUtil.py Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 801f018d

2015-06-17 11:44:32

jcfr

Details Diff 		ENH: Editor-helperBox: Simplify UI using node selector for merge volume

This commit uses a node selector to (1) display the current merge volume
name, (2) allow the user to select a different one and (3) create a new
one if needed.

By using a node selector, it simplifies the code by:
* removing the need for the "mergeName" HelperBox ivar
* removing the need for the "merge" HelperBox ivar and instead add a property
* removing the obsolete LabelSelectDialog dialog

Note that a custom "Create new " action is associated.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24326 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/CMakeLists.txt Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File
rm - Modules/Scripted/EditorLib/LabelSelectDialog.py Diff File

master ef6c0890

2015-06-17 11:44:30

jcfr

Details Diff 		STYLE: Editor-helperBox: Rename ivar "mergeFrame" to "mergeSelectorFrame"

Both "master" and "merge" frames are now consistently named

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24325 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 42a3b94b

2015-06-17 11:44:28

jcfr

Details Diff 		STYLE: Editor-helperBox: Refactor code introducing LabelSelectDialog

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24324 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/CMakeLists.txt Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File
add - Modules/Scripted/EditorLib/LabelSelectDialog.py Diff File

master 23558af6

2015-06-17 11:44:25

jcfr

Details Diff 		STYLE: Editor-helperBox: Refactor code introducing LabelCreateDialog

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24323 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/CMakeLists.txt Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File
add - Modules/Scripted/EditorLib/LabelCreateDialog.py Diff File

master de15a687

2015-06-17 11:44:23

jcfr

Details Diff 		STYLE: Editor-helperBox: Rename "colorSelect" into "labelCreate"

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24322 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master abb94b3a

2015-06-17 11:44:21

jcfr

Details Diff 		STYLE: Editor-helperBox: Move "propagateVolumeSelection" to EditUtil

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24321 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/EditUtil.py Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 5386c175

2015-06-17 11:44:19

jcfr

Details Diff 		STYLE: Editor-helperBox: Add "getNodeByName()" to slicer.util and rename it

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24320 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Python/slicer/util.py Diff File
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master d28ebcc5

2015-06-17 11:44:16

jcfr

Details Diff 		STYLE: Editor-helperBox: Simplify code reusing "slicer.util.errorDisplay()"

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24319 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 332a5f4b

2015-06-17 11:44:14

jcfr

Details Diff 		STYLE: Editor-helperBox: Simplify code removing "items" ivar

Since r24228 (ENH: Update CTK to include new PythonQt C++/Python ownership
tracking feature), keeping track of locally instantiated QStandardItem is
not needed anymore.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24318 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 0b354971

2015-06-17 11:44:12

jcfr

Details Diff 		STYLE: Editor-helperBox: Remove unused "brushes" ivar

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24317 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 543f6cf7

2015-06-17 11:44:10

jcfr

Details Diff 		STYLE: Editor-helperBox: Remove unused code

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24316 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 31da56ef

2015-06-17 11:44:08

jcfr

Details Diff 		STYLE: Editor-Effect: Specify event using vtk.vtkCommand instead of string

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24315 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/Effect.py Diff File

master 296db6f3

2015-06-17 11:44:06

jcfr

Details Diff 		BUG: Editor: Do not call virtual method "setMRMLDefaults" in constructor

Virtual method should not be called from __init__ method. This commit
ensures that (1) the method in the leaf class will be called and
(2) the MRML defaults are effectively set.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24314 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/EditBox.py Diff File
mod - Modules/Scripted/EditorLib/EditOptions.py Diff File

master d8636f8c

2015-06-17 11:44:04

jcfr

Details Diff 		STYLE: Editor-helperBox: Refactor code introducing "mergeVolumePostfix" ivar

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24313 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/HelperBox.py Diff File

master 0105f41f

2015-06-17 11:44:02

jcfr

Details Diff 		ENH: Expose qMRMLNodeComboBox::addMenuAction to python

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

master e7aa578b

2015-06-17 11:44:00

jcfr

Details Diff 		ENH: MRMLNodeComboBox - Support custom behavior for default action

If a given default action (Add, Remove, Edit or Rename) is disabled, it
is now possible to add a custom action with a similar name. This will
allow to implement customize behavior.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24311 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Widgets/Testing/qMRMLNodeComboBoxTest8.cxx Diff File
mod - Libs/MRML/Widgets/qMRMLNodeComboBox.cxx Diff File
mod - Libs/MRML/Widgets/qMRMLNodeComboBox_p.h Diff File

master 2d682868

2015-06-17 11:43:57

jcfr

Details Diff 		BUG: VTKObservationMixin: Fix removeObservers method and add unittests

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

master a8356bb2

2015-06-16 15:45:01

jcfr

Details Diff 		COMP: Update Slicer, CTK and BRAINSTools to fix outdated builds on VS2012

High-level build did not build external projects in VS2012. The BUILD_ALWAYS flag is a relatively new CMake feature (added in 3.1), therefore the following workaround was added into SuperBuild.cmake:

# This custom external project step forces the build and later
# steps to run whenever a top level build is done...
ExternalProject_Add_Step(${proj} forcebuild
COMMAND ${CMAKE_COMMAND} -E remove
${CMAKE_CURRENT_BINARY_DIR}/Slicer-prefix/src/Slicer-stamp/Slicer-build
COMMENT "Forcing build step for '${proj}'"
DEPENDEES build
ALWAYS 1
)

This does not work with Visual Studio, where the stamp file is in Debug/Release/etc. subdirectory:
${CMAKE_CURRENT_BINARY_DIR}/Slicer-prefix/src/Slicer-stamp/${CMAKE_CFG_INTDIR}/Slicer-build

Co-authored-by:

// ----------------
Update CTK to integrate similar fix:

git shortlog fd3a2b1..9e5af26 --no-merges
Andras Lasso (1):
Fixed outdated builds on VS2012

Andreas Fetzer (1):
Update ctk user password for central.xnat.org, which was expired

Sascha Zelzer (1):
Provide an explicit resolve operation for plug-ins.


// ----------------
Update BRAINSTools to integrate similar fix:

$ git shortlog 0dd3268..30f43a7 --no-merges
Andras Lasso (1):
COMP: Fixed outdated builds on VS2012

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

master c132a382

2015-06-16 01:04:53

lassoan

Details Diff 		BUG: Fixed DataProbe startup error

On Slicer built using VS2012 the following line fails:

qSize = qt.QSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Expanding)

Traceback (most recent call last):
File "<console>", line 1, in <module>
ValueError: Could not find matching overload for given arguments:
(7, 7)
The following slots are available:
QSizePolicy() -> QSizePolicy
QSizePolicy(QSizePolicy other) -> QSizePolicy
QSizePolicy(QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical, QSizePolicy::ControlType type) -> QSizePolicy
QSizePolicy(QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical) -> QSizePolicy

This functionally equivalent few lines are more verbose but they work well:

qSize = qt.QSizePolicy()
qSize.setHorizontalPolicy(qt.QSizePolicy.Expanding)
qSize.setVerticalPolicy(qt.QSizePolicy.Expanding)


git-svn-id: http://svn.slicer.org/Slicer4/trunk@24308 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/DataProbe/DataProbe.py Diff File

master 37a36891

2015-06-13 17:49:53

alexy

Details Diff 		BUG: 3857. Fixed scalar display on fibers.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24307 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/TractographyDisplay/MRML/vtkMRMLFiberBundleDisplayNode.cxx Diff File

master 9dce0519

2015-06-12 08:50:52

pieper

Details Diff 		ENH: update volume rendering descriptions, remove out of date info

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24306 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/VolumeRendering/Documentation/VolumeRendering.xml Diff File

master 767c5d3d

2015-06-10 22:04:23

lassoan

Details Diff 		BUG: Fixed crash on scene close due to missing null-pointer check

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24305 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLDisplayNode.cxx Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 67 68 69 70 71 72 73 ... 80 ... 90 ... 100 ... 110 ... 120 ... 130 ... 133 134 135  Next  Last