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

Add removeAllCoordinateSystems and templated addPointCloudPrincipalCurvatures #965

Merged
merged 2 commits into from
Oct 22, 2014

Conversation

aecins
Copy link
Contributor

@aecins aecins commented Oct 19, 2014

  • removeAllCoordinateSystems removes all coordinate systems from the visualizer.
  • Currently addPointCloudPrincipalCurvatures only accepts pcl::PointXYZ and pcl::Normal. It is now templated on the PointT and PointNT.

@taketwo
Copy link
Member

taketwo commented Oct 19, 2014

Thanks for the contribution. Now that the function is templated, shouldn't the old implementation in pcl_visualizer.cpp be removed?

Also, please remove the first two commits from this pull request.

@aecins
Copy link
Contributor Author

aecins commented Oct 19, 2014

I have updated the code. I have removed the old implementation from pcl_visualizer.cpp. However I also had to remove the non-templated version of addPointCloudPrincipalCurvatures entirely and update the pcd_viewer.cpp accordingly.

@taketwo
Copy link
Member

taketwo commented Oct 20, 2014

remove the non-templated version of addPointCloudPrincipalCurvatures entirely

Could you please really delete it (rather than comment)? Also please do not change formatting of lines that are out of scope of your pull request (addArrow function in this case).

@aecins
Copy link
Contributor Author

aecins commented Oct 21, 2014

I have reverted the changes to the formatting of addArrow and as far as I can see there is no code for non-templated addPointCloudPrincipalCurvatures. Have I missed any other issues?

@taketwo
Copy link
Member

taketwo commented Oct 22, 2014

there is no code for non-templated addPointCloudPrincipalCurvatures

What about this one? Let's delete it, I think there is no point in keeping dead code around.

@aecins
Copy link
Contributor Author

aecins commented Oct 22, 2014

My bad, I couldn't find these changes in the diff. I have removed those commented lines.

@taketwo
Copy link
Member

taketwo commented Oct 22, 2014

Thank you. Last thing: could you please squash the last two fixup commits into the first one?

@aecins
Copy link
Contributor Author

aecins commented Oct 22, 2014

I am a little confused. Should I just squash the last two commits into a single "fixup" commit? Or should I squash them into the first commit "Adde removeAllCoordinateSystems"? I thought you can only squash consecutive commits. I am new to git so maybe I am wrong.

@taketwo
Copy link
Member

taketwo commented Oct 22, 2014

I thought you can only squash consecutive commits.

Not necessarily. When you are exposed with the interactive rebase "interface" (that is, an editor with lines presenting individual commits), you can swap the order of commits by moving their respective lines up or down.

Should I just squash the last two commits into a single "fixup" commit? Or should I squash them into the first commit "Adde removeAllCoordinateSystems"?

The latter. The intention is not to have a series of commits where one adds some lines, and the next one removes them. This pollutes the history with unnecessary commits and also makes usage of tools like git blame more complicated.

@aecins
Copy link
Contributor Author

aecins commented Oct 22, 2014

Alright, I think I did it. I did not realize you could rearrange lines in the rebase interface. Thanks for the tip!

@taketwo
Copy link
Member

taketwo commented Oct 22, 2014

Great! Thanks for contributing.

taketwo added a commit that referenced this pull request Oct 22, 2014
Add removeAllCoordinateSystems and templated addPointCloudPrincipalCurvatures
@taketwo taketwo merged commit 22bce44 into PointCloudLibrary:master Oct 22, 2014
@jspricke jspricke mentioned this pull request Dec 9, 2015
7 tasks
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.

2 participants