Changesets: Slicer

Search Browse Back to Index

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 83929780

2016-05-06 18:47:28

inorton


Committer: jcfr Details Diff 		PERF: qMRMLSceneHierarchyModel: Factor out constant display node lookup

Avoid repeated lookups caused by calls to "GetAssociatedHierarchyNode"
and save a few %
mod - Libs/MRML/Widgets/qMRMLSceneHierarchyModel.cxx Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup afc8cba9

2016-05-06 18:18:24

jcfr

Details Diff 		COMP: Fix vtkObserverManagerTest1 fail in debug

The following avoidable warning causes test failure in debug build:

```
101: Caller name = Testing Model NodeWarning: In /Users/inorton/git/slcr/s4/Libs/MRML/Core/vtkObserverManager.cxx, line 267
101: vtkObserverManager (0x7f80bb05d1b0): Observation 33 between vtkMRMLModelNode and vtkMRMLModelNode already exists.
```

From: Isaiah Norton <inorton@bwh.harvard.edu>

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 9e13b7ec

2016-05-06 18:16:01

jcfr

Details Diff 		PERF: qMRMLSceneDisplayableModel: Factor out constant display node lookup.

This whole section of code is confusing and seems redundant, but it has
been refactored many times and everyone left it there so leave alone.
For now we can at least avoid repeated lookups and save a few %.

From: Isaiah Norton <inorton@bwh.harvard.edu>

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 565a2dd7

2016-05-06 05:03:31

jcfr

Details Diff 		COMP: qMRMLSceneModel: Fix -Woverloaded-virtual and add comment.

This commit follows up previous commit (PERF: qMRMLSceneModel: track and
reuse index during populateScene).

By introducing the previous commit, loading time of "NAC Brain Atlas 2015"
incluyding 0000776:0001600 nodes was reduced by 0000006:0000008%. Experiment consisted in
[Start Slicer, Load the atlas] three times. Loading time was the one
reported in the log.

It fixes the "-Woverloaded-virtual" warnings by moving the method
"insertNode(vtkMRMLNode*, int)" to the pimpl.

//----------------
In file included from /path/to/Slicer-Release/Slicer-build/Modules/Remote/OpenIGTLinkIF/GUI/moc_qMRMLIGTLIOModel.cxx:9:0:
/path/to/Slicer-Release/Slicer-build/Modules/Remote/OpenIGTLinkIF/GUI/../../../../../OpenIGTLinkIF/GUI/qMRMLIGTLIOModel.h:72:26: warning: by ‘qMRMLIGTLIOModel::insertNode’ [-Woverloaded-virtual]
virtual QStandardItem* insertNode(vtkMRMLNode* node);
^

from /path/to/Slicer-Release/OpenIGTLinkIF/GUI/qMRMLIGTLIOModel.cxx:26:
/path/to/Slicer/Libs/MRML/Widgets/qMRMLSceneModel.h:272:26: warning: ‘virtual QStandardItem* qMRMLSceneModel::insertNode(vtkMRMLNode*, int)’ was hidden [-Woverloaded-virtual]
virtual QStandardItem* insertNode(vtkMRMLNode* node, int index);
^
In file included from /path/to/Slicer-Release/OpenIGTLinkIF/GUI/qMRMLIGTLIOModel.cxx:26:0:
/path/to/Slicer-Release/OpenIGTLinkIF/GUI/qMRMLIGTLIOModel.h:72:26: warning: by ‘qMRMLIGTLIOModel::insertNode’ [-Woverloaded-virtual]
virtual QStandardItem* insertNode(vtkMRMLNode* node);
//----------------

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

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25049 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Widgets/qMRMLSceneModel.cxx Diff File
mod - Libs/MRML/Widgets/qMRMLSceneModel.h Diff File
mod - Libs/MRML/Widgets/qMRMLSceneModel_p.h Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 07ba895f

2016-05-06 05:03:29

jcfr

Details Diff 		PERF: qMRMLSceneModel: Track and reuse index during populateScene

Avoid unnecessary scene traversal on every call to `nodeIndex`.

From: Isaiah Norton <inorton@bwh.harvard.edu>

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 95540cbb

2016-05-06 05:03:27

jcfr

Details Diff 		ENH: qSlicerCoreIOManager: Display time used to load a file.

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

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 833e1575

2016-05-06 02:21:36

jcfr

Details Diff 		STYLE: qMRMLSceneModel: clarify cast

From: Isaiah Norton <inorton@bwh.harvard.edu>

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 953fce21

2016-05-06 01:17:46

jcfr

Details Diff 		ENH: Update ITK

$ git shortlog 9fa8f63..ce3e47d --no-merges
Dženan Zukić (1):
ENH: CovariantVector's Normalize returns the norm.

Francois Budin (3):
BUG: Wrapping intermediate files were not automatically updated
ENH: Reduce number of dependencies for XML files generated for wrapping
BUG: GCC is limited when calling overloaded base class functions

Hans Johnson (1):
ENH: Merge GDCM release branch

Jean-Christophe Fillion-Robin (1):
COMP: Fix Slicer MacOSX extension packaging setting CMP0042 policy to OLD

Jon Haitz Legarreta (2):
ENH: Improve itkVersion class code coverage.
ENH: Perform class name checks in test macro

Manuel Grizonnet (1):
COMP: add ITKCommon_EXPORT to fix link issues with external applications

Matthew McCormick (10):
COMP: Update CastXML to support Visual Studio 2015 Update 2.
COMP: Do not set wrapping library visibility with static builds.
COMP: Update CastXML to support Visual Studio 2015 Update 2.
COMP: Broaden the KWStyle warning exception.
COMP: Update KWStyle version.
BUG: Do not use the same output file in N4BiasField Test 2,3.
COMP: Expand EXERCISE_BASIC_OBJECT_METHODS for other GCC versions.
ENH: Update Cuberille Remote to 2015-05-01.
ENH: Enable registration of the IOOpenSlide module through CMake.
ENH: Update itk.org URL's for HTTPS support.

Pablo Hernandez-Cerdan (1):
COMP: Fix warn in FFTW about delete [].

Sean McBride (2):
COMP: Hack HDF5 to build under ASan & UBSan
COMP: fixed clang -Wdeprecated-writable-strings warning

VXL Maintainers (1):
VNL 2016-04-26 (6b168535)

Vladimir S. FONOV (1):
MINC 2016-01-30 (783bca38)

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 9c3a62e4

2016-05-04 20:07:59

jcfr

Details Diff 		COMP: Fix Superbuild extension configuration not having git/svn in the path

This commit fixes the following error:

[Subversion_SVN_EXECUTABLE-NOTFOUND]
Call Stack (most recent call first):
C:/D/N/Slicer-1/Extensions/CMake/SlicerEnableExtensionTesting.cmake:21 (include)
C:/D/N/Slicer-1-build/Slicer-build/UseSlicer.cmake:404 (include)
CMakeLists.txt:20 (include)

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 88445a26

2016-05-02 23:55:03

jcfr

Details Diff 		PERF: use hashmap lookup instead of linear search.

Provides significant performance improvement in large scene loading task
(1200 models), from >20 minutes on master to 5:30.

The comment regarding `find` was incorrect: pointer comparison issue
only applies if a non-const pointer is used *as the key*.

Reviewed-by: Andras Lasso <lasso@queensu.ca>
Reviewed-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

From: Isaiah Norton <inorton@bwh.harvard.edu>

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup e38cb603

2016-05-02 07:36:02

jcfr

Details Diff 		COMP: Extensions: Fix package and upload for superbuild extensions

Similarly to what was done for Slicer package in r24984 (BUG: Update
Slicer build system to report packaging errors on CDash.), this commit
ensures CTEST_MODEL variable is set for Extension packages generated by
superbuild based extensions.

See 0003032

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 38d39949

2016-05-02 05:43:09

jcfr

Details Diff 		BUG: Extensions: Ensure CTEST_MODEL is set when building with upload enabled

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup b5782f57

2016-05-02 05:10:25

jcfr

Details Diff 		ENH: SlicerConfig: Allow forcing of Slicer_WC_REVISION to facilitate testing

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup d94e26d4

2016-05-02 02:41:20

jcfr

Details Diff 		BUG: Fix configuration of extension depending on superbuild based extensions

This commit ensures extension depending on superbuild based extensions
are properly configured with the "_DIR" variable pointing to the "inner"
build directory.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25039 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Extensions/CMake/SlicerBlockBuildPackageAndUploadExtension.cmake Diff File
mod - Extensions/CMake/SlicerBlockBuildPackageAndUploadExtensions.cmake Diff File
mod - Extensions/CMake/SlicerBlockUploadExtension.cmake Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 723ad724

2016-05-02 02:41:18

jcfr

Details Diff 		STYLE: Extensions build system: Display message when CMakeCache is written

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup cf1c1911

2016-05-02 02:41:16

jcfr

Details Diff 		STYLE: BuildPackageAndUploadExtensions: Remove obsolete code

This commit removes code made obsolete by r24983 (ENH: Remove support
for building an ExtensionsIndex directly from Slicer)

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup e001b462

2016-05-02 02:41:14

jcfr

Details Diff 		STYLE: BuildPackageAndUploadExtensions: Simplify setting of extension name

Simplify the code removing the extraction of the extension name from
the description file. Description file path was already set using the
extension name. Reduce code complexity by reusing the variable.

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 1865f51e

2016-04-29 16:08:27

jcfr

Details Diff 		BUG: Improve CircleCI Superbuild check.

Always print the notice that we do not build changes to Slicer dependencies.
Return false when a file in the SuperBuild directory is modified.
TravisCI -> CircleCI.

From: Matt McCormick <matt.mccormick@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25035 3bd1e089-480b-0410-8dfb-8563597acbee
mod - circle.yml Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup d3e8400d

2016-04-29 12:09:30

alexy

Details Diff 		ENH: Added SQLite MRML storage node, test for it, and also it's support in the Tables module.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25034 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/CMakeLists.txt Diff File
mod - Libs/MRML/Core/Testing/CMakeLists.txt Diff File
add - Libs/MRML/Core/Testing/vtkMRMLTableSQLiteStorageNodeTest.cxx Diff File
add - Libs/MRML/Core/vtkMRMLTableSQLiteStorageNode.cxx Diff File
add - Libs/MRML/Core/vtkMRMLTableSQLiteStorageNode.h Diff File
mod - Modules/Loadable/Tables/Logic/vtkSlicerTablesLogic.cxx Diff File
mod - Modules/Loadable/Tables/qSlicerTablesReader.cxx Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup a34f9293

2016-04-29 00:42:32

jcfr

Details Diff 		ENH: Copy the generated Slicer package to the CircleCI artifact dir.

The package generated by a pull request can then be downloaded by members of
the Slicer GitHub organization that have signed up on CircleCI. See:

https://circleci.com/docs/build-artifacts/

From: Matt McCormick <matt.mccormick@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25033 3bd1e089-480b-0410-8dfb-8563597acbee
mod - circle.yml Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup c576e730

2016-04-29 00:42:31

jcfr

Details Diff 		ENH: Cache the Docker image layers on CircleCI.

As recommended in the CircleCI docs:

https://circleci.com/docs/docker/#caching-docker-layers

From: Matt McCormick <matt.mccormick@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25032 3bd1e089-480b-0410-8dfb-8563597acbee
mod - circle.yml Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 5e306558

2016-04-29 00:42:30

jcfr

Details Diff 		ENH: Add CircleCI builds of pull requests.

When a pull request comes in on GitHub, this tests that Slicer builds without
errors. To save time, it only builds Slicer and Slicer's dependencies built
with the superbuild. Slicer's depedencies are pre-built in a Docker image.
This patch does not run the tests because of a lack of a graphical
environment. If the branch contains changes to the Superbuild/ directory, the
build intentionally always fails to indicate that it does not yet test these
changes.

A newer version of Docker (1.10) needs to be installed to avoid failure
downloading the larger dependency image layers.

Build parallelism is limited to -j5 to avoid reaching the 4GB memory usage
limit on CircleCI.

From: Matt McCormick <matt.mccormick@kitware.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25031 3bd1e089-480b-0410-8dfb-8563597acbee
add - circle.yml Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup f6a26b43

2016-04-25 18:20:30

lassoan

Details Diff 		ENH: Allow forced refresh of qMRMLNodeAttributeTableWidget

Node may change without invoking modified event. For such cases it's useful to have a way of refreshing the widget using an external signal.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25030 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Widgets/qMRMLNodeAttributeTableWidget.h Diff File

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 03bd3b3b

2016-04-25 18:19:06

lassoan

Details Diff 		ENH: Improved vtkMRMLTableNode::PrintSelf

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

490-qMRMLSceneHierarchyModel-avoid-extra-scene-lookup 32abd068

2016-04-25 18:18:40

lassoan

Details Diff 		ENH: Added Python-wrappable method for getting node references

Used for scene inspection from Python scripted modules.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25028 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/MRML/Core/vtkMRMLNode.cxx Diff File
mod - Libs/MRML/Core/vtkMRMLNode.h Diff File
1 2 3 4 ... 10 ... 20 ... 30 ... 40 ... 50 ... 55 56 57  Next  Last