Changesets: Import 2017-06-07 23:51:09
|
master 454fed0f 2015-03-02 10:04:58 Details Diff |
ENH: Allow application name to be defined by argv0 The qCoreApplication::applicationName controls the discovery of QSettings files and some other parts of the internal machinery of the application. When making a custom version of slicer, we want to keep the settings independent of the original slicer, so that, for example, they can have different module paths related to the extensions that are bundled. See: http://www.slicer.org/slicerWiki/index.php/Documentation/Labs/CustomSlicerGenerator git-svn-id: http://svn.slicer.org/Slicer4/trunk@24004 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Applications/SlicerApp/Main.cxx | Diff File | ||
|
master 58e45049 2015-03-02 08:58:01 Details Diff |
COMP: Properly pass url and url_md5 to OpenSSL external project git-svn-id: http://svn.slicer.org/Slicer4/trunk@24003 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master cb721874 2015-03-02 08:33:59 Details Diff |
COMP: Fix typo in OpenSSL external project introduced by r23999 git-svn-id: http://svn.slicer.org/Slicer4/trunk@24002 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master fc911021 2015-03-01 21:58:54 Details Diff |
COMP: Update ExternalProjectDependency based on commontk/Artichoke@82fa9f4 This update (more specifically commit 82fa9f4: Set "use system" variable if it has NOT already been explicitly set) should allow to build Slicer expecting NUMPY to be on the system while requiring the CTKAppLauncher to be built by Slicer. The following configuration will now succeed: $ cmake -DQT_QMAKE_EXECUTABLE:FILEPATH=/path/to/bin/qmake \ -DSlicer_USE_SYSTEM_NUMPY:BOOL=ON \ -DSlicer_USE_SYSTEM_CTKAPPLAUNCHER:BOOL=0 \ -DSlicer_USE_PYTHONQT_WITH_TCL:BOOL=OFF ../Slicer See http://www.slicer.org/slicerWiki/index.php/Documentation/Labs/PythonCondaBuild#Different_approach $ git shortlog c3eb170..82fa9f4 --no-merges Jean-Christophe Fillion-Robin (12): Rename Artichoke into ExternalProjectDependency Add cmake sphinx extension based on Kitware/CMake@3c8226e59 Add explicit support for function and macro directive Add sphinx gitignore Add sphinx documentation Convert README into rst and reference it from index.rst Include "indices and tables" only if generating html Add docs badge Fix tests including the correct module (broken after commit 9106d3d) Tweak test in ExternalProject_Message to avoid warning related to CMP0054 Update tests setting policy CMP0054 to OLD. Set "use system" variable if it has NOT already been explicitly set Matthew Woehlke (1): Add function to install external CMake projects git-svn-id: http://svn.slicer.org/Slicer4/trunk@24001 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/ExternalProjectDependency.cmake | Diff File | ||
|
master 6789670f 2015-03-01 20:54:34 Details Diff |
ENH: Add OpenSSL 1.0.1l as a valid version for both unix and windows This version will be expected if Slicer is configured with -DOPENSSL_DOWNLOAD_VERSION:STRING=1.0.1l git-svn-id: http://svn.slicer.org/Slicer4/trunk@24000 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master 5f4d01c2 2015-03-01 20:54:32 Details Diff |
ENH: Add OPENSSL_DOWNLOAD_VERSION option allow to select OpenSSL version This commit introduces a new option allowing to (a) select the OpenSSL source archive to download on unix system (b) select the OpenSSL pre-compiled package to download on winows system Currently there is only one version supported for either linux or windows. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23999 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master d639b015 2015-03-01 20:54:30 Details Diff |
COMP: Fix OpenSSL configure step to use expected zlib include and lib dir On system without zlib header and library installed, openssl project couldn't be built. This commit adds a custom step copying the zlib library to the name expected by openssl build system and uses --with-zlib-{lib|include} option as required bu Configure script. While the "threads" option was the default, it is now explicitly specified. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23998 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master 172a6652 2015-03-01 20:54:28 Details Diff |
COMP: Ensure default env option are considered when building OpenSSL git-svn-id: http://svn.slicer.org/Slicer4/trunk@23997 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master da1181d9 2015-03-01 12:49:14 Details Diff |
ENH: Remove trailing spaces from flags passed to non cmake-ified project. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23996 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/ExternalProjectForNonCMakeProject.cmake | Diff File | ||
|
master 9ae14a6a 2015-03-01 12:49:12 Details Diff |
ENH: Simplify windows download for OpenSSL external project Since version "e" and "h" are expected to be 100% backward compatible [1], this commit removes the special OpenSSL download for Qt 4.8.5. [1] http://upstream.rosalinux.ru/versions/openssl.html git-svn-id: http://svn.slicer.org/Slicer4/trunk@23995 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_OpenSSL.cmake | Diff File | ||
|
master 7a8eae6d 2015-03-01 11:47:03 Details Diff |
BUG: Fix isExtensionInstalled to do an exact match when searching extensions Fixes 0003928 Tested-by: Francois Budin <fbudin@unc.edu> Thanks: Francois Budin <fbudin@unc.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@23994 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx | Diff File | ||
|
master c8b065ec 2015-02-27 10:46:01 Details Diff |
BUG: Fixed passing hierarchy node miniscene to CLI: Fixed references to associated node and multiple display nodes. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23993 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCLI/vtkSlicerCLIModuleLogic.cxx | Diff File | ||
|
master 121d28f3 2015-02-26 17:42:12 Details Diff |
ENH: Updated OpenIGTLinkIF Enhancements for better OpenIGTLink string command support https://github.com/openigtlink/OpenIGTLinkIF/pull/48 git-svn-id: http://svn.slicer.org/Slicer4/trunk@23992 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild.cmake | Diff File | ||
|
master feebd97e 2015-02-25 22:22:02 Details Diff |
COMP: Fix SlicerBaseQTCoreCxxTests link error when disabling extension support The link error happen because: (1) qRestAPI is not link against qSlicerBaseQTCore (2) qRestAPI was exporting QtTest libraries in qRestAPIExports.cmake git-svn-id: http://svn.slicer.org/Slicer4/trunk@23991 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/QTCore/Testing/Cxx/CMakeLists.txt | Diff File | ||
|
master 52577884 2015-02-25 14:00:34 Details Diff |
ENH: BundleUtilities: Ensure framework symlinks and Info.plist exist See Slicer issue 0003965 This commit integrates the upstream change kitware/cmake@41564ff //---------- Author: Adam Strzelecki <ono@java.pl> 2014-10-21 10:42:33 Committer: Brad King <brad.king@kitware.com> 2014-10-21 11:42:30 BundleUtilities: Ensure framework symlinks and Info.plist exist This restores Qt SDK 4.8 and OS X >= 10.6.5 codesign compatibility improving embedding frameworks using correct bundle layout described at: https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html 1. If Versions/VERSION/Resources/Info.plist is missing, well known incorrect locations are checked for Info.plist and Info.plist is copied from there, otherwise codesign will fail. 2. Root framework symlinks to binary and Resources are restored to point inside Versions/Current, otherwise Qt 4.8 looking for Resources/ in framework root will fail. //---------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23990 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/BundleUtilitiesWithRPath.cmake | Diff File | ||
|
master 0b6d7cd4 2015-02-25 14:00:33 Details Diff |
ENH: BundleUtilities: Framework codesign Resources/Info.plist & Current See Slicer issue 0003965 This commit integrates the upstream change kitware/cmake@83a06bb //------------ Author: Adam Strzelecki <ono@java.pl> 2014-09-04 09:01:17 Committer: Brad King <brad.king@kitware.com> 2014-10-10 10:17:04 BundleUtilities: Framework codesign Resources/Info.plist & Current We need to ensure copied framework has proper layout with Resources/Info.plist present next to versioned binary and Current symlink in Versions: https://developer.apple.com/library/mac/technotes/tn2206 https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html If Resources/ is not present we may try to copy Contents/Info.plist if present to embedded Resources/Info.plist. This is a case of Qt5 that has obsolete/invalid framework layout (see QTBUG-38511). //------------ git-svn-id: http://svn.slicer.org/Slicer4/trunk@23989 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/BundleUtilitiesWithRPath.cmake | Diff File | ||
|
master 91f72128 2015-02-25 14:00:32 Details Diff |
ENH: BundleUtilities: Use find on UNIX for fast executable lookup This commit integrates the upstream change kitware/cmake@6c31379 //----------- Author: Adam Strzelecki <ono@java.pl> 2014-09-03 15:42:53 Committer: Brad King <brad.king@kitware.com> 2014-10-10 10:15:56 BundleUtilities: Use find on UNIX for fast executable lookup It makes whole executable process quicker on UNIX, especially for large bundles containing many files, since using find narrows results to only files having executable flags then all further tests follow. Since find ... -perm +0111 is not clearly POSIX compliant and some Linux versions refuse it, it is better to use longer but portable: find ... -perm \( -perm -0100 -o -perm -0010 -o -perm -0001 \) //----------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23988 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/BundleUtilitiesWithRPath.cmake | Diff File | ||
|
master b33ed6b3 2015-02-25 14:00:30 Details Diff |
ENH: BundleUtilities: Allow Info.plist files which use CR line endings This commit integrates the upstream change kitware/cmake@810f5cc //----------- Author: Tim Blechmann <tim@klingt.org> 2014-08-07 13:30:27 Committer: Brad King <brad.king@kitware.com> 2014-08-07 14:00:01 BundleUtilities: Allow Info.plist files which use CR line endings Convert \r to our internal end-of-line character just as we do \n. Signed-off-by: Tim Blechmann <tim@klingt.org> //----------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23987 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/BundleUtilitiesWithRPath.cmake | Diff File | ||
|
master f948a14d 2015-02-25 14:00:29 Details Diff |
STYLE: BundleUtilities: Remove .* expressions from MATCHES regexs This commit integrates the upstream change kitware/cmake@b0b4b46 //---------- Author: Rolf Eike Beer <eike@sf-mail.de> 2014-04-11 12:17:46 Committer: Rolf Eike Beer <eike@sf-mail.de> 2014-04-14 12:17:11 Remove .* expressions from beginning and end of MATCHES regexs All these expressions work the same: "foo" ".*foo.*" "^.*foo.*$" This assumes that the "Intel*" expressions were meant to be "Intel.*". //---------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23986 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/BundleUtilitiesWithRPath.cmake | Diff File | ||
|
master 53814e0a 2015-02-25 14:00:28 Details Diff |
ENH: BundleUtilities: Replace string(REGEX REPLACE) with string(REPLACE) This commit integrates the upstream change kitware/cmake@5bd48ac //---------- Author: Rolf Eike Beer <eike@sf-mail.de> 2014-04-06 15:51:33 Committer: Rolf Eike Beer <eike@sf-mail.de> 2014-04-14 12:17:05 Replace string(REGEX REPLACE) with string(REPLACE) where possible The simple replacement is much faster. //---------- git-svn-id: http://svn.slicer.org/Slicer4/trunk@23985 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/BundleUtilitiesWithRPath.cmake | Diff File | ||
|
master 963cc684 2015-02-25 14:00:26 Details Diff |
STYLE: BundleUtilities: Convert builtin help to reStructuredText This commit integrates the upstream change kitware/cmake@f051814 //------------ Author: Kitware Robot <kwrobot@kitware.com> 2013-10-15 11:17:36 Committer: Brad King <brad.king@kitware.com> 2013-10-15 14:12:03 Convert builtin help to reStructuredText source files Run the convert-help.bash script to convert documentation: ./convert-help.bash "/path/to/CMake-build/bin" Then remove it. //------------ git-svn-id: http://svn.slicer.org/Slicer4/trunk@23984 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/BundleUtilitiesWithRPath.cmake | Diff File | ||
|
master f500059c 2015-02-25 13:53:07 Details Diff |
BUG: Update VTK to revert changes associated with vtkColorTransferFunction It turns out the proposed fix (http://review.source.kitware.com/#/c/19012/) does not completely address the problem. This commit revert it and also revert the VTK commit kitware/VTK@238163f (6657: Add out-of-range colors to color maps) as it was done in r23910. The following tests are now passing (tested on Ubuntu 14.04): py_sceneImport2428 py_ThresholdThreadingTest py_StandaloneEditorWidgetTest py_RSNAVisTutorial py_RSNAQuantTutorial py_RSNA2012ProstateDemo py_JRC2013Vis py_NeurosurgicalPlanningTutorialMarkupsSelfTest py_NeurosurgicalPlanningTutorial $ git shortlog e0dda5f..c9fd5fb Jean-Christophe Fillion-Robin (2): Revert "Fix crash where vtkColorTransferFunction has 0 nodes" Revert "6657: Add out-of-range colors to color maps" git-svn-id: http://svn.slicer.org/Slicer4/trunk@23983 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 6c6fae98 2015-02-24 17:46:41 Details Diff |
ENH: Update VTK version to release branch of 2015-02-24 This is the list of changes specific to the Slicer VTK fork (cherry-picked from the previous Slicer/VTK branch): $ git shortlog 70bad0e..e0dda5f --no-merges Ben Boeckel (1): python: split wrapping functions Cory Quammen (1): Fix crash where vtkColorTransferFunction has 0 nodes Jean-Christophe Fillion-Robin (12): modules: Re-order RenderingOpenGL libraries to fix VTK_ENABLE_KIT link error python: Add wrapping of kits if VTK_ENABLE_KITS is ON python: Update python module dependency to account for VTK_ENABLE_KITS python: Configure PythonInit file for kit when VTK_ENABLE_KITS is ON python: Update wrapping function to support kit python: Add VTK_ENABLE_KITS to VTKConfig python: Update wrapping tool to support multiple hierarchy files python: Do not create a new hints file if a kit bundles only one module python: Update vtkWrapPython to add mutable object when building kit python: Fix vtkWrapPython compiler error ensuring type declaration are first. vtkCornerAnnotation: Add convenience TextPosition enum Disable Chemistry module to workaround issue #15255 Julien Finet (2): Enable GPU Raycast volume mapper for recent NVIDIA drivers on Mac OS X GPU raycast volume rendering now supports textures larger than 1024 Steve Pieper (1): BUG: WIP: fix vtkPickingManager interaction with widgets This is the list of new changes specific to VTK: $ git shortlog d733280..70bad0e --no-merges Aashish Chaudhary (6): Do not assume initial min and max values Attempt to fix failing independent component tests GLSL 120 does not support sampler arrays Added missing header Fixed errors found using valgrind leak check Silenced compiler warnings Andrew Bauer (1): Getting rid of compiler warnings. Arnaud Gelas (1): Limiting number of ModifiedEvent when calling vtkTransform::SetMatrix Ben Boeckel (19): IOXdmf3: remove excess MPI stuff install: install missing module-related files netcdf: support a system netcdf cmake: reformat java compilation commands java: add an option to set the target for java compiles wxVTKRenderWindow: support wxPython 3.0 wrapping: find superclasses that are templates examples: add shebang lines doxygen: remove obsolete options doxygen: add an option to disable CHM files release: add scripts for release maintenance python: don't export Python modules as targets maint: use "git checkout" rather than reset maint: ignore css files for ctags as well metaio: remove stray reject file vtkModuleTop: handle UsrMove-like setups vtkWrap: use size_t for sizes vtkPistonMapper: fix a overload-virtual warning vtkWrapTcl: hide dString when there are no methods Dan Lipsa (1): BUG: Fix mispelled excluded class and print out all exclusions. Dave DeMarle (1): per bug 14586 fix external vtkLocal David C. Lonie (4): Fix an error in setting an array length. Fix conic point identification in the path renderer. Fix warning in vtkLabeledContourMapper.cxx Allow the initial GL2PS buffer size to be set. David Gobbi (1): Fix arg conversion of const ref arg via constructor. Jean-Christophe Fillion-Robin (3): vtkRenderer: Fix null pointer crash in ViewToWorld() with no active camera vtkhdf5: Fix build error when building on system with glic >= 2.19 per bug 14826 make find_package vtk more lenient John Tourtellott (6): Set geo-origin and -spacing in RequestInformation() call Add vtkGDAL class & MAP_PROJECTION key for pipeline data and field data Change missing geotransform from error to warning. Fix ctest errors Turn off wrapping for vtkGDAL.h Declare vtkGDAL constructor & destructor private, since class is static Ken Martin (5): Some updates to the timing test Fix molecular rendering in parallel projection Fix an issue with mapper requiring a polydata input Update to a cleaner way of solving the issue Fix a couple issues Shawn Waldon (3): Add an option to set default radius of point gaussian Fix triangle size for sprites with radius > 1 Made Point Gaussian mapper handle scale arrays not in dataset Sujin Philip (2): VTK SMP implementation of SynchronizedTemplates3D Fix SMP compile warning in VC++ Tim Thirion (2): Update Android toolchain file (now support NDKs r5 through r10d) Add one-pass Android build acbauer (1): Fixing issue of wrong celldata output order from vtkGeometryFilter. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23982 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - SuperBuild/External_VTKv6.cmake | Diff File | ||
|
master 0144a701 2015-02-24 15:43:16 Details Diff |
ENH: Fix 3943 and other enhancements for slice view annotations * Fixed 0003943 by replacing DICOM study date and study time with series date and series time. * Moved slice view annotations settings gear from Data Probe small widget (main screen) to the Data probe module in order to preserve more screen real estate for the module UIs. * Fixed problem with color scalarbar range labels. * Added an option to change format of color scalarbar range label and save the user settings in application settings. * Change ruler text font size and family according to other text annotations. * Removed the settings gear * Store previous status of ruler and colorscalarbar after enabling slice view annotations From: Alireza Mehrtash <mehrtash@bwh.harvard.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@23981 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/Scripted/DataProbe/DataProbe.py | Diff File | ||
| mod - Modules/Scripted/DataProbe/DataProbeLib/Resources/UI/settings.ui | Diff File | ||
| mod - Modules/Scripted/DataProbe/DataProbeLib/SliceViewAnnotations.py | Diff File | ||
|
master 9953b5b9 2015-02-24 13:12:00 Details Diff |
BUG: 3966. Mark scene as modified after a hierarchy node is re-parented. This is needed to mark scene as needed to save in the Save Data dialog. git-svn-id: http://svn.slicer.org/Slicer4/trunk@23980 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLHierarchyNode.cxx | Diff File | ||
