Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add vtkClipClosedSurface #2532

Merged
merged 2 commits into from
Aug 12, 2022
Merged

Add vtkClipClosedSurface #2532

merged 2 commits into from
Aug 12, 2022

Conversation

DavidBerger98
Copy link
Contributor

@DavidBerger98 DavidBerger98 commented Jul 22, 2022 •
edited
Loading

Implement vtkClipClosedSurface with vtkContourTriangulator, vtkIncrementalOctreePointLocator and vtkIncrementalOctreeNode.

  • vtkClipClosedSurface
    • Implementation
    • Documentation
    • Tests
    • Example
  • vtkContourTriangulator
    • Implementation
    • Documentation
    • Tests
  • vtkLocator
    • Implementation
    • Documentation
    • Tests
  • vtkAbstractPointLocator
    • Implementation
    • Documentation
    • Tests
  • vtkIncrementalOctreePointLocator
    • Implementation
    • Documentation
    • Tests
  • vtkIncrementalOctreeNode
    • Implementation
    • Documentation
    • Tests

@DavidBerger98
Copy link
Contributor Author

@finetjul

finetjul
finetjul reviewed Jul 22, 2022
View reviewed changes
Sources/Filters/General/ContourTriangulator/ccsBitArray.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
@finetjul finetjul changed the title Implement vtkClipClosedSurface Add vtkClipClosedSurface Jul 25, 2022
finetjul
finetjul reviewed Jul 25, 2022
View reviewed changes
Sources/Common/Core/DataArray/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/DataSetAttributes/FieldData.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
@DavidBerger98 DavidBerger98 force-pushed the vtkClipClosedSurface branch 3 times, most recently from 922ec25 to b08ddbf Compare July 26, 2022 09:52
@DavidBerger98 DavidBerger98 force-pushed the vtkClipClosedSurface branch from b08ddbf to 5e244d1 Compare July 28, 2022 07:05
finetjul
finetjul reviewed Jul 28, 2022
View reviewed changes
Sources/Common/Core/DataArray/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/DataSetAttributes/FieldData.js Show resolved Hide resolved
Sources/Common/DataModel/DataSetAttributes/FieldData.js Show resolved Hide resolved
Sources/Common/DataModel/DataSetAttributes/FieldData.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/IncrementalOctreePointLocator/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/IncrementalOctreeNode/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/IncrementalOctreePointLocator/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/IncrementalOctreeNode/index.js Show resolved Hide resolved
Sources/Common/DataModel/IncrementalOctreeNode/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/IncrementalOctreeNode/index.js Outdated Show resolved Hide resolved
@DavidBerger98 DavidBerger98 force-pushed the vtkClipClosedSurface branch from 5e244d1 to d13fe7c Compare July 28, 2022 14:30
@DavidBerger98
Copy link
Contributor Author

DavidBerger98 commented Jul 29, 2022 •
edited
Loading

@finetjul Btw, getPoint and getTuple have the same behaviour in vtk.js. setPoint and setTuple don't.

You call points.setTuple(idx, [x,y,z]) but poitns.setPoint(idx, x, y, z).

points.setPoint(idx, [x,y,z]) doesn't do anything and also doesn't throw an error.

finetjul
finetjul reviewed Jul 29, 2022
View reviewed changes
Sources/Filters/General/ClipClosedSurface/index.js Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.js Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ClipClosedSurface/index.js Outdated Show resolved Hide resolved
@DavidBerger98 DavidBerger98 force-pushed the vtkClipClosedSurface branch from d13fe7c to 7fc7ec1 Compare July 29, 2022 10:23
@finetjul
Copy link
Member

@finetjul Btw, getPoint and getTuple have the same behaviour in vtk.js. setPoint and setTuple don't.
You call points.setTuple(idx, [x,y,z]) but poitns.setPoint(idx, x, y, z).
points.setPoint(idx, [x,y,z]) doesn't do anything and also doesn't throw an error.

Then call setTuple(idx, [x, y, z]); It might be a good idea to give such tip in Points/index.d.ts::setPoint

@DavidBerger98 DavidBerger98 force-pushed the vtkClipClosedSurface branch 2 times, most recently from 51cc824 to 37ddeb6 Compare August 2, 2022 10:13
finetjul
finetjul reviewed Aug 2, 2022
View reviewed changes
Sources/Filters/General/ContourTriangulator/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/helper.js Outdated Show resolved Hide resolved
finetjul
finetjul reviewed Aug 3, 2022
View reviewed changes
Sources/Filters/General/ClipClosedSurface/index.js Show resolved Hide resolved
Sources/Filters/General/ClipClosedSurface/index.js Show resolved Hide resolved
Sources/Common/Core/DataArray/index.js Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.js Show resolved Hide resolved
Sources/Common/Core/DataArray/index.js Show resolved Hide resolved
Sources/Common/Core/CellArray/index.js Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Outdated Show resolved Hide resolved
finetjul
finetjul reviewed Aug 8, 2022
View reviewed changes
Sources/Common/Core/CellArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/CellArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/CellArray/index.js Outdated Show resolved Hide resolved
Sources/Common/Core/CellArray/index.js Show resolved Hide resolved
Sources/Common/Core/DataArray/index.js Outdated Show resolved Hide resolved
Sources/Common/Core/Points/test/testPoints.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/AbstractPointLocator/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/DataSetAttributes/FieldData.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/DataSetAttributes/FieldData.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/DataSetAttributes/FieldData.js Outdated Show resolved Hide resolved
@DavidBerger98 DavidBerger98 force-pushed the vtkClipClosedSurface branch 2 times, most recently from f7ec7e1 to 1137ba8 Compare August 8, 2022 12:17
finetjul
finetjul reviewed Aug 8, 2022
View reviewed changes
Sources/Common/Core/CellArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/CellArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/CellArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/DataModel/IncrementalOctreePointLocator/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/Locator/index.d.ts Show resolved Hide resolved
Sources/Common/DataModel/Polygon/index.d.ts Outdated Show resolved Hide resolved
Sources/Filters/General/ClipClosedSurface/ccsEdgeLocator.js Outdated Show resolved Hide resolved
Sources/Filters/General/ContourTriangulator/index.js Show resolved Hide resolved
@DavidBerger98 DavidBerger98 marked this pull request as ready for review August 9, 2022 11:34
finetjul
finetjul reviewed Aug 9, 2022
View reviewed changes
Sources/Common/Core/DataArray/index.d.ts Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/Core/DataArray/index.d.ts Outdated Show resolved Hide resolved
Sources/Filters/General/ClipClosedSurface/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ClipClosedSurface/ccsEdgeLocator.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/DataSetAttributes/FieldData.js Show resolved Hide resolved
Sources/Filters/General/ClipClosedSurface/index.js Outdated Show resolved Hide resolved
Sources/Filters/General/ClipClosedSurface/index.js Outdated Show resolved Hide resolved
@DavidBerger98 DavidBerger98 mentioned this pull request Aug 9, 2022
Draft
@DavidBerger98
Copy link
Contributor Author

@finetjul We discussed with @joannacirillo whether we should move vtkContourTriangulator.triangulatePolygon into vtkPolygon and replace vtkPolygon.triangulate, since it does the same thing.

@DavidBerger98
Copy link
Contributor Author

Should be ready to merge from my side @finetjul

@joannacirillo joannacirillo mentioned this pull request Aug 10, 2022
Open
13 tasks
@DavidBerger98 DavidBerger98 force-pushed the vtkClipClosedSurface branch 3 times, most recently from 3b8efdf to 58a7803 Compare August 10, 2022 15:01
@DavidBerger98 DavidBerger98 force-pushed the vtkClipClosedSurface branch 3 times, most recently from aea5813 to 02034b5 Compare August 11, 2022 12:03
David Berger and others added 2 commits August 11, 2022 18:24
@finetjul
feat(Core): Various additions to core functionalities
cb3f7c1 
CellArray
- Implemented insertNextCell, initialize
- getNumberOfCells and getCellSizes now use publicAPI.getData() instead of model.values

DataArray
- Implemented deepCopy, getTuples, getValue, setValue, insertTuple, insertTuples, insertNextTuple,
interpolateTuple, initialize
- getRange now uses publicAPI.getData() instead of model.values
- getNumberOfValues and getNumberOfTuples now use model.size instead of model.values.length
- model.size defaults to model.values.length if not specified during initialization

Points
- Implemented insertNextPoint
- Added tests
- Removed wrong documentation about setPoint

FieldData
- Implemented interpolateData
- Changes to passData and a bugfix
- addArray now checks if an array with the given name already exists and replaces it in that case.

DataSetAttributes
- Implemented getAttributes, copy*On

Co-authored-by: Julien Finet <[email protected]>
@finetjul
feat(vtkClipClosedSurface): Add vtkClipClosedSurface
9a9be4a
@finetjul finetjul force-pushed the vtkClipClosedSurface branch from 02034b5 to 9a9be4a Compare August 11, 2022 16:24
@finetjul finetjul merged commit 7845f6a into Kitware:master Aug 12, 2022
@DavidBerger98 DavidBerger98 deleted the vtkClipClosedSurface branch August 12, 2022 06:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryst floryst floryst left review comments

@daker daker daker requested changes

@finetjul finetjul finetjul left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DavidBerger98 @finetjul @daker @floryst