Changesets: Slicer
|
2145-support-for-installing-extension-from-file c9b1e89b 2013-04-17 10:19:28 Details Diff |
BUG: 0003076 make sure scalar range is updated after edit operations. This new method unifies the updating of the image data and volume node to trigger rendering. By calling modified on the point scalars, this GetScalarRange call returns the correct data. http://na-mic.org/Bug/view.php?id=3076 This is confirmed by looking at the results of the call after editing in new colors as shown below. >>> l = getNode('*label') >>> l (vtkMRMLScalarVolumeNode)0x131766ba8 >>> l.GetImageData().GetScalarRange() (0.0, 15.0) >>> l.GetImageData().GetScalarRange() (0.0, 18.0) >>> git-svn-id: http://svn.slicer.org/Slicer4/trunk@21892 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/EditorLib/EditUtil.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/Effect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/FastMarchingEffect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/HelperBox.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/LabelEffect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/PaintEffect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/ThresholdEffect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/WandEffect.py | Diff File | ||
|
2145-support-for-installing-extension-from-file 9d396cb1 2013-04-16 13:09:03 Details Diff |
BUG: Fix import of Tkinter and Fix compilation errors on VS 2010 and 2012 Updated CMake'ified python external project to include the following topics: * 60ee828 - Merge branch 'add-lib-tk-to-pythonpath' * 8a3c51a - Merge branch '8-add-ctestconfig' * 22a0870 - Merge branch 'fix-msvc2012-build-error' * a70729f - Merge branch 'fix-msvc2012-link-error' See https://github.com/davidsansome/python-cmake-buildsystem/pull/13 Fixes python-cmake-buildsystem issue 13 See http://www.na-mic.org/Bug/view.php?id=3065 Fixes 0003065 git-svn-id: http://svn.slicer.org/Slicer4/trunk@21891 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_python.cmake | Diff File | ||
|
2145-support-for-installing-extension-from-file c28c241a 2013-04-16 13:09:01 Details Diff |
COMP: Set "Slicer_LANGUAGES" global property only if i18n support is enabled Prevent confusion and make global property definition consistent. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21890 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
|
2145-support-for-installing-extension-from-file b679eea9 2013-04-16 13:08:59 Details Diff |
STYLE: Remove extra space in CMakeLists.txt git-svn-id: http://svn.slicer.org/Slicer4/trunk@21889 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
|
2145-support-for-installing-extension-from-file 9e5e1921 2013-04-16 10:23:59 Details Diff |
STYLE: Fix casing of CMake macro add_subdirectory See http://www.slicer.org/slicerWiki/index.php/Documentation/Nightly/Developers/Style_Guide/CMake git-svn-id: http://svn.slicer.org/Slicer4/trunk@21888 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Extensions/Testing/CLIExtensionTemplate/CLIModuleTemplate/Testing/CMakeLists.txt | Diff File | ||
| mod - Extensions/Testing/SuperBuildExtensionTemplate/SuperCLIModuleTemplate/Testing/CMakeLists.txt | Diff File | ||
|
2145-support-for-installing-extension-from-file cda2a6c7 2013-04-12 16:05:26 naucoin Details Diff |
BUG: Fix saving of models from GrayscaleModelMaker When the models were being read back into Slicer by the vtkSlicerApplicationLogic, it would check first if .vtk was a supported read type in the FreeSurfer model storage node. Due to a copy/paste error in that class, it's SupportedReadFileTypes string array was empty, which was interpreted as supporting all types and the application logic would assign a FS model storage node to it. Because the SupportedWriteFileTypes array was initialised with the supported read file types, the grey scale model would come up in the save dialog as being able to be written in FS formats. It's a known interoperability issue that the FS model storage node doesn't support writing FS formats, so the storage node inhertis from the model storage node superclass's list of supported write types and uses it's WriteDataInternal to save FS models as .vtk files. Changes: Initialize the SupportedReadFileTypes string array with just FS model file types. Removed .vtk and .vtp as supported read types, Slicer should default to a regular model storage node for those files. Fixed some debugging string print outs. Issue 0003036 git-svn-id: http://svn.slicer.org/Slicer4/trunk@21887 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLFreeSurferModelStorageNode.cxx | Diff File | ||
|
2145-support-for-installing-extension-from-file 03752112 2013-04-12 15:26:46 Details Diff |
COMP: Use ${VTK_LIBRARIES} instead of vtkCommon. Forwards-compatibility with VTK6. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21886 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/CLI/CMakeLists.txt | Diff File | ||
|
2145-support-for-installing-extension-from-file 06764e1c 2013-04-11 13:20:35 Details Diff |
BUG: fixed compile error from the previous commit. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21885 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/Testing/vtkMRMLDisplayableNodeTest1.cxx | Diff File | ||
|
2145-support-for-installing-extension-from-file 058fb8e4 2013-04-10 22:50:30 Details Diff |
BUG: 3060. Replaced the use of vtkMRMLDisplayableNode::DisplayNodes with vtkMRMLDisplayableNode::GetDisplayNodes() git-svn-id: http://svn.slicer.org/Slicer4/trunk@21884 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLDisplayableNode.cxx | Diff File | ||
| mod - Libs/MRML/Core/vtkMRMLDisplayableNode.h | Diff File | ||
|
2145-support-for-installing-extension-from-file 6aaec9c4 2013-04-09 18:19:31 naucoin Details Diff |
STYLE: avoid print out of nodes not found on start up Took out the call to update the widget from mrml on init, it gets called from setMRMLScene which is when it should be updated. Swapped warning for debug print outs as not having interaction or selection nodes is not an error case. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21883 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/qSlicerMouseModeToolBar.cxx | Diff File | ||
|
2145-support-for-installing-extension-from-file addc3c91 2013-04-09 15:34:33 naucoin Details Diff |
ENH: Implement feature 0002918, fiducial projection on 2D slice plane From: Laurent Chauvin <lchauvin@bwh.harvard.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@21882 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Annotations/GUI/qSlicerAnnotationModulePropertyDialog.cxx | Diff File | ||
| mod - Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationDisplayNode.cxx | Diff File | ||
| mod - Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationDisplayNode.h | Diff File | ||
| mod - Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLineDisplayNode.cxx | Diff File | ||
| mod - Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLineDisplayNode.h | Diff File | ||
| mod - Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationPointDisplayNode.cxx | Diff File | ||
| mod - Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationPointDisplayNode.h | Diff File | ||
| mod - Modules/Loadable/Annotations/MRMLDisplayableManager/vtkMRMLAnnotationDisplayableManager.cxx | Diff File | ||
| mod - Modules/Loadable/Annotations/MRMLDisplayableManager/vtkMRMLAnnotationDisplayableManagerHelper.cxx | Diff File | ||
| mod - Modules/Loadable/Annotations/MRMLDisplayableManager/vtkMRMLAnnotationDisplayableManagerHelper.h | Diff File | ||
| mod - Modules/Loadable/Annotations/Resources/UI/qSlicerAnnotationModulePropertyDialog.ui | Diff File | ||
| mod - Modules/Loadable/Annotations/Widgets/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Annotations/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin.cxx | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin.h | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationRulerProjectionPropertyWidgetPlugin.cxx | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationRulerProjectionPropertyWidgetPlugin.h | Diff File | ||
| mod - Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsPlugin.h | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/Resources/UI/qMRMLAnnotationFiducialProjectionPropertyWidget.ui | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/Resources/UI/qMRMLAnnotationRulerProjectionPropertyWidget.ui | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/qMRMLAnnotationFiducialProjectionPropertyWidget.cxx | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/qMRMLAnnotationFiducialProjectionPropertyWidget.h | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/qMRMLAnnotationRulerProjectionPropertyWidget.cxx | Diff File | ||
| add - Modules/Loadable/Annotations/Widgets/qMRMLAnnotationRulerProjectionPropertyWidget.h | Diff File | ||
|
2145-support-for-installing-extension-from-file fbcdfd8a 2013-04-09 11:32:30 Details Diff |
BUG: Save tree before the batch processing starts and restore after it ends Saving the tree expansion state now happens before batch processing starts and the consequent restoration happens after batch processing ends. This prevents handling tree when the scene is in an inconsistent state during the batch processing task. BUG: Make sure scene tree save/restore happens during lazy update only git-svn-id: http://svn.slicer.org/Slicer4/trunk@21881 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLSceneModel.cxx | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLSceneModel.h | Diff File | ||
|
2145-support-for-installing-extension-from-file ad2fd67d 2013-04-09 11:32:29 Details Diff |
BUG: Make sure the node is present before saving in a collection While updating the scene, the tree view hierarchy was being saved. This causes segfaults when updateScene is called after closing the scene or deleting nodes. Check if the nodes are still present before saving them to collection. Fixes issue 2557. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21880 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLTreeView.cxx | Diff File | ||
|
2145-support-for-installing-extension-from-file 696a9d0d 2013-04-08 18:24:13 Details Diff |
COMP: Force python build to Release After updating Slicer build system to use CMake'ified python (r21863), Windows debug build started to fail complaining that there was an "Invalid solution configuration" Since CMake'ified python currently force its build type to Release [1], this explained the error message. To make sure the command associated with python external project works as expected, this commit overwrite the value CMAKE_CFG_INTDIR before adding the python external project and restore it afterward. [1] https://github.com/davidsansome/python-cmake-buildsystem/commit/3bcf841e28b255e62562e1dcc93a347bdbc78f1a See http://na-mic.org/Mantis/view.php?id=3056 Fixes 0003056 git-svn-id: http://svn.slicer.org/Slicer4/trunk@21879 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_python.cmake | Diff File | ||
|
2145-support-for-installing-extension-from-file 2873be66 2013-04-08 11:50:03 Details Diff |
ENH: updated baseline, removed unnecessary files, updated CMakeLists.txt to use the compressed baseline. See 0003034. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21878 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/CLI/N4ITKBiasFieldCorrection/Data/Baseline/he3biasfield.nii.gz | Diff File | ||
| rm - Modules/CLI/N4ITKBiasFieldCorrection/Data/Baseline/he3corrected.1.nii | Diff File | ||
| rm - Modules/CLI/N4ITKBiasFieldCorrection/Data/Baseline/he3corrected.nii | Diff File | ||
| add - Modules/CLI/N4ITKBiasFieldCorrection/Data/Baseline/he3corrected.nii.gz | Diff File | ||
| mod - Modules/CLI/N4ITKBiasFieldCorrection/Testing/CMakeLists.txt | Diff File | ||
|
2145-support-for-installing-extension-from-file 1c9d40dc 2013-04-06 12:09:34 Details Diff |
ENH: Enhancement to Tractography Display and ROI selection: Fiber selected by default, ROI interactive mode and visibility exposed, other minor UI improvements git-svn-id: http://svn.slicer.org/Slicer4/trunk@21877 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/TractographyDisplay/Widgets/Resources/UI/qSlicerTractographyEditorROIWidget.ui | Diff File | ||
| mod - Modules/Loadable/TractographyDisplay/Widgets/qMRMLTractographyDisplayTreeView.cxx | Diff File | ||
| mod - Modules/Loadable/TractographyDisplay/Widgets/qSlicerTractographyDisplayWidget.cxx | Diff File | ||
| mod - Modules/Loadable/TractographyDisplay/Widgets/qSlicerTractographyEditorROIWidget.cxx | Diff File | ||
| mod - Modules/Loadable/TractographyDisplay/Widgets/qSlicerTractographyEditorROIWidget.h | Diff File | ||
|
2145-support-for-installing-extension-from-file a3fae374 2013-04-05 20:40:18 Details Diff |
BUG: fix spurious warning message If there had been no study added in the past month, a string format operation would fail and generate a warning. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21876 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DICOM/DICOMLib/DICOMWidgets.py | Diff File | ||
|
2145-support-for-installing-extension-from-file d947e5ef 2013-04-05 20:23:32 Details Diff |
ENH: for issue 0003002 fix eyedropper Make sure all label effects have an instance of their logic class and that the allow the superclass to optionally process keystrokes and other events (this allows the eyedropper operation to work). See keystroke list here: http://wiki.slicer.org/slicerWiki/index.php/Documentation/Nightly/Modules/Editor#Keystrokes git-svn-id: http://svn.slicer.org/Slicer4/trunk@21875 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Extensions/Testing/EditorExtensionTemplate/EditorEffectTemplate/EditorEffectTemplate.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/ChangeIslandEffect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/Effect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/LevelTracingEffect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/PaintEffect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/RectangleEffect.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/WandEffect.py | Diff File | ||
|
2145-support-for-installing-extension-from-file 836629b9 2013-04-05 18:32:16 Details Diff |
BUG: 0002932, 0003001, 0003002 Several improvements to the editor. 0002932 - new Pixel Mode in Paint tool allows precise control when zoomed in close to the image. Add a set of hotkeys per 0003002 for editor-wide functions, also new +/- control on the paint brush to adjust size while it is active. Per 0003002 if a master and merge volumes already have been selected, don't reset them when entering the editor. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21874 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/Editor/Editor.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/EditUtil.py | Diff File | ||
| mod - Modules/Scripted/EditorLib/PaintEffect.py | Diff File | ||
|
2145-support-for-installing-extension-from-file f76ce3d1 2013-04-05 16:18:47 Details Diff |
COMP: Fix macro SlicerMacroConfigureGeneric{Cxx, Python}ModuleTests sanity checks Commit r21871 fixed the sanity check associated with macro "SlicerMacroConfigureGenericCxxModuleTests" by testing the content of the variable. This approach works well for function. In case of macro, only parameter referenced using ${argX} are replaced. It means the following code doesn't work: // ---------- macro(foo bar) set(var "foo") message("${var}:${${var}}") endmacro() foo("hello") // ---------- It outputs: foo: whereas the following is expected: foo:hello This commit fix the problem by explicitly testing the parameter value. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21873 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerMacroConfigureGenericCxxModuleTests.cmake | Diff File | ||
| mod - CMake/SlicerMacroConfigureGenericPythonModuleTests.cmake | Diff File | ||
|
2145-support-for-installing-extension-from-file eaa7a179 2013-04-05 15:47:10 Details Diff |
COMP: Fix ExtensionsIndex experimental build error Thanks to Chris Mullins for reporting the problem. Error is easily reproducible when building an extensionsIndex with the option -DSlicer_UPLOAD_EXTENSIONS:BOOL=ON. See below for detailed command and associated error message. Following commit r21860 ensuring target ExperimentalUpload, ExperimentalNightly, ... works as expected. The case when Slicer_UPLOAD_EXTENSIONS is ON and the build is done manually instead of being driven by a dashboard hasn't been tested :( To fix the issue, we assume that by default a manual build of an ExtensionsIndex corresponds to an Experimental build. The user can still pass CTEST_MODEL at the command line if he wishes to change the value. // ------------------- Error: cmake -DSlicer_DIR:FILEPATH=/home/crmullin/Projects/Slicer4-SuperBuild-Debug/Slicer-build/ \ -DSlicer_EXTENSION_DESCRIPTION_DIR:FILEPATH=/home/crmullin/ExtensionsIndexForTubetk/ \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DSlicer_UPLOAD_EXTENSIONS:BOOL=ON \ /home/crmullin/Slicer/Extensions/CMake/ [..] Scanning dependencies of target JsonCpp [ 5%] Creating directories for 'JsonCpp' [ 11%] Performing download step (git clone) for 'JsonCpp' Cloning into 'JsonCpp'... [...] [ 16%] [ 22%] No patch step for 'JsonCpp' Performing update step (git fetch) for 'JsonCpp' HEAD is now at e2cfe02... Merge branch 'master' of github.com:TubeTK/jsoncpp-cmake [ 27%] No configure step for 'JsonCpp' [ 33%] No forcebuild step for 'JsonCpp' [ 38%] Performing build step for 'JsonCpp' * Extra verbosity turned on Reading Script: /home/crmullin/Slicer/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtension.cmake SetCTestConfiguration:SourceDirectory:/home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp-build/Extensions- SetCTestConfiguration:BuildDirectory:/home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp Run dashboard with model TRACK Source directory: Extensions- Build directory: /home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp CMake Error at /home/crmullin/Slicer/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtension.cmake:90 (ctest_start): ctest_start given source path /home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp-build/Extensions- which is not an existing directory. Set CTEST_CHECKOUT_COMMAND to a command line to create it. SetCTestConfiguration:BuildDirectory:/home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp-build SetCTestConfiguration:SourceDirectory:/home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp SetCTestConfiguration:ConfigureCommand:"/home/crmullin/cmake-2.8.10.2/bin/cmake" "-DCMAKE_BUILD_TYPE:STRING=Release" "-GUnix Makefiles" "/home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp" SetCTestConfiguration:BuildDirectory:/home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp-build SetCTestConfiguration:SourceDirectory:/home/crmullin/Projects/SlicerExtensionsIndex-tubetk/JsonCpp Configure project Current Tag empty, this may mean NightlyStartTime / CTEST_NIGHTLY_START_TIME was not set correctly. Or maybe you forgot to call ctest_start() before calling ctest_configure(). Cannot open configure file Error in read script: /home/crmullin/Slicer/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtension.cmake make[2]: *** [JsonCpp-prefix/src/JsonCpp-stamp/JsonCpp-build] Error 255 make[1]: *** [CMakeFiles/JsonCpp.dir/all] Error 2 make: *** [all] Error 2 git-svn-id: http://svn.slicer.org/Slicer4/trunk@21872 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Extensions/CMake/SlicerBlockBuildPackageAndUploadExtensions.cmake | Diff File | ||
|
2145-support-for-installing-extension-from-file 8b43a32b 2013-04-05 15:47:08 Details Diff |
COMP: Fix sanity check associated with SlicerMacroConfigureGenericCxxModuleTests The name of the variable and not its content was checked to be different from an empty string. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21871 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerMacroConfigureGenericCxxModuleTests.cmake | Diff File | ||
|
2145-support-for-installing-extension-from-file b7ff9004 2013-04-05 13:48:44 Details Diff |
BUG: fix paths for DICOM executable searches Since the helper executables are not in the slicer bin directory for a local build of slicer, be sure to also check in the DCMTK-build bin directory to find the actual executable. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21870 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/Testing/Python/JRC2013Vis.py | Diff File | ||
| mod - Modules/Scripted/DICOM/DICOMLib/DICOMProcesses.py | Diff File | ||
|
2145-support-for-installing-extension-from-file 9a1d72e0 2013-04-05 12:09:51 Details Diff |
BUG: Fix import of urllib MacOsx by updating CMake'ified python Thanks to Steve Pieper for reporting the issue. Following Slicer commit r21863 and commit r21867, CMake'ified python is used to build Slicer. This commit update the python project so that the python extension _scproxy is also built. // --------- The error being fixed was: File "/Users/pieper/slicer4/latest/Slicer-superbuild/Slicer-build/lib/Slicer-4.2/qt-scripted-modules/SampleData.py", line 192, in downloadFile import urllib File "/Users/pieper/slicer4/latest/Slicer-superbuild/python-install/lib/python2.7/urllib.py", line 1379, in <module> from _scproxy import _get_proxy_settings, _get_proxies ImportError: No module named _scproxy // --------- The associated commit in CMake'ified python is: https://github.com/davidsansome/python-cmake-buildsystem/commit/a813b59647eb40b8c6a3411eee83268ae98c9452 See http://na-mic.org/Bug/view.php?id=3052 Fixes 0003052 git-svn-id: http://svn.slicer.org/Slicer4/trunk@21869 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_python.cmake | Diff File | ||
|
2145-support-for-installing-extension-from-file fec34884 2013-04-05 02:41:27 Details Diff |
COMP: Remove unneeded FindCTK.cmake When initially added in r15226, the FindCTK.cmake module allowed to overcome an issue with "find_package" command preventing it from understanding the REQUIRED parameter when dealing with Config file. CMake 2.8.8 doesn't have this limitation anymore, CMake commit fa0f0654 fixes the issue. git-svn-id: http://svn.slicer.org/Slicer4/trunk@21868 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| rm - CMake/FindCTK.cmake | Diff File | ||
