-
Notifications
You must be signed in to change notification settings - Fork 119
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New pipeline filters + Code improvements #162
Merged
julien-tierny
merged 12 commits into
topology-tool-kit:master
from
JonasLukasczyk:master
Nov 16, 2018
Merged
New pipeline filters + Code improvements #162
julien-tierny
merged 12 commits into
topology-tool-kit:master
from
JonasLukasczyk:master
Nov 16, 2018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
JonasLukasczyk
commented
Nov 15, 2018
- New pipeline filters:
- BlockAggregator: This filter iteratively appends its input to a vtkMultiBlockDataSet. (Can be used to collect vtkDataObjects over time or group vtkDataObjects)
- AddFieldData: This filter adds field data to a vtkDataObject based on a string or point/cell/field data of another vtkDataObject.
- Code improvements: comments, edge cases, style, error msgs
- Resolves issue ParaView crashes if TTKCinemaWriter is not given a path #160 and TTKCinemaWriter should add .cdb to path if it is not provided #161
…al embedding of the tracking graph
hi @JonasLukasczyk
thanks a lot for the PR!
travis-ci fails at building it though.
I'll merge it in once it's fixed.
cheers,
--
Dr Julien Tierny
CNRS Researcher
Sorbonne Universite
http://lip6.fr/Julien.Tierny
…On Thursday, 15 November 2018 15:13:20 CET Jones wrote:
* New pipeline filters:
- BlockAggregator: This filter iteratively appends its input to a vtkMultiBlockDataSet. (Can be used to collect vtkDataObjects over time or group vtkDataObjects)
- AddFieldData: This filter adds field data to a vtkDataObject based on a string or point/cell/field data of another vtkDataObject.
* Code improvements: comments, edge cases, style, error msgs
* Resolves issue #160 and #161
You can view, comment on, or merge this pull request online at:
#162
-- Commit Summary --
* Block Aggregator
* Merge branch 'master' of https://github.com/topology-tool-kit/ttk
* polished ttkBlockAggregator
* removed VTK_MAJOR_VERSION bug; TrackingFromOverlap now computes spatial embedding of the tracking graph
* CinemaWriter: better error msgs
* code improvements: comments, edge cases, style, error msgs
* fixed EndFor FillOutputPortInformation Warning
* Merge branch 'master' of https://github.com/topology-tool-kit/ttk
* TrackingFromOverlap: improved console output
* deleted CreateMultiBlockDataSet (TODO: extend BlockAggregator)
-- File Changes --
M core/base/trackingFromOverlap/TrackingFromOverlap.cpp (37)
M core/base/trackingFromOverlap/TrackingFromOverlap.h (18)
M core/vtk/ttkAddFieldData/ttkAddFieldData.cpp (2)
M core/vtk/ttkAddFieldData/ttkAddFieldData.h (17)
A core/vtk/ttkBlockAggregator/CMakeLists.txt (4)
A core/vtk/ttkBlockAggregator/ttkBlockAggregator.cpp (130)
A core/vtk/ttkBlockAggregator/ttkBlockAggregator.h (91)
M core/vtk/ttkCinemaImaging/ttkCinemaImaging.cpp (15)
M core/vtk/ttkCinemaImaging/ttkCinemaImaging.h (22)
M core/vtk/ttkCinemaLayout/ttkCinemaLayout.h (20)
M core/vtk/ttkCinemaProductReader/ttkCinemaProductReader.h (14)
M core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp (2)
M core/vtk/ttkCinemaQuery/ttkCinemaQuery.h (22)
M core/vtk/ttkCinemaReader/ttkCinemaReader.h (18)
M core/vtk/ttkCinemaWriter/ttkCinemaWriter.cpp (65)
M core/vtk/ttkCinemaWriter/ttkCinemaWriter.h (30)
D core/vtk/ttkCreateMultiBlockDataSet/CMakeLists.txt (4)
D core/vtk/ttkCreateMultiBlockDataSet/ttkCreateMultiBlockDataSet.cpp (46)
D core/vtk/ttkCreateMultiBlockDataSet/ttkCreateMultiBlockDataSet.h (89)
M core/vtk/ttkDepthImageBasedGeometryApproximation/ttkDepthImageBasedGeometryApproximation.cpp (6)
M core/vtk/ttkDepthImageBasedGeometryApproximation/ttkDepthImageBasedGeometryApproximation.h (20)
M core/vtk/ttkEndFor/ttkEndFor.h (18)
M core/vtk/ttkForEachRow/ttkForEachRow.h (14)
M core/vtk/ttkIcoSphere/ttkIcoSphere.h (23)
M core/vtk/ttkTrackingFromOverlap/ttkTrackingFromOverlap.cpp (43)
M core/vtk/ttkTrackingFromOverlap/ttkTrackingFromOverlap.h (22)
M paraview/AddFieldData/AddFieldData.xml (2)
A paraview/BlockAggregator/BlockAggregator.xml (42)
A paraview/BlockAggregator/CMakeLists.txt (5)
M paraview/CinemaImaging/CinemaImaging.xml (11)
M paraview/CinemaProductReader/CinemaProductReader.xml (5)
M paraview/CinemaReader/CinemaReader.xml (1)
M paraview/CinemaWriter/CinemaWriter.xml (2)
D paraview/CreateMultiBlockDataSet/CMakeLists.txt (5)
D paraview/CreateMultiBlockDataSet/CreateMultiBlockDataSet.xml (69)
M paraview/DepthImageBasedGeometryApproximation/DepthImageBasedGeometryApproximation.xml (5)
M paraview/EndFor/EndFor.xml (1)
M paraview/ForEachRow/ForEachRow.xml (1)
M paraview/IcoSphere/IcoSphere.xml (1)
M paraview/TrackingFromOverlap/TrackingFromOverlap.xml (6)
-- Patch Links --
https://github.com/topology-tool-kit/ttk/pull/162.patch
https://github.com/topology-tool-kit/ttk/pull/162.diff
|
Thx, I'm traveling right now but I will fix it soon. Always these vtk6 problems xD.
Best
Jonas
…On 15 November 2018 16:37:16 CET, Julien Tierny ***@***.***> wrote:
hi @JonasLukasczyk
thanks a lot for the PR!
travis-ci fails at building it though.
I'll merge it in once it's fixed.
cheers,
--
Dr Julien Tierny
CNRS Researcher
Sorbonne Universite
http://lip6.fr/Julien.Tierny
On Thursday, 15 November 2018 15:13:20 CET Jones wrote:
> * New pipeline filters:
> - BlockAggregator: This filter iteratively appends its input to a
vtkMultiBlockDataSet. (Can be used to collect vtkDataObjects over time
or group vtkDataObjects)
> - AddFieldData: This filter adds field data to a vtkDataObject
based on a string or point/cell/field data of another vtkDataObject.
> * Code improvements: comments, edge cases, style, error msgs
> * Resolves issue #160 and #161
> You can view, comment on, or merge this pull request online at:
>
> #162
>
> -- Commit Summary --
>
> * Block Aggregator
> * Merge branch 'master' of https://github.com/topology-tool-kit/ttk
> * polished ttkBlockAggregator
> * removed VTK_MAJOR_VERSION bug; TrackingFromOverlap now computes
spatial embedding of the tracking graph
> * CinemaWriter: better error msgs
> * code improvements: comments, edge cases, style, error msgs
> * fixed EndFor FillOutputPortInformation Warning
> * Merge branch 'master' of https://github.com/topology-tool-kit/ttk
> * TrackingFromOverlap: improved console output
> * deleted CreateMultiBlockDataSet (TODO: extend BlockAggregator)
>
> -- File Changes --
>
> M core/base/trackingFromOverlap/TrackingFromOverlap.cpp (37)
> M core/base/trackingFromOverlap/TrackingFromOverlap.h (18)
> M core/vtk/ttkAddFieldData/ttkAddFieldData.cpp (2)
> M core/vtk/ttkAddFieldData/ttkAddFieldData.h (17)
> A core/vtk/ttkBlockAggregator/CMakeLists.txt (4)
> A core/vtk/ttkBlockAggregator/ttkBlockAggregator.cpp (130)
> A core/vtk/ttkBlockAggregator/ttkBlockAggregator.h (91)
> M core/vtk/ttkCinemaImaging/ttkCinemaImaging.cpp (15)
> M core/vtk/ttkCinemaImaging/ttkCinemaImaging.h (22)
> M core/vtk/ttkCinemaLayout/ttkCinemaLayout.h (20)
> M core/vtk/ttkCinemaProductReader/ttkCinemaProductReader.h (14)
> M core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp (2)
> M core/vtk/ttkCinemaQuery/ttkCinemaQuery.h (22)
> M core/vtk/ttkCinemaReader/ttkCinemaReader.h (18)
> M core/vtk/ttkCinemaWriter/ttkCinemaWriter.cpp (65)
> M core/vtk/ttkCinemaWriter/ttkCinemaWriter.h (30)
> D core/vtk/ttkCreateMultiBlockDataSet/CMakeLists.txt (4)
> D
core/vtk/ttkCreateMultiBlockDataSet/ttkCreateMultiBlockDataSet.cpp (46)
> D
core/vtk/ttkCreateMultiBlockDataSet/ttkCreateMultiBlockDataSet.h (89)
> M
core/vtk/ttkDepthImageBasedGeometryApproximation/ttkDepthImageBasedGeometryApproximation.cpp
(6)
> M
core/vtk/ttkDepthImageBasedGeometryApproximation/ttkDepthImageBasedGeometryApproximation.h
(20)
> M core/vtk/ttkEndFor/ttkEndFor.h (18)
> M core/vtk/ttkForEachRow/ttkForEachRow.h (14)
> M core/vtk/ttkIcoSphere/ttkIcoSphere.h (23)
> M core/vtk/ttkTrackingFromOverlap/ttkTrackingFromOverlap.cpp (43)
> M core/vtk/ttkTrackingFromOverlap/ttkTrackingFromOverlap.h (22)
> M paraview/AddFieldData/AddFieldData.xml (2)
> A paraview/BlockAggregator/BlockAggregator.xml (42)
> A paraview/BlockAggregator/CMakeLists.txt (5)
> M paraview/CinemaImaging/CinemaImaging.xml (11)
> M paraview/CinemaProductReader/CinemaProductReader.xml (5)
> M paraview/CinemaReader/CinemaReader.xml (1)
> M paraview/CinemaWriter/CinemaWriter.xml (2)
> D paraview/CreateMultiBlockDataSet/CMakeLists.txt (5)
> D paraview/CreateMultiBlockDataSet/CreateMultiBlockDataSet.xml
(69)
> M
paraview/DepthImageBasedGeometryApproximation/DepthImageBasedGeometryApproximation.xml
(5)
> M paraview/EndFor/EndFor.xml (1)
> M paraview/ForEachRow/ForEachRow.xml (1)
> M paraview/IcoSphere/IcoSphere.xml (1)
> M paraview/TrackingFromOverlap/TrackingFromOverlap.xml (6)
>
> -- Patch Links --
>
> https://github.com/topology-tool-kit/ttk/pull/162.patch
> https://github.com/topology-tool-kit/ttk/pull/162.diff
>
>
--
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub:
#162 (comment)
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
|
awesome, thanks for the fix!
--
Dr Julien Tierny
CNRS Researcher
Sorbonne Universite
http://lip6.fr/Julien.Tierny
…On Thursday, November 15, 2018 4:44:03 PM CET Jones wrote:
Thx, I'm traveling right now but I will fix it soon. Always these vtk6 problems xD.
Best
Jonas
On 15 November 2018 16:37:16 CET, Julien Tierny ***@***.***> wrote:
>hi @JonasLukasczyk
>thanks a lot for the PR!
>travis-ci fails at building it though.
>I'll merge it in once it's fixed.
>cheers,
>> * New pipeline filters:
>> - BlockAggregator: This filter iteratively appends its input to a
>vtkMultiBlockDataSet. (Can be used to collect vtkDataObjects over time
>or group vtkDataObjects)
>> - AddFieldData: This filter adds field data to a vtkDataObject
>based on a string or point/cell/field data of another vtkDataObject.
>> * Code improvements: comments, edge cases, style, error msgs
>> * Resolves issue #160 and #161
>> You can view, comment on, or merge this pull request online at:
>>
>> #162
>>
>> -- Commit Summary --
>>
>> * Block Aggregator
>> * Merge branch 'master' of https://github.com/topology-tool-kit/ttk
>> * polished ttkBlockAggregator
>> * removed VTK_MAJOR_VERSION bug; TrackingFromOverlap now computes
>spatial embedding of the tracking graph
>> * CinemaWriter: better error msgs
>> * code improvements: comments, edge cases, style, error msgs
>> * fixed EndFor FillOutputPortInformation Warning
>> * Merge branch 'master' of https://github.com/topology-tool-kit/ttk
>> * TrackingFromOverlap: improved console output
>> * deleted CreateMultiBlockDataSet (TODO: extend BlockAggregator)
>>
>> -- File Changes --
>>
>> M core/base/trackingFromOverlap/TrackingFromOverlap.cpp (37)
>> M core/base/trackingFromOverlap/TrackingFromOverlap.h (18)
>> M core/vtk/ttkAddFieldData/ttkAddFieldData.cpp (2)
>> M core/vtk/ttkAddFieldData/ttkAddFieldData.h (17)
>> A core/vtk/ttkBlockAggregator/CMakeLists.txt (4)
>> A core/vtk/ttkBlockAggregator/ttkBlockAggregator.cpp (130)
>> A core/vtk/ttkBlockAggregator/ttkBlockAggregator.h (91)
>> M core/vtk/ttkCinemaImaging/ttkCinemaImaging.cpp (15)
>> M core/vtk/ttkCinemaImaging/ttkCinemaImaging.h (22)
>> M core/vtk/ttkCinemaLayout/ttkCinemaLayout.h (20)
>> M core/vtk/ttkCinemaProductReader/ttkCinemaProductReader.h (14)
>> M core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp (2)
>> M core/vtk/ttkCinemaQuery/ttkCinemaQuery.h (22)
>> M core/vtk/ttkCinemaReader/ttkCinemaReader.h (18)
>> M core/vtk/ttkCinemaWriter/ttkCinemaWriter.cpp (65)
>> M core/vtk/ttkCinemaWriter/ttkCinemaWriter.h (30)
>> D core/vtk/ttkCreateMultiBlockDataSet/CMakeLists.txt (4)
>> D
>core/vtk/ttkCreateMultiBlockDataSet/ttkCreateMultiBlockDataSet.cpp (46)
>> D
>core/vtk/ttkCreateMultiBlockDataSet/ttkCreateMultiBlockDataSet.h (89)
>> M
>core/vtk/ttkDepthImageBasedGeometryApproximation/ttkDepthImageBasedGeometryApproximation.cpp
>(6)
>> M
>core/vtk/ttkDepthImageBasedGeometryApproximation/ttkDepthImageBasedGeometryApproximation.h
>(20)
>> M core/vtk/ttkEndFor/ttkEndFor.h (18)
>> M core/vtk/ttkForEachRow/ttkForEachRow.h (14)
>> M core/vtk/ttkIcoSphere/ttkIcoSphere.h (23)
>> M core/vtk/ttkTrackingFromOverlap/ttkTrackingFromOverlap.cpp (43)
>> M core/vtk/ttkTrackingFromOverlap/ttkTrackingFromOverlap.h (22)
>> M paraview/AddFieldData/AddFieldData.xml (2)
>> A paraview/BlockAggregator/BlockAggregator.xml (42)
>> A paraview/BlockAggregator/CMakeLists.txt (5)
>> M paraview/CinemaImaging/CinemaImaging.xml (11)
>> M paraview/CinemaProductReader/CinemaProductReader.xml (5)
>> M paraview/CinemaReader/CinemaReader.xml (1)
>> M paraview/CinemaWriter/CinemaWriter.xml (2)
>> D paraview/CreateMultiBlockDataSet/CMakeLists.txt (5)
>> D paraview/CreateMultiBlockDataSet/CreateMultiBlockDataSet.xml
>(69)
>> M
>paraview/DepthImageBasedGeometryApproximation/DepthImageBasedGeometryApproximation.xml
>(5)
>> M paraview/EndFor/EndFor.xml (1)
>> M paraview/ForEachRow/ForEachRow.xml (1)
>> M paraview/IcoSphere/IcoSphere.xml (1)
>> M paraview/TrackingFromOverlap/TrackingFromOverlap.xml (6)
>>
>> -- Patch Links --
>>
>> https://github.com/topology-tool-kit/ttk/pull/162.patch
>> https://github.com/topology-tool-kit/ttk/pull/162.diff
>>
>>
>
>
>
>
>
>
|
This was referenced Nov 16, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.