-
Notifications
You must be signed in to change notification settings - Fork 25
CrossMgrVideo improvements #116
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
Open
kimble4
wants to merge
23
commits into
esitarski:dev
Choose a base branch
from
kimble4:crossmgrvideo-improvements
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
Fix new trigger behaviour when a historical date is selected Add joystick to name field when triggered by the joystick Support snapshot on button 3
Fix hidden controls on final page
This reverts commit f84dc16.
d247119 to
1cde2f8
Compare
|
Same with this one @esitarski |
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.
Several related improvements to CrossMgrVideo that are probably worth including in the official version:
Firstly, a widget that selects how the Triggerlist behaves when a new capture is made. Options are:
'Auto select' - the normal behaviour, where the latest trigger is selected automatically.
'Fast preview' - retrieves a single frame for the trigger from the database and draws it directly on the PhotoPanel, which is considerably faster (I'm seeing ~10ms vs up to a couple of seconds for ~400 frame triggers). The trigger is left un-selected in the list, so the user can click on it to load all the frames (switching to the Finish Strip view will also cause it to be loaded).
'Scroll triggers' - the trigger is added to the list, and the list scrolled to make it visible, but is neither previewed nor selected.
'Autoselect off' - the trigger is added to the list, but the current selection is unaffected. Useful if you want to review a trigger while captures may occur.
As part of implementing this, I've fixed the self.tsMax-related date issues described in #112 - the selected date is now reset properly to the current day when jumping to a new capture, and AutoSelect is disabled when selecting a historical date. Similarly, AustoSelect is disabled when filtering by bib.
I've removed a call to
wx.CallAfter( self.onTriggerSelected )when selecting a new trigger at the end ofrefreshTriggers(), becauseself.triggerList.Select()fires an event to do this already. This meansonTriggerSelected()no longer runs twice after a refresh, which presumably improves performance.Added support for single frame capture via joystick button 3 for completeness, and indicate in the name field when captures are triggered by the joystick (this was useful to me when testing a beam-break trigger device).
Also fixed a bug in the Compute Speed wizard where the image was rendered over the top of the wizard navigation controls on the second page. Added a combo-box selection of some standard wheel sizes (which I'd imagine the juniors and MTBers would also appreciate), and allow free-form entry of a wheel diameter in millimetres.
Further refinements:
Copying of the preview bitmap into the PhotoPanel at the start of capture in the appropriate AutoSelect modes, if the capture is close enough to realtime for it to show the rider passing. This provides excellent realtime feedback with no additional database load.
Capture status shown below the preview - The GUI now indicates that it's actually doing something when the capture is triggered by CrossMgr!
Ability to disable sequential bib numbers for manual/joystick captures - this is useful when operated stand-alone, but confusing when used in combination with CrossMgr.
Fixed the help HTML generation.
Preview update frequency is now adjusted to account for the actual camera frame rate, aiming for a constant 6fps.
I tested the above at a race on 2023-04-23. At no point did Windows mark CrossMgrVideo as 'Not Responding' (which I'd found was a problem since upgrading to a 60fps camera), and the better feedback on what was being captured was appreciated.