Skip to content
Snippets Groups Projects

avoid self intersection on close gaps

Merged Roxana Bujack requested to merge bujack/vtk:closeGaps into master
1 unresolved thread

instead of taking the last point on a sepratrix to connect to the next critical point, we use the first one that is closer than dist (the distance in which the critical points are seeded). This allows to compute a segmentation later.

Merge request reports

Pipeline #183709 passed

Pipeline passed for 58e36d43 on bujack:closeGaps

Approval is optional

Merged by Kitware RobotKitware Robot 4 years ago (Aug 7, 2020 2:20pm UTC)

Merge details

  • Changes merged into master with 1d80c35b.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Author Developer

    Is there something that I have to do?

  • Roxana Bujack added 1 commit

    added 1 commit

    • c4af31b7 - enable unstructured grid input

    Compare with previous version

  • Errors:

    • commit c4af31b7 is not allowed because the following files are not formatted according to the 'clang-format' check: Filters/FlowPaths/vtkStreamSurface.cxx, Filters/FlowPaths/vtkVectorFieldTopology.cxx, Filters/FlowPaths/vtkVectorFieldTopology.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • please consider adding a changelog entry in a file ending with .md in Documentation/release/dev.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • Author Developer

    Oh damn, I pushed that by accident. I originally wanted to put that into a different mere request once this one is though. Now I am not sure what to do. Can we merge those two changes in one request? Or how do we get this push out of here?

    • create a branch with your second commit : git checkout -b second
    • go back to initial branch : git checkout closeGaps
    • rebase this branch against master : git rebase -i master
    • remove the second commit from the list and close the editor
    • force push : git push -f
    • the will fix this MR.
    • You can then create another MR with the second branch, ideally only containing the second commit.
    Edited by Mathieu Westphal (Kitware)
  • Roxana Bujack added 112 commits

    added 112 commits

    Compare with previous version

  • Warnings:

    • please consider adding a changelog entry in a file ending with .md in Documentation/release/dev.

    The warnings do not need to be fixed, but it is recommended to do so.

  • resolved all threads

  • Do: test --merged

  • This merge request has been queued for testing. Test results may be viewed on:

    • Gitlab CI builders results can be viewed via the Pipelines for this merge request.
    • CDash links are also available in the Pipelines page
    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 8b99f8df

  • There is a remaining warning to fix.

  • Roxana Bujack added 1 commit

    added 1 commit

    • 58e36d43 - fix warning of shadowed variable

    Compare with previous version

  • Warnings:

    • please consider adding a changelog entry in a file ending with .md in Documentation/release/dev.

    The warnings do not need to be fixed, but it is recommended to do so.

  • Do: test --merged

  • This merge request has been queued for testing. Test results may be viewed on:

    • Gitlab CI builders results can be viewed via the Pipelines for this merge request.
    • CDash links are also available in the Pipelines page
    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: f9f164d1

  • dashboard is clean. Merging.

  • mentioned in commit 1d80c35b

  • merged

  • Please register or sign in to reply
    Loading