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.

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

Implement vtkQuad #2515

Merged
merged 1 commit into from Aug 12, 2022
Merged

Implement vtkQuad #2515

merged 1 commit into from Aug 12, 2022

Conversation

WesleyTheGeolien
Copy link
Contributor

Context

This MR aims to implement the vtkQuad class as suggested by @finetjul in #2508

Changes

Created vtkQuad class. Type script updated but unsure on how to change documentation?

  • Documentation and TypeScript definitions were updated to match those changes

PR and Code Checklist

  • semantic-release commit messages
  • Run npm run reformat to have correctly formatted code

Testing

Added unit tests but two are failing for the pcoords, I have copied the behaviour in the cxx library but the tests are from the vtkTriangle vtk.js class so they may be incorrect, I am not familiar enough with how these are calculated as to whether they are correct. Maybe @finetjul you could take a look?

  • This change adds or fixes unit tests
  • Tested environment:
    • vtk.js: latest
    • OS: Mac OS 12.4
    • Browser: Chrome (through karma)

@WesleyTheGeolien
Copy link
Contributor Author

There is some small cleanup still todo around the outObj but wanted to check globally everything is inline

Sources/Common/DataModel/Quad/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/DataModel/Quad/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/Quad/index.d.ts Outdated Show resolved Hide resolved
Sources/Common/DataModel/Quad/index.js Outdated Show resolved Hide resolved
@WesleyTheGeolien
Copy link
Contributor Author

WesleyTheGeolien commented Jul 16, 2022 via email

@floryst
Copy link
Collaborator

floryst commented Jul 18, 2022

Let's remove the STATIC export then. No need to have this explicit placeholder if we don't have an intent on populating it any time soon.

@WesleyTheGeolien
Copy link
Contributor Author

WesleyTheGeolien commented Jul 19, 2022

Could someone please take a look at the pCoords in the tests that are failing? I am unsure what the "correct" values of these should be.

in testQuad.js:

  • line 49 I am getting [1,1,0] instead of [0,1,0]
  • line 69 I am getting [1,1,0] instead of [0,0,0]

@WesleyTheGeolien
Copy link
Contributor Author

Hey guys, wondering if someone could give me a hand with the pCoords so this can land?

Sources/Common/DataModel/Quad/index.js Outdated Show resolved Hide resolved
Sources/Common/DataModel/Quad/index.js Outdated Show resolved Hide resolved
@WesleyTheGeolien
Copy link
Contributor Author

Thanks @finetjul, I've taken into account your remarks. The pCoords test however are still off

@DavidBerger98
Copy link
Contributor

Thanks @finetjul, I've taken into account your remarks. The pCoords test however are still off

On line 49 [1,1,0] is the correct value. So that should be the expected one.

The assertion on line 69 is not needed, since there was a noIntersection and thus pcoords was never recomputed. You can thus also remove the assertion on line 68.

@WesleyTheGeolien
Copy link
Contributor Author

Thanks @DavidBerger98 have taken into account your changes and the tests are now passing.

I believe this should be ready to merge now?

@finetjul
Copy link
Member

finetjul commented Aug 10, 2022

I believe you can now add support for vtkQuad cell picking. See here

If you can squash all the commits into a unique commit, it would be great.

@WesleyTheGeolien
Copy link
Contributor Author

WesleyTheGeolien commented Aug 11, 2022

I believe you can now add support for vtkQuad cell picking. See here

If you can squash all the commits into a unique commit, it would be great.

@finetjul I believe I have already implemented this and added the tests: https://github.com/Kitware/vtk-js/pull/2515/files#diff-dcd608a8f684922521c178b9a2965eccf3cadbedbfc27d680d70fe788e11b912

Just need to squash all commits I guess do I do this manually or do you guys do this on merge with something like: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-pull-request-commits

@finetjul
Copy link
Member

I believe I have already implemented this and added the tests

My bad, for some reasons I forgot about it. You are correct, it's all fine !

Just need to squash all commits I guess do I do this manually or do you guys do this on merge

We can do it automatically like you suggest but we prefer to do a merge commit. It's also better to squash manually because you have more controls on the commit title and body message.

@WesleyTheGeolien
Copy link
Contributor Author

@finetjul Right that should have squashed all commits.

@finetjul finetjul merged commit 2171b20 into Kitware:master Aug 12, 2022
@finetjul
Copy link
Member

Thanks @WesleyTheGeolien

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants