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

[SofaLoader] ADD support to load VTK polylines in legacy formated files #576

Merged
merged 2 commits into from
Feb 9, 2018
Merged

[SofaLoader] ADD support to load VTK polylines in legacy formated files #576

merged 2 commits into from
Feb 9, 2018

Conversation

untereiner
Copy link

@untereiner untereiner commented Jan 25, 2018 •
edited
Loading

  • Add support to load VTK polylines in legacy formated files
  • used the new astyle formating onto the three files

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@untereiner
Copy link
Author

[ci-build][with-scene-tests]

@untereiner untereiner added enhancement About a possible enhancement pr: status to review To notify reviewers to review this pull-request labels Jan 25, 2018
@hugtalbot
Copy link
Contributor

@untereiner thanks for the PR, could you please point us out the lines that you really (not format changes) modified ?

@untereiner
Copy link
Author

untereiner commented Jan 31, 2018 •
edited
Loading

there are several lines at several places.... a bit shitting to put them here... search for Polyline

@untereiner
Copy link
Author

MeshLoader.cpp (ligne 690)
MeshVTKLoader.h (lignes 75 - 135 - 194)
MeshVTKLoader.cpp (lignes 265 - 373 - 535)

@guparan
Copy link
Contributor

guparan commented Feb 2, 2018

What astyle command did you launch to get this diff?
I don't have the same output when I do
astyle --options=tools/astyle/sofa.astyle SofaKernel/modules/SofaLoader/MeshVTKLoader.h SofaKernel/modules/SofaLoader/MeshVTKLoader.cpp SofaKernel/modules/SofaLoader/MeshVTKLoader.cpp

@guparan
Copy link
Contributor

guparan commented Feb 2, 2018

My bad, I shouldn't trust GitHub blindly.
Here is the real diff of this PR: guparan@3f9d024

guparan
guparan reviewed Feb 2, 2018
View reviewed changes
SofaKernel/modules/SofaLoader/MeshVTKLoader.cpp Outdated
@@ -527,6 +532,7 @@ bool MeshVTKLoader::setInputsMesh()
delete reader->inputCellTypes;
}

d_polygons.endEdit();
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you mean d_polylines?

Copy link
Author

Choose a reason for hiding this comment

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

yep, I'll change it

@guparan guparan added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Feb 7, 2018
@guparan guparan merged commit 1af3770 into sofa-framework:master Feb 9, 2018
@untereiner untereiner deleted the vtk_polylines branch February 9, 2018 13:33
@guparan guparan added this to the v18.06 milestone Apr 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guparan guparan guparan left review comments

Assignees
No one assigned
Labels
enhancement About a possible enhancement pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v18.06
Development

Successfully merging this pull request may close these issues.
3 participants
@untereiner @hugtalbot @guparan