GUI: conflicts resolved, ready for review #198
Merged
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
Beta version of GUI
* Added in a function very similar to compute_height that calculates leg length (total shank and thigh distance) that could be used for gait analysis * Add in capability to calculate, export, and save CoM pos and vel for a given .mot file
- Reproject hidden points too - Confirmation window after each labeled image
- added an option to calibrate with a vertical checkerboard - save images with reprojected points Fixed edge cases: - handles trimmed_mean function failure (when computing height and scaling) - fixed frame range issues in pose estimation, triangulation, filtering, marker augmentation - handled cases when no videos found for synchronization GUI and fps determination
perfanalytics#189) * Modification of Markers_Halpe26.xml. Initialy Right and Left Ankle markers were to high and generate too high ankle flexion. The markers are now positionned in between each malleoles. This has been done qualitatively. Next step is to optimize each markers position by comparing markers-based and markerless analysis on the same set of experiments * propagated the ankle marker position fix to other markersets * removed accidentally added folder * removed accidentally added installer draft --------- Co-authored-by: David PAGNON <[email protected]>
…ered as signal -> no filtering)
…ith some OpenSim versions
Included in GUI
Collaborator
|
Well done for solving the conflicts! 🔥 |
Collaborator
|
Actually, I did not realize this was a pull request into the GUI branch: since there are no conflicts anymore, I can merge it now! The pull request into main (#180) is now being automatically tested, and then I'll have to play with it and give you some feedback. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Tested on Windows (Git Bash). No remaining merge conflicts.