Changesets: Import 2017-06-07 23:51:09
|
master 11422cae 2015-11-19 18:42:57 Details Diff |
STYLE: FiberBundleLabelSelect: Adding tests for vtp inputs/outputs Adding tests for vtp files, in addition to the original vtk. From: Fan Zhang <zhangfanmark@gmail.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24755 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| add - Modules/CLI/FiberBundleLabelSelect/Data/Input/tractography.vtp | Diff File | ||
| mod - Modules/CLI/FiberBundleLabelSelect/Testing/CMakeLists.txt | Diff File | ||
|
master d927c07a 2015-11-19 17:15:12 Details Diff |
STYLE: vtkMRMLColorLogic: Improve AddDefaultColorNodes() doxygen Reviewed-by: Nicole Aucoin <nicole@bwh.harvard.edu> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24754 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| add - Libs/MRML/Core/Documentation/generate_default_color_node_property_table.py | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.h | Diff File | ||
|
master d3c73329 2015-11-19 14:59:29 naucoin Details Diff |
STYLE: Refactor terminology tests for fine grain error reporting Moved the repeated code into the ParseTerm test method and pass in expected success flag and term values. Updated the color logic for more clear print outs. Use the CheckString utility to encapsulate the string comparisons on the terminology methods. Group terminology tests together and provide better descriptive strings. Issue 0004047 git-svn-id: http://svn.slicer.org/Slicer4/trunk@24753 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/Testing/Cxx/vtkMRMLColorLogicTest2.cxx | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
| mod - Modules/Loadable/Colors/Logic/Testing/Cxx/vtkSlicerColorLogicTest1.cxx | Diff File | ||
|
master 6fd1e496 2015-11-18 12:52:09 Details Diff |
BUG: Fixed build error on Windows git-svn-id: http://svn.slicer.org/Slicer4/trunk@24752 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.h | Diff File | ||
|
master 0d6272a4 2015-11-18 11:54:14 Details Diff |
COMP: vtkMRMLColorLogic: Fix VS2013 build error On Visual Studio 2013 it's necessary to add the following to vtkMRMLColorLogic.cxx: to fix the following errors: C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1452): error C2039: 'not1' : is not a member of 'std' C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1452): error C2039: 'ptr_fun' : is not a member of 'std' C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1452): error C2065: 'ptr_fun' : undeclared identifier C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1452): error C2062: type 'int' unexpected C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1454): error C2039: 'not1' : is not a member of 'std' C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1454): error C2039: 'ptr_fun' : is not a member of 'std' C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1454): error C2065: 'ptr_fun' : undeclared identifier C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1454): error C2062: type 'int' unexpected C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1452): error C3861: 'not1': identifier not found C:\path\to\Slicer\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1454): error C3861: 'not1': identifier not found Tested-by: Andriy Fedorov <fedorov@bwh.harvard.edu> From: Max Smolens <max.smolens@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24751 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
|
master 3b6813a8 2015-11-18 11:54:12 Details Diff |
COMP: vtkMRMLColorLogic: Fix windows build error related to isspace Since the function "std::isspace" is declared in <local>, but <local> library is not found in VS2008 STL, this commit includes "ctype.h" where isspace() function is declared. This commit fixes the following error: 42>45>..\..\..\..\..\Slicer-1\Libs\MRML\Logic\vtkMRMLColorLogic.cxx(1453) : error C2039: 'isspace' : is not a member of 'std' From: Andras Lasso <lasso@queensu.ca> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24750 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
|
master abf96d33 2015-11-18 11:54:11 Details Diff |
STYLE: vtkMRMLColorLogic: Improve readability adding separator comment From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> git-svn-id: http://svn.slicer.org/Slicer4/trunk@24749 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
|
master 0ee8ef5d 2015-11-17 21:21:30 Details Diff |
BUG: Fixed crash when deleting a model display node git-svn-id: http://svn.slicer.org/Slicer4/trunk@24748 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/DisplayableManager/vtkMRMLModelDisplayableManager.cxx | Diff File | ||
|
master 69a357bf 2015-11-17 15:46:04 naucoin Details Diff |
COMP: Fix compiler warning about qMRMLLayoutManager unused variable This fix removes many compiler warnings of the form: warning: unused variable 'd' [-Wunused-variable] Q_D(const qMRMLLayoutManager); ^ git-svn-id: http://svn.slicer.org/Slicer4/trunk@24747 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLLayoutManager.cxx | Diff File | ||
|
master ab8c7439 2015-11-17 11:08:25 naucoin Details Diff |
COMP: fixing windows build errors in vtkMRMLColorLogic This commit is to fix the build error introducted in r24742 (ENH: Add terminology information to color picker in Editor) 42>44>c:\d\n\slicer-1\libs\mrml\logic\vtkMRMLColorLogic.h(73) : error C2679: binary '<<' : no operator found which takes a right-hand operand of type 'std::string' (or there is no acceptable conversion) Issue 0004047 git-svn-id: http://svn.slicer.org/Slicer4/trunk@24746 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.h | Diff File | ||
|
master c7c59a07 2015-11-17 00:12:21 Details Diff |
COMP: Fix Linux build error in vtkMRMLColorLogic This commit fixes a build error introduced in r24742 (ENH: Add terminology information to color picker in Editor) /path/to/Slicer/Libs/MRML/Logic/vtkMRMLColorLogic.cxx:1402:26: error: ‘find_if’ is not a member of ‘std’ ret.erase(ret.begin(), std::find_if(ret.begin(),ret.end(), ^ /path/to/Slicer/Libs/MRML/Logic/vtkMRMLColorLogic.cxx:1404:13: error: ‘find_if’ is not a member of ‘std’ ret.erase(std::find_if(ret.rbegin(),ret.rend(), ^ /path/to/Slicer/Libs/MRML/Logic/vtkMRMLColorLogic.cxx: In member function ‘bool vtkMRMLColorLogic::ParseTerm(std::string, vtkMRMLColorLogic::StandardTerm&)’: /path/to/Slicer/Libs/MRML/Logic/vtkMRMLColorLogic.cxx:1428:14: error: ‘count’ is not a member of ‘std’ size_t n = std::count(str.begin(), str.end(), ';'); ^ git-svn-id: http://svn.slicer.org/Slicer4/trunk@24745 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
|
master 229c3d35 2015-11-17 00:12:19 Details Diff |
STYLE: Fix "sign-compare" warning in vtkMRMLColorLogic This commit fixes a warning introduced by r24742 (ENH: Add terminology information to color picker in Editor) /path/to/Slicer/Libs/MRML/Logic/vtkMRMLColorLogic.cxx:101:45: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < this->ColorFiles.size(); i++) ^ /path/to/Projects/Slicer/Libs/MRML/Logic/vtkMRMLColorLogic.cxx:106:49: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < this->UserColorFiles.size(); i++) ^ /path/to/Projects/Slicer/Libs/MRML/Logic/vtkMRMLColorLogic.cxx:112:56: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < this->TerminologyColorFiles.size(); i++) ^ git-svn-id: http://svn.slicer.org/Slicer4/trunk@24744 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
|
master fe937b8f 2015-11-16 18:24:44 naucoin Details Diff |
BUG: Fix error in terminology install command Remove the extra ColorFiles directory in the install path. Issue 0004047 git-svn-id: http://svn.slicer.org/Slicer4/trunk@24743 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/Logic/Resources/CMakeLists.txt | Diff File | ||
|
master 1f0a534f 2015-11-16 17:46:35 naucoin Details Diff |
ENH: Add terminology information to color picker in Editor Added terminology files, read them on start up, associate with the generic anatomy colors node. Add accessors to the color logic as well as basic methods to allow creating new terminologies (used by the Reporting extension). Created Python callable utility methods to allow scripted access[1]. Add read only widgets to the Editor, shown if the selected color node has terminology associated with it (using node attributes). Added testing for the terminology functionality to vtkSlicerColorLogicTest (rather than in vtkMRMLColorLogicTest1 since the Colors module logic adds the terminology files). Pass the color logic to the color model so that it can look up terminology information to set the tool tips on the color table entries. Minor changes to respond to feedback on the pull request (CMake, references, default terminology). [1] Utility accessor functions: - GetTerminologyFromLabel takes in the strings defining the color label categorization and the standard term elements and returns the specific term. - Get the colon concatenated full standard term values via GetSegmentedPropertyCategory, GetSegmentedPropertyType, GetSegmentedPropertyTypeModifier, GetAnatomicRegion, GetAnatomicRegionModifier Issue 0004047 git-svn-id: http://svn.slicer.org/Slicer4/trunk@24742 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/Logic/Resources/CMakeLists.txt | Diff File | ||
| add - Base/Logic/Resources/ColorFiles/Terminology/AnatomicRegionAndModifier.xml | Diff File | ||
| add - Base/Logic/Resources/ColorFiles/Terminology/GenericAnatomyColors-SNOMED.csv | Diff File | ||
| add - Base/Logic/Resources/ColorFiles/Terminology/SegmentationCategoryTypeModifier.xml | Diff File | ||
| mod - Libs/MRML/Logic/Testing/Cxx/CMakeLists.txt | Diff File | ||
| add - Libs/MRML/Logic/Testing/Cxx/vtkMRMLColorLogicTest2.cxx | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.cxx | Diff File | ||
| mod - Libs/MRML/Logic/vtkMRMLColorLogic.h | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLColorModel.cxx | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLColorModel.h | Diff File | ||
| mod - Libs/MRML/Widgets/qMRMLColorModel_p.h | Diff File | ||
| mod - Modules/Loadable/Colors/Logic/Testing/Cxx/vtkSlicerColorLogicTest1.cxx | Diff File | ||
| mod - Modules/Loadable/Colors/Logic/vtkSlicerColorLogic.cxx | Diff File | ||
| mod - Modules/Loadable/Colors/Logic/vtkSlicerColorLogic.h | Diff File | ||
| mod - Modules/Loadable/Colors/qSlicerColorsModuleWidget.cxx | Diff File | ||
| mod - Modules/Scripted/EditorLib/EditColor.py | Diff File | ||
|
master edb68b8d 2015-11-16 17:23:29 Details Diff |
ENH: Added update_display parameter to cli It allows running a CLI without resetting the slice viewers. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24741 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Base/Python/slicer/cli.py | Diff File | ||
|
master 6ebe82ba 2015-11-13 10:07:59 Details Diff |
BUG: Fixed invalid memory access MapLabelIDtoColorName returned a const char* pointer to a deleted memory area. Fixed by copying the text to a std::string and returning that. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24740 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Modules/CLI/PETStandardUptakeValueComputation/PETStandardUptakeValueComputation.cxx | Diff File | ||
|
master e389962c 2015-11-12 16:59:30 Details Diff |
BUG: Fixed transform nod stuck StartModify When vtkMRMLTransformNode::Copy was called with an invalid argument the method returned after StartModify without calling EndModify. Changed the order of operations to prevent this. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24739 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Core/vtkMRMLTransformNode.cxx | Diff File | ||
|
master 4c194e14 2015-11-12 16:55:53 Details Diff |
BUG: Fixed crash in qMRMLItemDelegate Crash occurred while editing a floating-point value with the sliderWidget. Added null-pointer check and warning log. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24738 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLItemDelegate.cxx | Diff File | ||
|
master 953e5f8e 2015-11-12 13:11:56 Details Diff |
ENH: Begin post-4.5.0-1 development git-svn-id: http://svn.slicer.org/Slicer4/trunk@24736 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
| mod - Utilities/Scripts/SlicerWizard/__version__.py | Diff File | ||
|
master 46a42f4f 2015-11-12 12:52:28 Details Diff |
ENH: Slicer 4.5.0-1 git-svn-id: http://svn.slicer.org/Slicer4/trunk@24735 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
| mod - Utilities/Scripts/SlicerWizard/__version__.py | Diff File | ||
|
master 7c91689f 2015-11-12 12:50:11 Details Diff |
BUG: Revert workaround for MRML Scene import limitation. See 0004081 This commit reverts r24723 (BUG: Workaround MRML Scene import limitation. Fixes 0003462, 0002849 and 0004080). It turns out that this commit had unintended side effects. The following tests were failing: py_LandmarkRegistration py_SlicerMRBMultipleSaveRestoreTest py_SlicerMRBMultipleSaveRestoreLoopTest py_SlicerMRBTest py_NeurosurgicalPlanningTutorialMarkupsSelfTest qMRMLSceneModelTest After concerting with the core team, since the correct fix involves changes in the core of MRML, we decided to revert this commit and mark the tickets 0003462, 0002849, 0004080 as known issues in the release note. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24734 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Libs/MRML/Widgets/qMRMLSceneModel.cxx | Diff File | ||
|
master bee2ef51 2015-11-12 11:46:18 Details Diff |
STYLE: ExtensionWizard: Include patch version in __version__ The version of the wizard is now consistent with the version of Slicer. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24733 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - Utilities/Scripts/SlicerWizard/__version__.py | Diff File | ||
| mod - Utilities/Scripts/SlicerWizard/__version__.py.in | Diff File | ||
|
master 16f6864b 2015-11-12 11:46:15 Details Diff |
BUG: Fix CMake code checking if current build is a release or not. Following r21548 (ENH: Make the applications to build customizable), Slicer_VERSION_TWEAK is passed as a parameter to Slicer external project, to account for this, this commit updates the code to check for the variable being an empty string. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24732 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/SlicerMacroBuildApplication.cmake | Diff File | ||
| mod - CMakeLists.txt | Diff File | ||
| mod - Utilities/Scripts/SlicerWizard/CMakeLists.txt | Diff File | ||
| mod - Utilities/Scripts/SlicerWizard/doc/CMakeLists.txt | Diff File | ||
|
master 886c76b7 2015-11-12 11:46:13 Details Diff |
COMP: Fix ExternalProjectAddSource to work with non-clean build directory. This commit ensure option associated with remote module are always up-to-date even when changed in an existing build directory. This particular problem was found after changing the minor version to "5" and observing that BRAINSTools module were still building in the lib/Slicer-4.4/cli-modules directory. This was explained because variables like BRAINSTools_CLI_LIBRARY_OUTPUT_DIRECTORY were not forced into the cache, preventing the "mark_as_superbuild" function from grabbing the up-to-date value. git-svn-id: http://svn.slicer.org/Slicer4/trunk@24731 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMake/ExternalProjectAddSource.cmake | Diff File | ||
|
master a9756238 2015-11-12 11:46:11 Details Diff |
ENH: Begin post-4.5.0 development git-svn-id: http://svn.slicer.org/Slicer4/trunk@24730 3bd1e089-480b-0410-8dfb-8563597acbee |
||
| mod - CMakeLists.txt | Diff File | ||
| mod - Utilities/Scripts/SlicerWizard/__version__.py | Diff File | ||
