Backup changes from dev_2023 branch #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… wire section and delegate the interpolation param to this class
…opagate topology change. It will be done automatically through topology changes pipeline
…opagate topology change. It will be done automatically through topology changes pipeline
…ded material1 and material2
Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>
# Conflicts: # src/BeamAdapter/component/engine/WireRestShape.inl
…o fix compilation
… only used by this component
…inEvent to use only the BeamActionController events.
…parameters to avoid multiple call of GetNodeIndices when they are already known
…bs and split method sortCurvAbs into sortCurvAbs and fillInstrumentCurvAbsMap methods
…arning. It should not happened anymore with the new version of totalLengthChanged and if happening will use last id of buffer ensuring no crash.
# Conflicts: # CMakeLists.txt # examples/3instruments_collis.scn # src/BeamAdapter/component/BeamInterpolation.h # src/BeamAdapter/component/BeamInterpolation.inl # src/BeamAdapter/component/WireBeamInterpolation.h # src/BeamAdapter/component/WireBeamInterpolation.inl # src/BeamAdapter/component/controller/AdaptiveBeamController.inl # src/BeamAdapter/component/controller/InterventionalRadiologyController.h # src/BeamAdapter/component/controller/InterventionalRadiologyController.inl # src/BeamAdapter/component/engine/WireRestShape.h # src/BeamAdapter/component/engine/WireRestShape.inl # src/BeamAdapter/component/model/BaseRodSectionMaterial.h # src/BeamAdapter/component/model/RodMeshSection.cpp # src/BeamAdapter/component/model/RodMeshSection.h # src/BeamAdapter/component/model/RodMeshSection.inl # src/BeamAdapter/component/model/RodSpireSection.cpp # src/BeamAdapter/component/model/RodSpireSection.h # src/BeamAdapter/component/model/RodSpireSection.inl # src/BeamAdapter/component/model/RodStraightSection.cpp # src/BeamAdapter/component/model/RodStraightSection.h # src/BeamAdapter/component/model/RodStraightSection.inl
# Conflicts: # doc/BeamAdapter.pdf
# Conflicts: # src/BeamAdapter/component/WireBeamInterpolation.inl
# Conflicts: # examples/SingleBeam.scn # src/BeamAdapter/component/BeamInterpolation.h # src/BeamAdapter/component/BeamInterpolation.inl # src/BeamAdapter/component/WireBeamInterpolation.inl
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.