Changesets: Import 2017-06-07 23:51:09

master 619b37e3

2014-05-30 18:43:00

mwoehlke

Details Diff
ENH: Add python-chardet external project

Add external project for chardet Python module used in the previous
commit, so that we have actual detection available and not just ASCII
vs. "don't know". Like GitPython and friends, this is only enabled if
Python and extension manager support are enabled, and system Python is
not used.

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

master b9aec1d2

2014-05-30 18:42:58

mwoehlke

Details Diff
BUG: Fix TemplateManager unicode support

Add a helper function (in SlicerWizard.Utilities) to detect the
character encoding of an input byte sequence. Use this in
TemplateManager to correctly handle encoding conversion of template
files in case the replacement text is a unicode, rather than a str
(which otherwise results in an exception when automatic conversion tries
to convert non-ASCII files).

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23266 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Utilities/Scripts/SlicerWizard/TemplateManager.py Diff File
mod - Utilities/Scripts/SlicerWizard/Utilities.py Diff File

master fd15ae3b

2014-05-30 18:42:57

mwoehlke

Details Diff
ENH: Create in-Slicer Extension Wizard (skeleton)

Create the initial skeleton of the in-Slicer Extension Wizard. This will
provide a graphical front-end to (some of) the Extension Wizard
functions. Right now, only creation is implemented.

Issue 0003603

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23265 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/CMakeLists.txt Diff File
add - Modules/Scripted/ExtensionWizard/CMakeLists.txt Diff File
add - Modules/Scripted/ExtensionWizard/ExtensionWizard.py Diff File
add - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/CreateExtensionDialog.py Diff File
add - Modules/Scripted/ExtensionWizard/ExtensionWizardLib/__init__.py Diff File
add - Modules/Scripted/ExtensionWizard/Resources/Icons/ExtensionWizard.png Diff File

master 71b1a0df

2014-05-30 18:42:56

mwoehlke

Details Diff
ENH: Add "introspection" to TemplateManager

Add new methods to TemplateManager to get the list of known categories
and available templates (the latter taking an optional category). These
are helpful for allowing the user to select from available templates in
cases where listTemplates() is not optimal (e.g. from a GUI).

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23264 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Utilities/Scripts/SlicerWizard/TemplateManager.py Diff File

master 5cd274d3

2014-05-30 18:42:55

mwoehlke

Details Diff
ENH: Install SlicerWizard

Add rules to install the SlicerWizard modules. This gets us one step
closer to having the extension wizard available from an install tree,
and also makes the SlicerWizard package available from within Slicer
itself.

Note that installation of the SlicerWizard modules is conditional on
Slicer_BUILD_EXTENSIONMANAGER_SUPPORT being enabled.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23263 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Utilities/Scripts/SlicerWizard/CMakeLists.txt Diff File

master eb08f9f1

2014-05-30 16:42:35

jcfr

Details Diff
COMP: Update CTK - Fixes windows build error

Error that will be fixed:

31>6>4>..\..\..\..\CTK\Libs\Widgets\ctkTestApplication.cpp(129) : error C2228: left of '.toLocal8Bit' must have class/struct/union
31>6>4> type is 'const char *'


All other changes:

$ git shortlog dc9fd81..383c477 --no-merges
Andreas Fetzer (6):
Added support for modification time in xnat
Adaptions to changes in qRestAPI
Cleanup
Added support for resources for all levels of the xnat data hierachy
Fixed reconstruction to diplay content properly
Cleanup

Jean-Christophe Fillion-Robin (1):
Fix build of ctkTestApplication.cpp with Qt4. Fixes 0000482

Sascha Zelzer (7):
Always use brackets for if statements.
Fix unused parameter warning.
qRegisterMetaType ctkServiceReference and QSharedPointer<ctkPlugin>, because the weakness of Qt MetaType system, we need to register type early.
Break the #include <QtSql> into #include <QLibrary> #include <QSqlQuery> #include <QDebug> #include <QSqlError> #include <QPluginLoader> #include <QDirIterator> because Qt
Work around different wchar_t settings.
Use ascii ' instead unicode ‘’
Fix ctkConsoleTest for Qt5.

Yonggang Luo (6):
Move the REGISTERED macro check to the front of the ctkServiceEvent file.
It's should return T() but QVariant().
Add the lost Q_D(const PluginTracker); in ctkPluginTracker<T>::isEmpty()
Use unicode version FormatMessageW in ctkPluginFrameworkLauncher::appendPathEnv
Use ascii ' instead of unicode ’ in file ctkEventAdmin.h
use GetProcAddress to safe calling to RtlCaptureStackBackTrace in ctkBackTrace.cpp

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

master 4dd9e194

2014-05-29 11:56:16

mwoehlke

Details Diff
COMP: Add VTKv6 Python path to launcher

It appears that the way VTKv6 chooses the location to which to install
its Python bindings has changed. As obtaining the Python version early
enough to override the path with the new VTKv6 mechanism appears to be
non-obvious/non-trivial, we instead punt, and add the location that is
now being used to the launcher's PYTHONPATH's.

Also, remove specification of VTK_INSTALL_PYTHON_USING_CMAKE, which no
longer exists in VTKv6.

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

master 560051f5

2014-05-29 02:27:26

jcfr

Details Diff
BUG: Update CTK to include python console tweaks.

$ git shortlog c117a00..dc9fd8167 --no-merges
Julien Finet (2):
Ensure edit line in ctkConsole is always visible
Add open file dialog and print help message actions

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

master 69b21d8a

2014-05-29 01:11:37

jcfr

Details Diff
COMP: Update CTK to fix windows build error.

//---------------------------------
Fix windows build errors related to relocation of classes

This commit update the export macro according to accommodate the
relocation of the classes done in commit 448aaf3

Error were similar to the report below:

.\moc_ctkHistogram.cxx(40) : error C2491: 'ctkHistogram::staticMetaObject' : definition of dllimport static data member not allowed
//---------------------------------

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

master b80628b6

2014-05-28 21:37:23

hjohnson

Details Diff
ENH: Simplify logic for pushing sitk objects to slicer

After reviewing the SimpleFilters code a simpler and
more robust methods of pushing SimpleITK images to
slicer was identified.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23258 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Python/sitkUtils.py Diff File

master f0e50b1e

2014-05-28 18:04:21

jcfr

Details Diff
COMP: Fix unused variable warnings in qSlicerSubjectHierarchyDefaultPlugin

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23257 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDefaultPlugin.cxx Diff File

master 87e721b1

2014-05-28 18:04:19

jcfr

Details Diff
BUG: Update CTK - Fix "No such slot" warning and optimize ctkVTKConnection

* Fixes 0003361: Fix "No such slot" warning and optimize ctkVTKConnection

* Fixes 0003719: py_SubjectHierarchyGenericSelfTest passes but it output warning about slot disconnection

* Improve performance of ctkVTKConnection creation/removal

* Add Qt5 support to CTK

* Thanks to Eric Larson. ctkAbstractView now provides a method allowing to
set multisampling.

* Since ctkErrorLogModel has been moved from CTKCore to CTKWidget (because
QStandardItemModel belongs to QtGUI), similarly the error log model has
been moved from qSlicerCoreApplication to qSlicerApplication.

Details:

$ git shortlog daaf705c..6f2c55809 --no-merges
Eric Larson (1):
Added static method to set multisampling.

Jean-Christophe Fillion-Robin (18):
Fix compilation of tests against VTK6
Fix qDebug operator to handle case when VTKObject is null
Improve documentation of setStrictTypeCheck() method
Remove unused signal "isBroke()"
Refactor ctkVTKConnectionTest1 for easier maintenance and readability
Update ctkVTKConnectionTest1 to use ctkCallback
Update ctkVTKConnectionTest1 to allow each test case to be run independently
Split disconnect function
Allow ctkVTKConnection pimpl to be subclassed
Add method to return VTK object associated with ctkVTKConnection
Add ctkVTKConnectionTestObjectDelete
Fix ctkVTKConnectionTestObjectDelete
Improve performance disabling "deletion" observation
Fix ctkVTKConnectionTest1 removing connection time ratio test
ENH: Pass Qt CMake variable using "mark_as_superbuild"
Fixes configuration when enabling PythonQt wrapping
Remove extra CMake debug statement introduced by commit 47b34216
Update CTKWidget PythonQt decorator to fix build error following Qt5 transition

Julien Finet (1):
Add support for Qt5

Matthew Woehlke (1):
Allow compiling/installing generated Python files

Sascha Zelzer (8):
First set of build system patches for Qt5 support.
This commit enables Qt5 support for the CTK Core library, issue 0000277.
Use Qt5 CMake 2.8.12 features.
Qt5 compatibility for almost all libraries.
Do not assume a specific Qt5 install structure.
Make more libs and apps compatible with Qt5.
Use Qt5 compatible qRestAPI version.
Fix Qt5 dependencies in case only CTK_BUILD_ALL is enabled.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23256 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/qSlicerAppMainWindow.cxx Diff File
mod - Base/QTCore/qSlicerBaseQTCorePythonQtDecorators.h Diff File
mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File
mod - Base/QTCore/qSlicerCoreApplication.h Diff File
mod - Base/QTCore/qSlicerCoreApplication_p.h Diff File
mod - Base/QTGUI/Testing/Cxx/qSlicerModuleGenericTest.cxx.in Diff File
mod - Base/QTGUI/Testing/Cxx/qSlicerModuleWidgetGenericTest.cxx.in Diff File
mod - Base/QTGUI/qSlicerApplication.cxx Diff File
mod - Base/QTGUI/qSlicerApplication.h Diff File
mod - Base/QTGUI/qSlicerBaseQTGUIPythonQtDecorators.h Diff File
mod - Libs/MRML/Widgets/qMRMLEventBrokerConnection.cxx Diff File
mod - SuperBuild/External_CTK.cmake Diff File

master 8d88151d

2014-05-28 13:59:07

jcfr

Details Diff
BUG: Update SubjectHierarchyGenericSelfTestTest to support VTK6. Fixes 0003720

In both VTK 5 and 6 cases, the pipeline is connected and the
explicit call to "Update()" is not required.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23255 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyGenericSelfTest.py Diff File

master 7fd70f5e

2014-05-28 13:42:00

mwoehlke

Details Diff
STYLE: Add debugging to Extension Wizard

Add additional debugging information to the Extension Wizard when
creating a compare URL for a pull request to (hopefully) help diagnose
failures. Add a (hidden) --dryRun option which will skip actually
creating the pull request during --contribute.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23254 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Utilities/Scripts/SlicerWizard/ExtensionWizard.py Diff File

master f336a9ef

2014-05-28 11:43:15

mwoehlke

Details Diff
BUG: Don't install already-installed dependencies

When considering an extension's dependencies, don't prompt about (or
attempt to (re)install) dependencies that are already installed.

Issue 0002912

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

master 64e40c51

2014-05-28 03:42:51

jcfr

Details Diff
STYLE: Improve error output of subject hierarchy TestTransformBranch

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23252 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Testing/Cxx/vtkSlicerSubjectHierarchyModuleLogicTest.cxx Diff File

master 4d23b1f8

2014-05-28 03:42:48

jcfr

Details Diff
STYLE: Update vtkMRMLSubjectHierarchyNode to use vtkNew

Also fixes indent

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23251 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyNode.cxx Diff File

master 85b3db6c

2014-05-28 03:42:46

jcfr

Details Diff
ENH: Update subject hierarchy PopulateScene to check nodes are added.

This commit basically removed the assert and add corresponding
test.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23250 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Testing/Cxx/vtkSlicerSubjectHierarchyModuleLogicTest.cxx Diff File

master e3386f0f

2014-05-28 03:42:43

jcfr

Details Diff
ENH: Simplify vtkMRMLTransformableNode::GetParentTransformNode

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23249 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLTransformableNode.cxx Diff File

master 6a113c3e

2014-05-28 03:42:40

jcfr

Details Diff
STYLE: Improve error output of TestTreeOperations in subject hierarchy test

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23248 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Testing/Cxx/vtkSlicerSubjectHierarchyModuleLogicTest.cxx Diff File

master 176e1d8a

2014-05-28 03:42:38

jcfr

Details Diff
STYLE: Improve readability of subject hierarchy logic test using vtkNew

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23247 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Testing/Cxx/vtkSlicerSubjectHierarchyModuleLogicTest.cxx Diff File

master 260df3d2

2014-05-27 19:05:35

jcfr

Details Diff
BUG: Added error reporting for scene file writing

The problem was that when the scene file (.mrml) saving
failed (e.g., because target was a read-only directory) then
no error was reported.

No error was reported for the sceneview thumbnail image
saving failure either.

From: Andras Lasso <lasso@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23246 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerCoreIOManager.cxx Diff File
mod - Base/QTGUI/qSlicerSaveDataDialog.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLScene.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLSceneViewStorageNode.cxx Diff File

master 882c62d9

2014-05-27 17:45:09

jcfr

Details Diff
STYLE: SubjectHierarchy - Fix build warnings and indentation

From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23245 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.cxx Diff File
mod - Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Testing/Cxx/vtkSlicerSubjectHierarchyModuleLogicTest.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyChartsPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDICOMPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyRegisterPlugin.cxx Diff File
mod - Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModule.cxx Diff File
mod - Modules/Loadable/Volumes/SubjectHierarchyPlugins/qSlicerSubjectHierarchyVolumesPlugin.cxx Diff File

master c345a4b5

2014-05-27 17:45:06

jcfr

Details Diff
BUG: Fixed subject hierarchy core plugins self test

Which failed due to renaming of GetAssociatedDataNode to GetAssociatedNode in
vtkMRMLSubjectHierarchyNode. It has been renamed, because by making
vtkMRMLHierarchyNode::GetAssociatedNode virtual, it became possible to override
it in subject hierarchy so that it can handle nested associations.

From: Csaba Pinter <csaba.pinter@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23244 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/SubjectHierarchyCorePluginsSelfTest.py Diff File

master fe97ba68

2014-05-27 17:45:04

jcfr

Details Diff
COMP: Fixed Mac and Linux build error

Subject hierarchy widget designer plugins were deployed to Slicer_DIR/bin,
which broke the Linux and Mac build. This explicit output directory
setting has been removed.

From: Csaba Pinter <csaba.pinter@queensu.ca>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23243 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Loadable/SubjectHierarchy/Widgets/DesignerPlugins/CMakeLists.txt Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 109 110 111 112 113 114 115 ... 120 ... 130 ... 133 134 135  Next  Last