Changesets: Slicer

2145-support-for-installing-extension-from-file a665ca8a

2013-09-21 22:44:49

jcfr

Details Diff
ENH: Skip loading of loadable python module if loadable module are disabled

Before this commit even after disabling the loading of loadable module
the python module corresponding to "logic", "Widgets, "displayable
manager" and "mrml" where still imported. This commit prevent this.

Note that if a given loadable module is disabled with the application
settings the associated python modules will still be imported.

Ideally python module should be imported on a per module basis as it is
done for extension. This will be possible only after python module specific
to a loadable module are located in dedicated directory. This is
somewhat related to issue 0001365

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22463 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Python/slicer/moduledm/__init__.py Diff File
mod - Base/Python/slicer/modulelogic/__init__.py Diff File
mod - Base/Python/slicer/modulemrml/__init__.py Diff File
mod - Base/Python/slicer/modulewidget/__init__.py Diff File

2145-support-for-installing-extension-from-file 815612f6

2013-09-20 19:42:39

pieper

Details Diff
BUG: avoid python error messages when path is not yet set in Endoscopy

This is triggered by some signals being emitted during the building
of the module widget.

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

2145-support-for-installing-extension-from-file 679c35a0

2013-09-20 12:57:21

alexy

Details Diff
BUG: 3404. Check invalid label range in the Logic that seeds fibers rather than in the parameter node.

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

2145-support-for-installing-extension-from-file 7dbc9258

2013-09-20 10:01:27

alexy

Details Diff
BUG: 3403. Fixed logic for AND operation in FiberBundleLabelSelect module

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22460 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/CLI/FiberBundleLabelSelect/FiberBundleLabelSelect.cxx Diff File

2145-support-for-installing-extension-from-file 3e9d0a8c

2013-09-19 15:41:11

pohl

Details Diff
ENH: added new functionality - see detailed message in Slicer3 commit r17037

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

2145-support-for-installing-extension-from-file 28f59f77

2013-09-19 13:43:30

naucoin

Details Diff
BUG: fix crash on exit for py_MarkupsSceneViewRestoreTestManyLists

On some runs of the py_MarkupsSceneViewRestoreTestManyLists test, the
volume rendering displayable manager would trigger a segmentation
fault when it was being deleted on exit. It came from requesting
a render after setting and observing the NULL displayable node.
Added a test for a null node and if true don't request a render.
Tested via the GUI and ran the volume rendering tests.



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

2145-support-for-installing-extension-from-file 0311b046

2013-09-18 20:15:06

jcfr

Details Diff
COMP: Easier extension build checking environment for midas_package_* vars

When doing extension experimental build, having to systematically passing
the option -DMIDAS_PACKAGE_EMAIL:STRING=<email> and
-DMIDAS_PACKAGE_API_KEY:STRING=<api_key> was tedious.

After this commit, the build system will first check if corresponding
variables are set in the environment.

On unix system, the variables could be set in the ~/.bash_aliases file
using the following syntax:

export MIDAS_PACKAGE_EMAIL=YOUR_EMAIL
export MIDAS_PACKAGE_API_KEY=YOUR_API_KEY

On windows, you could follow these instructions:
http://www.nextofwindows.com/how-to-addedit-environment-variables-in-windows-7/

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22457 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/UseSlicer.cmake.in Diff File
mod - Extensions/CMake/CMakeLists.txt Diff File

2145-support-for-installing-extension-from-file ba0f39d5

2013-09-18 15:00:44

pohl

Details Diff
BUG: All my tests now pass and resolves 0003381

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

2145-support-for-installing-extension-from-file a655167b

2013-09-18 12:19:17

jcfr

Details Diff
COMP: Fix launch of Slicer-real on MacOSX adding rpath to libarchive

Fixes 0003189

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

2145-support-for-installing-extension-from-file 05751cc8

2013-09-17 23:21:57

jcfr

Details Diff
COMP: Fix superbuild when using Xcode 5.0 or Xcode 5.0 command line tools

Xcode no longer ships with MacOSX10.7.sdk (or earlier) from version 5.0,
which is the most recent version specified in
CMake/SlicerBlockSetCMakeOSXVariables.cmake. Therefore the superbuild
fails when attempted to build Python and NumPy due to a missing version
number or SDK location. Manually setting CMAKE_OSX_DEPLOYMENT_TARGET
to 10.8 and CMAKE_OSX_SYSROOT to ${SDK_ROOT}/MacOSX10.8.sdk or
editing SlicerBlockSetCMakeOSXVariables.cmake fixes the issue.

Fixes 0003402

From: Jamie Snape <jamie.snape@kitware.com>

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

2145-support-for-installing-extension-from-file 4731372f

2013-09-16 23:55:43

jcfr

Details Diff
BUG: Fix Slicer crash on DTIVolume reload after scene is closed.

Handle the case when newVolumeDispalyNode is NULL in setMRMLVolumeNode().
Fixes 0003380

From: Yuzheng Zhou <yuzheng.zhou@kitware.com>

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

2145-support-for-installing-extension-from-file a76dd488

2013-09-16 22:57:24

jcfr

Details Diff
BUG: Fix EMSegment test "EMSeg_MRML_DiffReadWriteNodes"

Update EMSegment project to account for backward incompatible changes
made in r22310

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

2145-support-for-installing-extension-from-file fb8e315d

2013-09-16 20:59:15

jcfr

Details Diff
COMP: Fix CTKConfig.cmake to properly set _{LIBRARY,INCLUDE}_DIRS variable

For example, within CTKConfig.cmake:

* Before this commit:

[...]
set(CTKVisualizationVTKCore_LIBRARY_DIRS "VTK_LIBRARY_DIRS;/path/to/VTK-build/bin")
[...]

set(CTKVisualizationVTKWidgets_INCLUDE_DIRS
[...]
"/path/to/CTK-build/Libs/Core;"
"/path/to/CTK/Libs/Visualization/VTK/Core;
"/path/to/CTK-build/CTK-build/Libs/Visualization/VTK/Core;"
"VTK_INCLUDE_DIRS;"
"/path/to/VTK-build;"
"/path/to/VTK-build/Common;"
[...]
)

* After this commit:

[...]
set(CTKVisualizationVTKCore_LIBRARY_DIRS "/path/to/VTK-build/bin")
[...]

set(CTKVisualizationVTKWidgets_INCLUDE_DIRS
[...]
"/path/to/CTK-build/Libs/Core;"
"/path/to/CTK/Libs/Visualization/VTK/Core;
"/path/to/CTK-build/CTK-build/Libs/Visualization/VTK/Core;"
"/path/to/VTK-build;"
"/path/to/VTK-build/Common;"
[...]
)

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

2145-support-for-installing-extension-from-file c3122a09

2013-09-16 16:18:14

naucoin

Details Diff
BUG: fix error on start up from SurfaceToolbox

Add in import string to fix start up error when
trying to load the SurfaceToolbox scriptable module:

Traceback (most recent call last):
File "/projects/birn/nicole/Slicer42/Slicer4-SuperBuild-Debug/Slicer-build/lib/Slicer-4.3/qt-scripted-modules/SurfaceToolbox.py", line 11, in __init__
parent.helpText = string.Template("""
NameError: global name 'string' is not defined



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

2145-support-for-installing-extension-from-file 9b613a9e

2013-09-13 18:36:00

naucoin

Details Diff
BUG: finish steps for the Neurosurgical Planning Tutorial

Added the editor steps and label map seeding.
Added the screen capture functionality to the template file.

Issue 0003328



git-svn-id: http://svn.slicer.org/Slicer4/trunk@22432 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/ScriptedLoadableModuleTemplate.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/NeurosurgicalPlanningTutorialMarkupsSelfTest.py Diff File

2145-support-for-installing-extension-from-file 66471e81

2013-09-13 14:47:10

naucoin

Details Diff
BUG: add missing StartPlaceMode method

Laurent's extension was using the Annotation module logic
StartPlaceMode call and it wasn't working. Added it to
Markups logic and debugged it to work to set the mouse
mode to place Markup fiducials. Added a return boolean
to check success. Updated testing.



git-svn-id: http://svn.slicer.org/Slicer4/trunk@22431 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.cxx Diff File
mod - Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.h Diff File
mod - Modules/Loadable/Markups/Testing/Cxx/vtkSlicerMarkupsLogicTest1.cxx Diff File

2145-support-for-installing-extension-from-file ffbef7d5

2013-09-12 17:57:38

jcfr

Details Diff
COMP: Allow extension to easily use "SlicerMacroExtractRepositoryMacro"

As consequence the code within the Reporting will be simplified and
duplicated macro will be removed.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22430 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/UseSlicer.cmake.in Diff File

2145-support-for-installing-extension-from-file 445008df

2013-09-12 17:57:36

jcfr

Details Diff
BUG: Set module name / objectName in GenericTests

In addition to be consistent with what is done in the "instantiateModule"
method of the "qSlicerAbstractModuleFactoryManager".

It also ensure that the "ModuleShareDirectory" set in the "logic" method
of the "qSlicerAbstractCoreModule" class is done using the expected
value for the module name.

This will allow generic tests instantiating module using
"GetModuleShareDirectory" method to get the correct value (i.e Reporting
module)

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22429 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTGUI/Testing/Cxx/qSlicerModuleGenericTest.cxx.in Diff File
mod - Base/QTGUI/Testing/Cxx/qSlicerModuleWidgetGenericTest.cxx.in Diff File

2145-support-for-installing-extension-from-file a52bdf66

2013-09-11 18:54:41

jcfr

Details Diff
COMP: Simplify editor extension template

This is a follow up of commit r22067 [1] where it should have been done
as described in r22063 [2].

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22428 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/EditorExtensionTemplate/CMakeLists.txt Diff File

2145-support-for-installing-extension-from-file 323d9a4c

2013-09-11 18:54:39

jcfr

Details Diff
COMP: Update Editor extension template to use scripted module macro

Discussion: http://slicer-devel.65872.n3.nabble.com/Issues-with-Editor-effect-extension-td4029730.html

Fixes 0003392

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22427 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/EditorExtensionTemplate/EditorEffectTemplate/CMakeLists.txt Diff File

2145-support-for-installing-extension-from-file 1de0ecd8

2013-09-11 18:18:00

jcfr

Details Diff
BUG: Add close button to "About dialog". Fixes 0003172

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22426 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Resources/UI/qSlicerAppAboutDialog.ui Diff File
mod - Applications/SlicerApp/qSlicerAppAboutDialog.cxx Diff File

2145-support-for-installing-extension-from-file 302b3eeb

2013-09-10 23:20:18

jcfr

Details Diff
BUG: Fix memory mgt in PythonQt, ENH: Config of dicom log level from python

// ---------------------------------------

CTK Commits:

Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Tue Sep 10 04:27:56 2013 -0400

Re-factor ctkDICOMUtil to be consistent with ctkUtil

Add the methods dicomLogLevel and setDICOMLogLevel to "ctk" namespace

Update PythonQt external project to include fix allowing to wrap
QFlags.

The DICOM log level can be set from python doing:

>>> import ctk
>>> ctk.ctk.dicomLogLevel()
16
>>> ctk.ctk.dicomLogLevelAsString()
u'Info'
>>> ctk.ctk.setDICOMLogLevel(ctk.ctkErrorLogLevel.Critical)
>>> ctk.ctk.dicomLogLevel()
256
>>> ctk.ctkErrorLogLevel.logLevelAsString(ctk.ctk.dicomLogLevel())
u'Critical'
>>> ctk.ctkErrorLogLevel.logLevelAsString(32)
u'Warning'
>>> ctk.ctk.setDICOMLogLevel(64)
>>> ctk.ctk.dicomLogLevelAsString()
u'Error'

commit 637da4b68ed93741a4c8cf73b406d66986dbe864
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Tue Sep 10 04:12:10 2013 -0400

Define ctkErrorLogLevel::logLevelAsString as static for easier re-use

Explicitly add associated decorator. See code comment for explanation.

commit 8542108ef7d15a39d4d302aa64f4ecc2d15bf3e5
Author: Isaiah Norton <inorton@bwh.harvard.edu>
Date: Wed Aug 28 11:20:31 2013 -0400

Add ctkDICOMUtil and ::setDICOMLogLevel helper

This function allows to set the DICOM log level for
diagnostic purposes.

// ---------------------------------------

PythonQt commits:


commit e1f1c77d9675c3c5fb1cba19d2a32ace483eda2c
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Tue Sep 10 02:49:23 2013 -0400

Revert part of r91 preventing QFlags from being wrapped

By checking if an enum member has already been cached it is not required
anymore to skip it if is a QFlags.

Additionally, the wrapping of QFlags can now be done by using
only Q_FLAGS without having a corresponding Q_ENUMS.

commit 5d5600c4d3134e69b51442a58b58e14c7fd47e54
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Tue Sep 10 02:36:26 2013 -0400

Add CMake testing support

Disabled by default to keep behavior consistent with previous
CMake'ified version.


[...]

commit 7af5c8a4d2194db388ac67f340e3f555e02fea78
Author: florianlink <florianlink@ea8d5007-eb21-0410-b261-ccb3ea6e24a9>
Date: Wed Jul 3 14:54:20 2013 +0000

improved wrapper check to avoid crashes on virtual methods while python object gets deleted

git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@245 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

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

2145-support-for-installing-extension-from-file 02aafa88

2013-09-10 16:19:28

naucoin

Details Diff
STYLE: update Annotatons module documentation for 4.3

Removed references to fiducials as they've been moved into the Markups module.



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

2145-support-for-installing-extension-from-file 85233d50

2013-09-10 12:18:02

naucoin

Details Diff
BUG: Fix missing conversion of fiducials in scene views

Annotation fiducials in scene view scenes were coming up as unsaved in the Save
data dialog when loaded from a scene with scene views where only the current
scene had had it's fiducials conerted to markups. This was due to the change
Alex made to save data that only appears in scene views, so added in
iterating over the current scene and scene views when converting fiducials.
Added in looking for end scene restore events in the GUI so that it will
be updated properly even if there wasn't an active place node id in the saved scene view.
Expanded the AddNewFiducialNode method to support adding to a passed in scene so
that the converted markups can be added to the scene view scenes.

Issue 0003296



git-svn-id: http://svn.slicer.org/Slicer4/trunk@22423 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.cxx Diff File
mod - Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.h Diff File
mod - Modules/Loadable/Markups/qSlicerMarkupsModuleWidget.cxx Diff File
mod - Modules/Loadable/Markups/qSlicerMarkupsModuleWidget.h Diff File

2145-support-for-installing-extension-from-file 9b7e0253

2013-09-10 12:11:17

naucoin

Details Diff
BUG: fixing a Markups merge error for the active place node

The more general activePlaceNodeID is to be used instead of a specific
Annotations or Markups variable name.

Fixed while working on issue 0003296 for the 4.3.1 release.



git-svn-id: http://svn.slicer.org/Slicer4/trunk@22422 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLSelectionNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLSelectionNode.h Diff File
 First  Prev  1 2 3 ... 10 ... 12 13 14 15 16 17 18 ... 20 ... 30 ... 40 ... 50 ... 55 56 57  Next  Last