Changesets: Import 2017-06-07 23:51:09
|
master c6c6b2ed 2014-07-30 14:39:02 mwoehlke Details Diff |
ENH: Add logging to extension update check Add logging messages to report status when checking for updates, and when an update is scheduled. (In particular, this reports a warning if the server extension information query fails.) Issue 0003784 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23517 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
|
master b90c5068 2014-07-30 12:13:41 naucoin Details Diff |
BUG: fix typo in volume slice model attribute Issue 0003718 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23516 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLSliceLogic.cxx | Diff File | ||
|
master 913fab2d 2014-07-30 07:03:47 Details Diff |
COMP: Update VTK to configure a more friendly VTKConfigVersion file // ------------------- commit 15fac7625d2b817aee4326376871f2cc2bbf53cd Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Date: Wed Jul 30 06:51:28 2014 -0400 Configure VTKConfigVersion consistent with VTK's compatibility guarantees Since the minimum CMake version required by VTK is 2.8.8, this commit uses the module CMakePackageConfigHelpers available in that version of CMake. // ------------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23515 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 5965fe7f 2014-07-30 06:38:40 Details Diff |
COMP: Update minimum required VTK version This commit will fix the following warning: CMake Error at CMakeLists.txt:701 (find_package): Could not find a configuration file for package "VTK" that is compatible with requested version "6.1". The following configuration files were considered but not accepted: /path/to/Slicer-SuperBuild/VTKv6-build/VTKConfig.cmake, version: 6.2.0 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23514 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
|
master 7d53d005 2014-07-30 06:09:44 Details Diff |
COMP: Fix logic setting VTK_ENABLE_KITS. See 0003741 This commit ensures that the variable will be set for MacOSX < 10.8 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23513 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
|
master cf23da82 2014-07-30 05:41:26 Details Diff |
COMP: Update VTK6 to include support for VTK_ENABLE_KITS. See 0003741 This commit updates the version of VTK so that the changes introduced in commit r23509 can have an effect. An attempt to cherry-pick only the commits introducing the VTK_ENABLE_KITS feature has been done. It turned out that the kits feature and the introduction of the support for different backend were too much tangled. After reviewing the list of changes, most them includes bug fixes, addition of VTK tests, fixes for memory initialization, optimization. More specifically, here is a list of the one that are of interest for Slicer are: kitware/VTK@504036 : Added "sticky" axes mode to vtkCubeAxesActor kitware/VTK@196bbe : Refactor GetRange to compute all ranges at the same time. [...] improves the total runtime by 1.5x to 3x. kitware/VTK@87291c : Improve ComputeScalarRange when we have a single component. In testing this takes the ComputeScalarRange on 600^3 from 0000296:0000430 ms to ~20ms. kitware/VTK@cbd488 : Fix a crash when deleting vtk-python objects. kitware/VTK@e76153 : BUG: vtkProp3D - Wrong transformation used to restore original parameters Following discussion with Berk [1], the OpenGL backend remains the same and the corresponding changes are backward compatible. (There are some exceptions but Slicer code base is not impacted) [1] http://www.kitware.com/blog/home/post/703 For a complete list of changes: git shortlog 169b37..0d4202 --no-merges git-svn-id: http://svn.slicer.org/Slicer4/trunk@23512 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master cb34ef8f 2014-07-30 02:03:55 Details Diff |
COMP: Download openssl-1.0.1e source packages from packages.kitware.com Since openssl.org is not always up, the source archive has been mirrored on midas. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23511 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master 4607fa4c 2014-07-30 02:03:53 Details Diff |
STYLE: Remove unused/commented CMake code from Base/Logic/CMakeLists.txt git-svn-id: http://svn.slicer.org/Slicer4/trunk@23510 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/Logic/CMakeLists.txt | Diff File | ||
|
master 6611ef5f 2014-07-29 23:00:19 Details Diff |
COMP: Fix VTK6 link error on MacOSX 10.6. Fixes 0003741 To reduce the number of libraries passed to the linker, this commit build VTK6 with the VTK_ENABLE_KITS option enabled. If building on MacOSX 10.6 without CMake 3.0, it also updated the build system to output a fatal error message explaining that a more recent version of CMake is required. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23509 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master c1dd6356 2014-07-29 22:32:01 Details Diff |
COMP: Specify list VTK_MAKE_INSTANTIATOR3 input as list of cxx files only. This commit fixes a build error introduced by kitware/VTK@5c3241b9d8 It ensures there are no duplicated entries in the instantiator files. The error (reported below) was first discovered when building Slicer on MacOSX 10.6 with the option VTK_ENABLE_KITS while working on issue 0003741. // ------------------------ $ make vtkSlicerTransformsModuleMRMLDisplayableManager/fast [ 59%] Building CXX object Modules/Loadable/Transforms/MRMLDM/CMakeFiles/vtkSlicerTransformsModuleMRMLDisplayableManager.dir/TransformsInstantiator.cxx.o /path/to/Slicer-build/Modules/Loadable/Transforms/MRMLDM/TransformsInstantiator.cxx: In function 'vtkObject* vtkInstantiatorvtkMRMLTransformsDisplayableManager2DNew()': /path/to/Slicer-build/Modules/Loadable/Transforms/MRMLDM/TransformsInstantiator.cxx:10: error: redefinition of 'vtkObject* vtkInstantiatorvtkMRMLTransformsDisplayableManager2DNew()' /path/to/Slicer-build/Modules/Loadable/Transforms/MRMLDM/TransformsInstantiator.cxx:9: error: 'vtkObject* vtkInstantiatorvtkMRMLTransformsDisplayableManager2DNew()' previously defined here /path/to/Slicer-build/Modules/Loadable/Transforms/MRMLDM/TransformsInstantiator.cxx: In function 'vtkObject* vtkInstantiatorvtkMRMLTransformsDisplayableManager3DNew()': /path/to/Slicer-build/Modules/Loadable/Transforms/MRMLDM/TransformsInstantiator.cxx:12: error: redefinition of 'vtkObject* vtkInstantiatorvtkMRMLTransformsDisplayableManager3DNew()' /path/to/Slicer-build/Modules/Loadable/Transforms/MRMLDM/TransformsInstantiator.cxx:11: error: 'vtkObject* vtkInstantiatorvtkMRMLTransformsDisplayableManager3DNew()' previously defined here make[1]: *** [Modules/Loadable/Transforms/MRMLDM/CMakeFiles/vtkSlicerTransformsModuleMRMLDisplayableManager.dir/TransformsInstantiator.cxx.o] Error 1 make: *** [vtkSlicerTransformsModuleMRMLDisplayableManager/fast] Error 2 // ------------------------ The content of the associated instantiator file was: // --------------- $ cat Modules/Loadable/Transforms/MRMLDM/TransformsInstantiator.cxx [...] vtkInstantiatorNewMacro(vtkMRMLTransformsDisplayableManager2D) vtkInstantiatorNewMacro(vtkMRMLTransformsDisplayableManager2D) vtkInstantiatorNewMacro(vtkMRMLTransformsDisplayableManager3D) vtkInstantiatorNewMacro(vtkMRMLTransformsDisplayableManager3D) [...] // --------------- This commit avoid the duplicated entries in the instantiator file. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23508 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Annotations/MRMLDM/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/TractographyDisplay/MRMLDM/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/Transforms/MRMLDM/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/VolumeRendering/MRMLDM/CMakeLists.txt | Diff File | ||
|
master 3909077a 2014-07-29 20:36:31 Details Diff |
BUG: Partial fix for EMSegment/BRAINSFit integration. See 0003561, 0002741, 0003779 This commit is a follow up of EMSegment commit r23496. It updates BRAINSFit to integrate the fix done by Kent to specifically address the naming of .h5 transform files written by BRAINSFit. // --------------------- commit e46c99795cedd4c6aeec98e881af9c2b28dc5cf5 Author: Kent Williams <norman-k-williams@uiowa.edu> Date: Tue Jul 29 15:24:11 2014 -0500 BUG: don't extend composite transform filenames needlessly.there was some deficient logic that was changing the filename of composit transforms to force them to hdf5 format, even if the filename given was already for an HDF5 file. // --------------------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23507 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master 671595bb 2014-07-29 19:59:34 Details Diff |
ENH: Added developer mode and base classes for scripted modules * Added "Enable developer mode" option in the application settings (Developer section, next to Enable QtTesting) * Added base classes for scripted module, widget, logic, and test: they make scripted modules simpler and shorter and also more functions and helper methods can be added in the future without changing each scripted module ** Module handles selftest registration ** Widget handles reload&test (shown on GUI only in developer mode) ** Logic and Test contains delayDisplay utility function * As an example, updated ScriptedLoadableModuleTemplate and SurfaceToolbox to use the new base classes From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@23506 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/qSlicerAppMainWindow.cxx | Diff File | ||
| mod - Base/Python/CMakeLists.txt | Diff File | ||
| add - Base/Python/slicer/ScriptedLoadableModule.py | Diff File | ||
| mod - Base/Python/slicer/slicerqt.py | Diff File | ||
| mod - Base/QTGUI/CMakeLists.txt | Diff File | ||
| mod - Base/QTGUI/Resources/Translations/qSlicerBaseQTGUI_fr.ts | Diff File | ||
| mod - Base/QTGUI/qSlicerApplication.cxx | Diff File | ||
| mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/ScriptedLoadableModuleTemplate.py | Diff File | ||
| mod - Modules/Scripted/SurfaceToolbox/SurfaceToolbox.py | Diff File | ||
| mod - Utilities/Templates/Modules/Scripted/TemplateKey.py | Diff File | ||
|
master 539a4044 2014-07-29 19:43:49 Details Diff |
BUG: Fixed SubjectHierarchyGenericSelfTest Fixes 0003754 Additional minor fixes in handling potential nodes in the subject hierarchy tree (removed unavailable context menu items) Removed potential subject hierarchy node list and related classes (model, proxy model, designer plugin) git-svn-id: http://svn.slicer.org/Slicer4/trunk@23505 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyGenericSelfTest.py | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/Resources/UI/qSlicerSubjectHierarchyModule.ui | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/Widgets/CMakeLists.txt | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/CMakeLists.txt | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qMRMLPotentialSubjectHierarchyListViewPlugin.cxx | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qMRMLPotentialSubjectHierarchyListViewPlugin.h | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/qSlicerSubjectHierarchyModuleWidgetsPlugin.h | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLPotentialSubjectHierarchyListView.cxx | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLPotentialSubjectHierarchyListView.h | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLScenePotentialSubjectHierarchyModel.cxx | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLScenePotentialSubjectHierarchyModel.h | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLScenePotentialSubjectHierarchyModel_p.h | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSceneSubjectHierarchyModel.cxx | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSortFilterPotentialSubjectHierarchyProxyModel.cxx | Diff File | ||
| rm - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSortFilterPotentialSubjectHierarchyProxyModel.h | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSubjectHierarchyTreeView.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/qSlicerSubjectHierarchyDICOMPlugin.cxx | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDefaultPlugin.cxx | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModuleWidget.cxx | Diff File | ||
| mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModuleWidget.h | Diff File | ||
|
master a0e98f04 2014-07-29 19:24:04 mwoehlke Details Diff |
ENH: Implement installation of updates Implement installation of updates to extensions (consisting of first removing the old version, then installing the new version). Note that this will attempt to install new dependencies as well. Also, change handling of update downloads to additionally write the metadata for the update (in addition to the archive), as we'll want it when we install the update and need to persist it across a restart. Issue 0002089 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23504 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.h | Diff File | ||
|
master 33660ef6 2014-07-29 19:24:03 mwoehlke Details Diff |
BUG: Improve UI update scheduling Improve update handling to enable 'restart' button when appropriate due to update-related actions. Disable updating of extensions scheduled to be uninstalled (the model already does this, but having the button enabled makes for a confusing user experience where clicking the update button does nothing). Issue 0002089 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23503 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/qSlicerExtensionsManageWidget.cxx | Diff File | ||
| mod - Base/QTGUI/qSlicerExtensionsManagerDialog.cxx | Diff File | ||
|
master 8c588991 2014-07-29 19:24:02 mwoehlke Details Diff |
ENH: Hook up UI for updating extensions Hook up update availability and download progress reporting in extension model. Add UI to extension manager to report update availability and allow requesting updates and canceling such requests. This brings update management almost to full functionality, missing only to actually install the update on restart. Issue 0002089 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23502 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.h | Diff File | ||
| mod - Base/QTGUI/Resources/UI/qSlicerExtensionsButtonBox.ui | Diff File | ||
| mod - Base/QTGUI/qSlicerExtensionsManageWidget.cxx | Diff File | ||
| mod - Base/QTGUI/qSlicerExtensionsManageWidget.h | Diff File | ||
|
master 642c78cf 2014-07-29 19:24:00 mwoehlke Details Diff |
ENH: Improve extension manager info icons Tweak the information icons used in the extension manager to have whiter glyphs, and a less muddy glyph for the 'i' (update available) icon. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23501 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/Resources/Icons/ExtensionIncompatible.svg | Diff File | ||
| mod - Base/QTGUI/Resources/Icons/ExtensionUpdateAvailable.svg | Diff File | ||
|
master 4568f0d4 2014-07-29 19:23:59 mwoehlke Details Diff |
ENH: Download updates Refactor update download logic, introducing a new 'task' class to manager downloads, rather than trying everything through the network manager's signals. Also, move the code to start such a task to a helper function. Leverage these to hook up downloading of updates, now that tasks can have different completion handlers assigned. Write update archive file and scheduling information on update download completion. Issue 0002089 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23500 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/CMakeLists.txt | Diff File | ||
| add - Base/QTCore/qSlicerExtensionDownloadTask.cxx | Diff File | ||
| add - Base/QTCore/qSlicerExtensionDownloadTask.h | Diff File | ||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.h | Diff File | ||
|
master a816c1b3 2014-07-29 19:23:58 mwoehlke Details Diff |
ENH: Start adding logic to check for updates Add logic to issue server API calls to check for updates to extensions, and to manage the same. This is still missing anything to actually download or apply said updates. Issue 0002089 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23499 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.h | Diff File | ||
|
master fc04bd35 2014-07-29 19:23:57 mwoehlke Details Diff |
ENH: Adding API to check for extension updates Add some initial API to manage scheduling extensions for update, similar to how we schedule extensions for uninstall (as the implementation will necessarily be similar). For now, the settings management should be working; the rest (including a checkForUpdates() method) is mostly placeholder that is needed to start implementing UI and underlying logic. Issue 0002089 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23498 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerCoreApplication.cxx | Diff File | ||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.h | Diff File | ||
| mod - Base/QTGUI/qSlicerExtensionsManagerWidget.cxx | Diff File | ||
| mod - Base/QTGUI/qSlicerExtensionsManagerWidget.h | Diff File | ||
|
master 3c9c4269 2014-07-29 19:23:56 mwoehlke Details Diff |
ENH: Remember if updates are automatic Store if the user has enabled automatic extension updates in QSettings. Issue 0002089 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23497 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTGUI/qSlicerExtensionsManagerWidget.cxx | Diff File | ||
|
master 8e583263 2014-07-29 19:07:53 Details Diff |
BUG: BRAINS can only now read in h5 files git-svn-id: http://svn.slicer.org/Slicer4/trunk@23496 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master ef07eaa4 2014-07-29 18:57:32 naucoin Details Diff |
BUG: fix logic on showing slice intersections Added an attribute (and a name) for the volume slice model display nodes and check for it in a new slice logic static method. If it's not a volume slice model display node, use the visibility of the regular model to determine if should show the slice intersections, otherwise rely on the slice intersections visible flag. Issue 0003718 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23495 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/DisplayableManager/vtkMRMLModelSliceDisplayableManager.cxx | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLSliceLogic.cxx | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLSliceLogic.h | Diff File | ||
|
master ed43e080 2014-07-29 18:35:30 Details Diff |
BUG: check for valid transform pointers to avoid crash On scene close and possibly other circumstances there can be transform nodes that don't have valid transforms, so check the pointers. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23494 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Transforms/Widgets/qMRMLTransformInfoWidget.cxx | Diff File | ||
|
master c7b22bdd 2014-07-29 18:27:54 naucoin Details Diff |
BUG: test for active camera before enabling fiducials Removes the error message that world to view and view to world can't compute result due to a missing active camera. Delaying setting the handles and widgets to be enabled if there's no active camera defined on their renderers seems to work well since the next time through the update code once the layout has stabilised and the renderers are updated, the seeds will get positioned and enabled. Issue 0003761 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23493 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManager2D.cxx | Diff File | ||
| mod - Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsFiducialDisplayableManager2D.cxx | Diff File | ||
