Add enabledisable joystick button #539
Merged
Conversation
This file contains 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
That is all it does, so far. > Added joystick button as part of stop frame (maybe rename to stop_and_joystick_frm ?) > Joystick button disables up and down buttons using boolean attribute of StageController
…oxes untouched.... can't find them All arrow buttons in stagecontrol tab will change image and deactivate when the button is pressed... need to make ctrl + j also call joystick button handler, or else define a new function and make joystick button handler call that.
In preparation for having "button disabled in joystick mode" hover for the arrow keys, arrow keys given hover events and converted to hover buttons. A similar tactic will be employed for the "set position to these coordinates " hoverentries (xyz0f) once I figure out how to flip-flop the ability to type into these fields.
Needs formatting changes + description, but the skeleton has been created.
> Joystick mode button does the following: - When button pressed: --- disables buttons corresponding to joystick axes specified in configuration.yml --- disables entries corresponding ^^^ --- disabled widgets have a pinkish outline --- updates its text --- updates hover text of altered buttons - When microscope is changed: --- updates joystick axes. --- If joystick is enabled and microscope is changed, joystick mode will be disabled... unless the axes are the same, in which case it will stay enabled. --- if changed to a microscope with no joystick axes, joystick button will be hidden I think that that is it
|
@3vwylie - We had a test fail when we made the PR. You can see where the problem arose by clicking details above in the tests section... We will need to fix these before we can properly review everything... |
Codecov Report
@@ Coverage Diff @@
## develop #539 +/- ##
===========================================
+ Coverage 46.23% 46.40% +0.17%
===========================================
Files 162 162
Lines 15730 15838 +108
===========================================
+ Hits 7272 7350 +78
- Misses 8458 8488 +30
Flags with carried forward coverage won't be shown. Click here to find out more.
|
annie-xd-wang
approved these changes
Jul 24, 2023
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.
Joystick mode button implemented. It should appear only if joystick axes are specified in the configuration file. When pressed, it should disable the position entries and buttons corresponding to the specified joystick axes. Pressing the button should also update several visuals and hover texts corresponding to the joystick axes. Control + J should do the same thing as the button upon release. Switching microscopes should re-enable all buttons and turn "joystick mode" off, unless the joystick axes for both the current and former microscopes are the same, and joystick mode was on while the microscope switch was performed, in which case joystick mode will remain on. If switching from a microscope that has joystick axes and a microscope that does not, the button should disappear. The configuration file that comes with ASLM (C:...\ASLM\src\aslm\config\configuration.yaml) has the default joystick axes (joystick_axes) set to x, y, and z, for both the meso- and nanoscale microscopes.