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

feat(picker): Add volume picker to CellPicker #2944

Merged
merged 12 commits into from
Nov 5, 2023

Conversation

rodrigobasilio2022
Copy link
Contributor

@rodrigobasilio2022 rodrigobasilio2022 commented Oct 26, 2023

Context

This PRs adds volume picker capabilities to Cellpicker Object. I recorded a video of the functionality working.

Gravando.2023-10-26.123920.mp4

Results

Changes

  • 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

  • This change adds or fixes unit tests
  • Tested environment:
    • vtk.js:
    • OS:
    • Browser:

@floryst
Copy link
Collaborator

floryst commented Oct 26, 2023

CI is failing due to old node versions. I will update it.

@floryst floryst requested a review from finetjul October 26, 2023 15:09
@rodrigobasilio2022
Copy link
Contributor Author

Ok. Thanks. I tried to make fewer changes so you can review effectively. Do you want me to create a video?

@floryst
Copy link
Collaborator

floryst commented Oct 26, 2023

If you have an example, that would be a great addition to demonstrate its capabilities.

One note I had skimming your changes is that the package.json changes are irrelevant to the functionality at hand. If the build works then I'm fine with the upgrades.

@rodrigobasilio2022
Copy link
Contributor Author

THey are irrelevant. I wrongly executed npm install --force, that s it. I will make a video an put in the comments

@sedghi
Copy link
Contributor

sedghi commented Oct 26, 2023

is this PR related to #2885 ?

@floryst
Copy link
Collaborator

floryst commented Oct 26, 2023

is this PR related to #2885 ?

That appears to be a separate effort that hasn't been updated.

Copy link
Member

@finetjul finetjul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not clear why you had to modify package.json / package-lock.json

Please update CellPicker documentation accordingly.

Sources/Rendering/Core/CellPicker/index.js Show resolved Hide resolved
Sources/Rendering/Core/CellPicker/index.js Outdated Show resolved Hide resolved
Sources/Rendering/Core/Picker/index.js Outdated Show resolved Hide resolved
Sources/Rendering/Core/Picker/index.js Outdated Show resolved Hide resolved
@rodrigobasilio2022
Copy link
Contributor Author

Can you guys help me in git? I think I am doing a mess here. I want to delete the modifications I did in the package.json files

Copy link
Member

@finetjul finetjul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please also update index.d.ts files accordingly ?

Sources/Rendering/Core/CellPicker/index.js Show resolved Hide resolved
@finetjul
Copy link
Member

Can you guys help me in git? I think I am doing a mess here. I want to delete the modifications I did in the package.json files

You will be able to squash all your branch commits eventually (I personnally use git rebase -i to do so)

@rodrigobasilio2022
Copy link
Contributor Author

rodrigobasilio2022 commented Oct 30, 2023

Added the example. Something i noticed is why you guys do not use the clipLine information in the following lines...

const clipLine = clipLineWithPlane(

@finetjul
Copy link
Member

Added the example. Something i noticed is why you guys do not use the clipLine information in the following lines...

const clipLine = clipLineWithPlane(

Not sure what do you mean, we do use clipLine afterwards

@rodrigobasilio2022
Copy link
Contributor Author

The t1 and t2 updated values that restricts the ray

@finetjul
Copy link
Member

The t1 and t2 updated values that restricts the ray

I see, looks like a bug indeed. t1 and t2 should be extracted from the returned value...

Sources/Rendering/Core/CellPicker/index.js Outdated Show resolved Hide resolved
Sources/Rendering/Core/CellPicker/index.js Outdated Show resolved Hide resolved
Sources/Rendering/Core/Picker/index.js Outdated Show resolved Hide resolved
Copy link
Member

@finetjul finetjul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@floryst
Copy link
Collaborator

floryst commented Nov 2, 2023

CI is red because this PR has some tests still failing. Please run npm test locally to identify the issue.

@rodrigobasilio2022
Copy link
Contributor Author

I run the npm run test command and this was the final output

image

My machine is a Windows 11

@rodrigobasilio2022
Copy link
Contributor Author

I executed the command again. In fact was executed yarn run test, and that was the output

image

@finetjul
Copy link
Member

finetjul commented Nov 3, 2023

It looks like a test is hanging (that's why you do not see any failure)

@rodrigobasilio2022
Copy link
Contributor Author

How do I solve this problem?

@rodrigobasilio2022
Copy link
Contributor Author

Found the problem. It was a point picker function which not correspond with the changes in vtkPicker

@finetjul finetjul added this pull request to the merge queue Nov 3, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Nov 3, 2023
@rodrigobasilio2022
Copy link
Contributor Author

@finetjul I nned to do something else? I saw the PR was pulled out from merge queue, despite no conflict with the base branch

@floryst floryst added this pull request to the merge queue Nov 3, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Nov 3, 2023
@floryst
Copy link
Collaborator

floryst commented Nov 3, 2023

Can you rebase locally onto an updated master to see if there are any conflicts? Github recently had operational issues, so I don't know if there is an actual conflict or if the merge queues are currently broken.

@floryst floryst added this pull request to the merge queue Nov 3, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Nov 3, 2023
@rodrigobasilio2022
Copy link
Contributor Author

@floryst Made the change. It had one commit out from the base branch, despite no warnings in this PR. Please try again...

@rodrigobasilio2022
Copy link
Contributor Author

@floryst @finetjul Now i think i got it right

Copy link
Member

@finetjul finetjul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@finetjul finetjul added this pull request to the merge queue Nov 5, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 5, 2023
@rodrigobasilio2022
Copy link
Contributor Author

rodrigobasilio2022 commented Nov 5, 2023

@finetjul I think the branch is ok right. It already passed theses tests?

@finetjul finetjul added this pull request to the merge queue Nov 5, 2023
Merged via the queue into Kitware:master with commit c03e86e Nov 5, 2023
3 checks passed
Copy link

github-actions bot commented Nov 5, 2023

🎉 This PR is included in version 29.1.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot added the released Automated label label Nov 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
released Automated label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants