Changesets: Slicer

Search Browse Back to Index

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

2014-01-27 18:15:40

jcfr

Details Diff 		ENH: slicer.util - Add convenience methods resetThreeDViews/resetSliceViews

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

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

2014-01-27 16:33:51

jcfr

Details Diff 		BUG: Fix convenience method slicer.util.modulePath introduced in r22851

Since "eval" is executed in the context where it is called, the 'slicer'
module should be imported.

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

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

2014-01-27 09:29:57

jcfr

Details Diff 		ENH: MRMLLayoutManager - Add methods to all slice or 3D views

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

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

2014-01-27 09:29:54

jcfr

Details Diff 		ENH: slicer.util - Add convenience method "modulePath(moduleName)"

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

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

2014-01-24 04:03:31

jcfr

Details Diff 		BUG: Fix "Reload and Test" function

While commit r22839 re-factored the code associated with "Reload" function,
it also made the "Reload and Test" function fails.

This commit fixes the issue by setting the "<moduleName>" key into
the global dictionary of the reloaded module so that it can be
referenced in the "onReloadAndTest()" function.

Note that the overall approach to reload modules could be revisited to
leverage either the "rollback importer" method or a more sophisticated one
like the "python-reloader" [2][3]

Thanks to "Csaba Pinter <csaba.pinter@queensu.ca>" for reporting the issue.

[1] http://pyunit.sourceforge.net/notes/reloading.html
[2] http://www.indelible.org/ink/python-reloading/
[3] https://github.com/jparise/python-reloader

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22850 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/AtlasTests.py Diff File
mod - Applications/SlicerApp/Testing/Python/Charting.py Diff File
mod - Applications/SlicerApp/Testing/Python/FiducialLayoutSwitchBug1914.py Diff File
mod - Applications/SlicerApp/Testing/Python/JRC2013Vis.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNA2012ProstateDemo.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/ScenePerformance.py Diff File
mod - Applications/SlicerApp/Testing/Python/SliceLinkLogic.py Diff File
mod - Applications/SlicerApp/Testing/Python/Slicer4Minute.py Diff File
mod - Applications/SlicerApp/Testing/Python/ViewControllersSliceInterpolationBug1926.py Diff File
mod - Applications/SlicerApp/Testing/Python/fiber_visibility_crash2438.py Diff File
mod - Applications/SlicerApp/Testing/Python/labelToggleBug2049.py Diff File
mod - Applications/SlicerApp/Testing/Python/sceneImport2428.py Diff File
mod - Applications/SlicerApp/Testing/Python/slicerCloseCrashBug2590.py Diff File
mod - Applications/SlicerApp/Testing/Python/test_tractography_display.py Diff File
mod - Base/Python/slicer/util.py Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/ScriptedLoadableModuleTemplate.py Diff File
mod - Modules/Loadable/CropVolume/Testing/Python/CropVolumeSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/AddManyMarkupsFiducialTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/MarkupsInCompareViewersSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/NeurosurgicalPlanningTutorialMarkupsSelfTest.py Diff File
mod - Modules/Loadable/VolumeRendering/Testing/Python/VolumeRenderingSceneClose.py Diff File
mod - Modules/Scripted/DataProbe/DataProbe.py Diff File
mod - Modules/Scripted/SurfaceToolbox/SurfaceToolbox.py Diff File

2145-support-for-installing-extension-from-file 0b1b8340

2014-01-24 04:03:06

jcfr

Details Diff 		BUG: slicer.util.reloadScriptedModule - Ensure cleanup function can be called

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

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

2014-01-24 04:03:01

jcfr

Details Diff 		STYLE: slicer.util.reloadScriptedModule - Reorganized code comments

Minimize confusion by associating a single comment with each section
of code.

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

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

2014-01-24 01:00:39

jcfr

Details Diff 		ENH: Update SlicerExecutionModel - Add ParameterSerializer support

$ git shortlog 9202673..6956eb2b
Jean-Christophe Fillion-Robin (3):
Merge pull request 0000020 from thewtex/parameter-serializer
Merge pull request 0000022 from thewtex/find-jsoncpp
Merge pull request 0000023 from thewtex/export-dep

Matt McCormick (5):
ENH: Add GENERATE_TCLAP_ASSIGNMENT_IFSET generation.
ENH: Add ParameterSerializer support.
ENH: Add FindJsonCpp.cmake.
BUG: Export the JsonCpp include directories in SlicerExecutionModelConfig.cmake.
BUG: include ParameterSerializerConfig.cmake in SlicerExecutionModelConfig.cmake.

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

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

2014-01-23 23:24:18

jcfr

Details Diff 		ENH: Add method allowing to install extension archive given its path
mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx Diff File
mod - Base/QTCore/qSlicerExtensionsManagerModel.h Diff File

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

2014-01-23 19:07:39

finetjul

Details Diff 		COMP: Fix compilation error with ITKv3

MakeOutput expects a DataObjectPointerArraySizeType and not an integer.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22846 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationMethod.txx Diff File

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

2014-01-23 19:07:37

finetjul

Details Diff 		BUG: Fix crash in vtkMRMLAnnotationDisplayableManager

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

2145-support-for-installing-extension-from-file 71edb98f

2014-01-23 13:58:54

fedorov

Details Diff 		ENH: set the multivolume loadable name as requested by the caller


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

2145-support-for-installing-extension-from-file 5d561045

2014-01-23 12:14:31

fedorov

Details Diff 		BUG: fix incorrect function name in MultiVolumeImporter


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

2145-support-for-installing-extension-from-file 62d9181e

2014-01-20 15:54:44

jcfr

Details Diff 		COMP: DashboardDriver: Introduce SVN_REPOSITORY variable

By default the variable is set to:

http://svn.slicer.org/${CTEST_PROJECT_NAME}

If needed, the variable SVN_REPOSITORY can also be set prior to include
the driver script.

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

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

2014-01-20 15:42:06

jcfr

Details Diff 		COMP: DashboardDriver: Expect MIDAS_PACKAGE_URL if packaging is enabled

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

2145-support-for-installing-extension-from-file 37206b5e

2014-01-19 10:19:43

jcfr

Details Diff 		STYLE: In reloadScriptedModule - Use 'with' statement to open file

See http://freepythontips.wordpress.com/2014/01/15/the-open-function-explained/

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

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

2014-01-19 02:59:22

jcfr

Details Diff 		ENH: Factor out scripted module reload function into 'slicer.util'

At least two versions of the code were used to reload a scripted module
were existing. This commit add the most recent version into
the function 'slicer.util.reloadScriptedModule' and update the
Slicer modules to use it.

Note that since not all module implements the 'cleanup' function,
an additional test has been added to check if the method is available.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22839 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/AtlasTests.py Diff File
mod - Applications/SlicerApp/Testing/Python/Charting.py Diff File
mod - Applications/SlicerApp/Testing/Python/FiducialLayoutSwitchBug1914.py Diff File
mod - Applications/SlicerApp/Testing/Python/JRC2013Vis.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNA2012ProstateDemo.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/ScenePerformance.py Diff File
mod - Applications/SlicerApp/Testing/Python/SliceLinkLogic.py Diff File
mod - Applications/SlicerApp/Testing/Python/Slicer4Minute.py Diff File
mod - Applications/SlicerApp/Testing/Python/ViewControllersSliceInterpolationBug1926.py Diff File
mod - Applications/SlicerApp/Testing/Python/fiber_visibility_crash2438.py Diff File
mod - Applications/SlicerApp/Testing/Python/labelToggleBug2049.py Diff File
mod - Applications/SlicerApp/Testing/Python/sceneImport2428.py Diff File
mod - Applications/SlicerApp/Testing/Python/slicerCloseCrashBug2590.py Diff File
mod - Applications/SlicerApp/Testing/Python/test_tractography_display.py Diff File
mod - Base/Python/slicer/util.py Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/ScriptedLoadableModuleTemplate.py Diff File
mod - Modules/Loadable/CropVolume/Testing/Python/CropVolumeSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/AddManyMarkupsFiducialTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/MarkupsInCompareViewersSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/NeurosurgicalPlanningTutorialMarkupsSelfTest.py Diff File
mod - Modules/Loadable/VolumeRendering/Testing/Python/VolumeRenderingSceneClose.py Diff File
mod - Modules/Scripted/DataProbe/DataProbe.py Diff File
mod - Modules/Scripted/SurfaceToolbox/SurfaceToolbox.py Diff File

2145-support-for-installing-extension-from-file 38905c90

2014-01-19 00:13:42

jcfr

Details Diff 		COMP: Fix VTK external project to work correctly with Ninja generator

Use the variable 'CMAKE_MAKE_PROGRAM' instead of the undocumented variable
MAKECOMMAND.

For more details referers to CMake commits kitware/CMake@4ac75fdf [1] and
kitware/CMake@4cce44b [2]

This is know to work with:
- Ninja 1.4.0
- CMake 2.8.12.1

[1] http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ac75fdf
[2] http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cce44b

The error was:

// ---------------
FAILED: cd /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build/VTK-build && /home/jchris/Support/cmake-2.8.11.2/bin/cmake -DMAKE_COMMAND= -P /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build/VTK_build_step.cmake && /home/jchris/Support/cmake-2.8.11.2/bin/cmake -E touch /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build/VTK-prefix/src/VTK-stamp/VTK-build
CMake Error at /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build/VTK_build_step.cmake:5 (message):
error: MAKE_COMMAND is not set !
// ---------------

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

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

2014-01-18 23:48:59

jcfr

Details Diff 		COMP: Fix 'ninja' build error specifying 'make' command to build OpenSSL.

Since OpenSSL build system doesn't provide ninja files, it is important
to explicitly specify that it should be built using ninja.

Error was the following:

[7/9] Performing build step for 'Slicer'
FAILED: cd /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build && /home/jchris/Support/cmake-2.8.11.2/bin/cmake --build /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build --config . && /home/jchris/Support/cmake-2.8.11.2/bin/cmake -E touch /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/CMake/Superbuild/Slicer-cmake/src/Slicer-stamp/Slicer-build
ninja: error: build.ninja:726: bad $-escape (literal $ must be written as $$)

ninja: build stopped: subcommand failed.

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

2145-support-for-installing-extension-from-file 6ff4314a

2014-01-18 23:02:59

jcfr

Details Diff 		COMP: Build test CLIs only if BUILD_TESTING is ON

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

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

2014-01-18 13:24:45

fedorov

Details Diff 		ENH: use a sort procedure based on numbers instead of alphanumeric. Fixes issue
3487. Fix contributed by Yanlling Liu.


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

2145-support-for-installing-extension-from-file 997d5eb3

2014-01-17 18:00:28

jcfr

Details Diff 		COMP: Fix parallel build associating patch step with "python-source" project

It is not clear why associating the PATCH_COMMAND with the python
project caused issue when doing parallel build using Ninja on Windows.
The patch step was executed before the download of python could finish.

This commit "resolves" the problem by associated the patch command
with the python source project.

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

2145-support-for-installing-extension-from-file 8244dd11

2014-01-17 15:57:24

jcfr

Details Diff 		COMP: Tweak python external project to use CMAKE_CFG_INTDIR only when needed

This commit doesn't change the outcome of the current build process. It
simply re-organize the code to minimize confusion.

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

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

2014-01-17 15:57:21

jcfr

Details Diff 		COMP: Ensure OpenSSL libs can be referenced with single-config generator

When building Slicer on windows, the OpenSSL libraries are
available for both Debug and Release in a single package.

This commit ensure that the library can also be referenced when building
on windows in the case a single config CMake generator like Ninja is used.

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

2145-support-for-installing-extension-from-file 60d3dbe8

2014-01-17 10:53:02

jcfr

Details Diff 		COMP: Python ExternalProject - Fix configure warnings, consistent symlinks

$ git shortlog 892c95b5..82e1494
Jean-Christophe Fillion-Robin (3):
Merge branch '26-create-installed-python-executable-symlinks'
Escape double-quote in ConfigureChecks to fix CMake 2.8.12.1 warnings.
Merge branch '32-fix-cmake2.8.12.1-configure-warning'

Will Dicharry (1):
Create versioned symlinks on install to match autoconf python install.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22831 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_python.cmake Diff File
 First  Prev  1 2 3 4 5 6 7 ... 10 ... 20 ... 30 ... 40 ... 50 ... 55 56 57  Next  Last