Changesets: Slicer

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

2013-02-21 23:44:46

jcfr

Details Diff
COMP: Move Editor logic Cpp classes from "Base/Logic" to "EditorLib/Logic"

These classes implementing the logic associated with editor effects, it
make sens to move them along side the EditorLib module.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21767 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Logic/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionWeightedVolumeMasking/CMakeLists.txt Diff File
mod - Modules/CLI/DiffusionWeightedVolumeMasking/Testing/CMakeLists.txt Diff File
mod - Modules/Scripted/EditorLib/CMakeLists.txt Diff File
add - Modules/Scripted/EditorLib/Logic/CMakeLists.txt Diff File

2145-support-for-installing-extension-from-file 881a7860

2013-02-21 22:37:20

jcfr

Details Diff
COMP: Move "Slicer3Adapters.tcl" into "Python/slicer/tcl"

The historical folder GUI that was specific to Slicer3 had been removed
and "Slicer3Adapters.tcl" has been moved to a more suitable home. It is now
copied/installed as a python resources available within the python
directory.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21766 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/CMakeLists.txt Diff File
rm - Base/GUI/CMakeLists.txt Diff File
mod - Base/Python/CMakeLists.txt Diff File
mod - Base/Python/slicer/slicerqt-with-tcl.py Diff File

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

2013-02-21 21:20:57

jcfr

Details Diff
COMP: Move Editor icons from "Base/Logic" into "EditorLib/Resources/Icons"

Also introduced the python constant EditorLib.ICON_DIR allowing
to easily resolve icon filepaths.

The variable is set using the __file__ attribute of EditorLib module.

Since the file/directory organization of either (1) source code, (2) file copied
into the build dir or (3) installed files is the same, the ICON_DIR
variable will allow to resolve the icon file paths successfully.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21765 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/GUI/CMakeLists.txt Diff File
mod - Modules/Scripted/Editor/Editor.py Diff File
mod - Modules/Scripted/EditorLib/CMakeLists.txt Diff File
mod - Modules/Scripted/EditorLib/EditBox.py Diff File
mod - Modules/Scripted/EditorLib/__init__.py Diff File

2145-support-for-installing-extension-from-file 00ac7289

2013-02-21 19:46:12

jcfr

Details Diff
COMP: Re-organize Scripted module directories

* Built-in scripted module are now organize like the extension. One folder
per module.

* Macro "slicerMacroBuildScriptedModule" is now used consistently.

* Generic tests are now added auto-magically with the help of the new
parameter "WITH_GENERIC_TESTS".

* Remove unused ChangeTracker tests and created an issue
on the extension tracker. See https://github.com/fedorov/ChangeTrackerPy/issues/13

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21764 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/CMakeLists.txt Diff File
add - Modules/Scripted/DICOM/CMakeLists.txt Diff File
rm - Modules/Scripted/DICOMLib/CMakeLists.txt Diff File
add - Modules/Scripted/DICOMPlugins/CMakeLists.txt Diff File
add - Modules/Scripted/DataProbe/CMakeLists.txt Diff File
add - Modules/Scripted/Editor/CMakeLists.txt Diff File
mod - Modules/Scripted/EditorLib/CMakeLists.txt Diff File
add - Modules/Scripted/Endoscopy/CMakeLists.txt Diff File
add - Modules/Scripted/FiberBundleToLabelMap/CMakeLists.txt Diff File
add - Modules/Scripted/LabelStatistics/CMakeLists.txt Diff File
add - Modules/Scripted/PerformanceTests/CMakeLists.txt Diff File
add - Modules/Scripted/SampleData/CMakeLists.txt Diff File
add - Modules/Scripted/SampleData/Testing/Python/CMakeLists.txt Diff File
rm - Modules/Scripted/Scripts/CMakeLists.txt Diff File
rm - Modules/Scripted/Scripts/DICOM2FullBrainTractography/DICOM2FullBrainTractographyLib/CMakeLists.txt Diff File
rm - Modules/Scripted/Scripts/DICOMPlugins/CMakeLists.txt Diff File
rm - Modules/Scripted/Scripts/Testing/Python/CMakeLists.txt Diff File
add - Modules/Scripted/SelfTests/CMakeLists.txt Diff File
rm - Modules/Scripted/Testing/CMakeLists.txt Diff File
rm - Modules/Scripted/Testing/ChangeTrackerTest1.py Diff File
add - Modules/Scripted/VectorToScalarVolume/CMakeLists.txt Diff File

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

2013-02-21 19:45:58

jcfr

Details Diff
ENH: Add option WITH_GENERIC_TESTS to slicerMacroBuildScriptedModule

Instead of manually invoking "SlicerMacroConfigureGenericPythonModuleTests"
and then adding the associated scripts, specifying this new option
will auto-magically add the generic test.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21763 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerMacroBuildScriptedModule.cmake Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/CMakeLists.txt Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/Testing/Python/CMakeLists.txt Diff File

2145-support-for-installing-extension-from-file 059eec73

2013-02-21 19:45:55

jcfr

Details Diff
STYLE: Tweak ScriptedLoadableModuleTemplate

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21762 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/EditorExtensionTemplate/EditorEffectTemplate/EditorEffectTemplate.py Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/CMakeLists.txt Diff File

2145-support-for-installing-extension-from-file 9594e13d

2013-02-21 19:45:53

jcfr

Details Diff
ENH: Add option WITH_SUBDIR to slicerMacroBuildScriptedModule

Let's illustrate how the macro works considering a simple example. There
is a module named "Foo" having few scripts:

/path/to/Foo/TheFoo.py
/path/to/Foo/FooLib/a.py
/path/to/Foo/FooLib/b.py

First, let's set the following variables:

DESTINATION_DIR = <Slicer-build>/lib/Slicer-4.2/qt-scripted-modules
INSTALL_DIR = /path/to/Slicer/lib/Slicer-4.2/qt-scripted-modules

Two cases are now supported:

* Default case:

slicerMacroBuildScriptedModule(
NAME Foo
SCRIPTS Foo FooLib/a FooLib/b
)

Will be copied into DESTINATION_DIR / INSTALL_DIR:

<DESTINATION_DIR|INSTALL_DIR>/TheFoo.py
<DESTINATION_DIR|INSTALL_DIR>/FooLib/a.py
<DESTINATION_DIR|INSTALL_DIR>/FooLib/b.py

* WITH_SUBDIR case:

slicerMacroBuildScriptedModule(
NAME Foo
SCRIPTS Foo FooLib/a FooLib/b
WITH_SUBDIR
)

Will be copied into DESTINATION_DIR / INSTALL_DIR:

<DESTINATION_DIR|INSTALL_DIR>/Foo/TheFoo.py
<DESTINATION_DIR|INSTALL_DIR>/Foo/FooLib/a.py
<DESTINATION_DIR|INSTALL_DIR>/Foo/FooLib/b.py

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

2145-support-for-installing-extension-from-file 449c3d21

2013-02-21 19:45:52

jcfr

Details Diff
COMP: Update scripted module build macro to consider script specified without ".py"

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

2145-support-for-installing-extension-from-file 114b7a06

2013-02-21 13:57:55

fedorov

Details Diff
ENH: make sure the error is printed once, otherwise the otput slows down the execution of the filter too much


git-svn-id: http://svn.slicer.org/Slicer4/trunk@21759 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Logic/vtkPichonFastMarching.cxx Diff File

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

2013-02-21 13:49:53

fedorov

Details Diff
ENH: adding FastMarching effect to Editor; see issue 0002454


git-svn-id: http://svn.slicer.org/Slicer4/trunk@21758 3bd1e089-480b-0410-8dfb-8563597acbee
add - Base/GUI/Tcl/ImageData/FastMarchingEffect.png Diff File
mod - Modules/Scripted/EditorLib/CMakeLists.txt Diff File
mod - Modules/Scripted/EditorLib/EditBox.py Diff File
add - Modules/Scripted/EditorLib/FastMarchingEffect.py Diff File
mod - Modules/Scripted/EditorLib/__init__.py Diff File

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

2013-02-21 06:41:47

jcfr

Details Diff
COMP: Fix ScriptedLoadableExtensionTemplate python test

Following commit r21747, the parameter to SlicerMacroConfigureGenericPythonModuleTests
has not been updated. This commit update the parameter so that
the generated python unit tests expect the right values.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21757 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/Testing/Python/CMakeLists.txt Diff File

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

2013-02-20 15:58:51

mccormic

Details Diff
STYLE: Fix include style for ITK headers.

Slicer style is to use < > instead of " for ITK headers.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21756 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/CLI/ExpertAutomatedRegistration/Testing/GenerateExpertAutomatedRegistrationTestData.cxx Diff File

2145-support-for-installing-extension-from-file 16c91a98

2013-02-20 15:42:22

mccormic

Details Diff
STYLE: Include itkConfigure.h to show where macro originates.

Also, move include with the rest of the ITK headers.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21755 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/CLI/ExpertAutomatedRegistration/Testing/GenerateExpertAutomatedRegistrationTestData.cxx Diff File

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

2013-02-20 15:41:47

jcfr

Details Diff
COMP: Update ITKv4 to fix DTIAtlasBuilder visual studio build errors.

It includes commit 69e6bc:

COMP: VectorIndexSelectionCastImageFilter extra itk namespace.
The itk:: namespace specification should not be given within
namespace itk{ } -- it is against ITK style and confuses some
compilers.

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

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

2013-02-20 15:02:48

jcfr

Details Diff
COMP: Make sure ITKFactoryRegistration_INCLUDE_DIRS is exposed to extension.

The expected include directories are already being included through the
help of the variable "Slicer_Libs_INCLUDE_DIRS"

That said, appending it to ITK_INCLUDE_DIRS will ensure that module
linking only against ITK will have all the elements allowing to
register ITK IOFactories available to them.

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

2145-support-for-installing-extension-from-file 566e917f

2013-02-20 10:49:47

mccormic

Details Diff
COMP: Link GenerateExpertAutomatedRegistrationTestData with ITKFactoryRegistration.

Needed for TubeTK to link.

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

2145-support-for-installing-extension-from-file 8840e344

2013-02-20 00:06:17

mccormic

Details Diff
BUG: GenerateExpertAutomatedRegistrationTestData FactoryRegistration.

The executable needs to call the ITK FactoryRegistration function to
get the ImageIO factories registered hen in Slicer.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21751 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/CLI/ExpertAutomatedRegistration/Testing/GenerateExpertAutomatedRegistrationTestData.cxx Diff File

2145-support-for-installing-extension-from-file 585876d2

2013-02-19 20:32:10

jcfr

Details Diff
COMP: Change "EditorExtensionTemplate" layout to support addition of modules/effects.

The re-organization has been done following the approach detailed
in commit r21747.

Also addded the metadata "EXTENSION_ICONURL"

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21750 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/EditorExtensionTemplate/CMakeLists.txt Diff File
add - Extensions/Testing/EditorExtensionTemplate/EditorEffectTemplate/CMakeLists.txt Diff File
add - Extensions/Testing/EditorExtensionTemplate/EditorEffectTemplate/EditorEffectTemplate.png Diff File

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

2013-02-19 20:18:52

jcfr

Details Diff
COMP: Remove empty dirs

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21749 3bd1e089-480b-0410-8dfb-8563597acbee

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

2013-02-19 20:16:46

jcfr

Details Diff
STYLE: In extension templates, change homepage url from 4.2 to Nightly

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21748 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/CLIExtensionTemplate/CMakeLists.txt Diff File
mod - Extensions/Testing/LoadableExtensionTemplate/CMakeLists.txt Diff File

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

2013-02-19 20:16:44

jcfr

Details Diff
COMP: Change "ScriptedLoadableExtensionTemplate" layout to support addition of modules.

As a side note, the ModuleWizard has been used to easily re-organize this
module (and also the one associated with r21745 and r21746):

Steps:
1) cd /path/to/Extensions/Testing/ScriptedLoadableExtensionTemplate

2) ../../Utilities/Scripts/ModuleWizard.py --template ./ScriptedLoadableExtensionTemplate/ --target ./ScriptedLoadableModuleTemplate ScriptedLoadableModuleTemplate

3) mv ScriptedLoadableModuleTemplate/ ScriptedLoadableExtensionTemplate/

4) Remove extra files

5) Edit CMakeLists.txt and ScriptedLoadableModuleTemplate/CMakeLists.txt

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21747 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/CMakeLists.txt Diff File
add - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/CMakeLists.txt Diff File
add - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/Resources/Icons/ScriptedLoadableModuleTemplate.png Diff File

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

2013-02-19 19:38:35

jcfr

Details Diff
COMP: Change "LoadableExtensionTemplate" layout to support addition of modules.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21746 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/Testing/LoadableExtensionTemplate/CMakeLists.txt Diff File
rm - Extensions/Testing/LoadableExtensionTemplate/Documentation/LoadableExtensionTemplate.dox Diff File
add - Extensions/Testing/LoadableExtensionTemplate/LoadableModuleTemplate/CMakeLists.txt Diff File
add - Extensions/Testing/LoadableExtensionTemplate/LoadableModuleTemplate/Resources/Icons/LoadableModuleTemplate.png Diff File

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

2013-02-19 19:38:27

jcfr

Details Diff
COMP: Change "CLIExtensionTemplate" layout to support addition of modules.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21745 3bd1e089-480b-0410-8dfb-8563597acbee
add - Extensions/Testing/CLIExtensionTemplate/CLIModuleTemplate/CMakeLists.txt Diff File
add - Extensions/Testing/CLIExtensionTemplate/CLIModuleTemplate/Data/Baseline/CLIModuleTemplateTest.nhdr.md5 Diff File
mod - Extensions/Testing/CLIExtensionTemplate/CMakeLists.txt Diff File
rm - Extensions/Testing/CLIExtensionTemplate/Data/Baseline/CLIExtensionTemplateTest.nhdr.md5 Diff File

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

2013-02-19 19:35:50

jcfr

Details Diff
COMP: Remove unused "vtkSlicerROILogic" class

Not user anywhere. This class was originally used by vtkSlicerROIGUI
which has been removed with r16260.

"API changes Roadmap" wiki page has also been updated.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21744 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Logic/CMakeLists.txt Diff File
rm - Base/Logic/vtkSlicerROILogic.cxx Diff File
rm - Base/Logic/vtkSlicerROILogic.h Diff File

2145-support-for-installing-extension-from-file 86d00bbf

2013-02-19 18:27:30

jcfr

Details Diff
COMP: Ensure relaxed Qt version checking works for extension

Commit 21727 introduced the variable Slicer_EXPERIMENTAL_QT_VERSION, the
problem was that the variable wasn't added to SlicerConfig, this was causing
problem with the macro checking qt version within extension.

Thanks to Matt McCormick for reporting the issue.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21743 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerConfig.cmake.in Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 39 40 41 42 43 44 45 ... 50 ... 55 56 57  Next  Last