Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
1673d57
make reformat_text private
jcollins1983 Aug 14, 2024
ba6066a
beginnings of (hopefully) improving the UI logic
jcollins1983 Aug 18, 2024
55af830
switch to the more descriptive UserInputError from the Fixate excepti…
jcollins1983 Aug 18, 2024
844682c
switch to new user_serial from _ui.py
jcollins1983 Aug 18, 2024
43c0b69
add user_yes_no and _user_abort_retry
jcollins1983 Aug 18, 2024
8cdc998
add _user_choices_
jcollins1983 Aug 18, 2024
aac14da
add space after choices string
jcollins1983 Aug 18, 2024
bfa1c55
make get_user_input private
jcollins1983 Aug 19, 2024
02b228f
gui for user choices done
jcollins1983 Aug 19, 2024
b56c71a
add some colour to the user_info_important call
jcollins1983 Aug 19, 2024
f4bfb2b
make a bit easier to follow
jcollins1983 Aug 19, 2024
0bef7a3
add user_info and user_info_important
jcollins1983 Aug 19, 2024
0ae712a
add user_ok
jcollins1983 Aug 19, 2024
a9833b8
add user_action
jcollins1983 Aug 23, 2024
7ed5d93
add some missing type hints
jcollins1983 Aug 23, 2024
7da8de8
add _user_image so indicate that an image would have been displayed
jcollins1983 Aug 25, 2024
97affa8
make information standout more
jcollins1983 Aug 25, 2024
3c790bc
fix typo
jcollins1983 Aug 25, 2024
aca4d91
add user image and gif functionality
jcollins1983 Aug 25, 2024
1e0247f
add doc strings
jcollins1983 Aug 26, 2024
b4d2b5e
include message RE use of GIFs in ccommand line
jcollins1983 Aug 26, 2024
2adc228
add post sequence display functions
jcollins1983 Aug 26, 2024
62f7355
move logic out of cmd and qt UIs into ui.py
jcollins1983 Aug 27, 2024
c08f417
adjust tests to account for movement of logic from ui to ui controlle…
jcollins1983 Aug 30, 2024
5aef5e7
fix a whoopsie
jcollins1983 Aug 30, 2024
5eca4af
fix docstring
jcollins1983 Aug 30, 2024
12301bd
probably don't need anything other than int or string for serial numbers
jcollins1983 Aug 31, 2024
382f2b5
add tests for new _ui.py
jcollins1983 Aug 31, 2024
4e7428c
fix tests
jcollins1983 Aug 31, 2024
46f3f47
add a bit more flexibility for the user_info_important colours in the…
jcollins1983 Sep 1, 2024
5c92d03
add test to ensure Issue #213 is not repeated
jcollins1983 Sep 1, 2024
cc7fe83
Merge branch 'PyFixate:main' into revamp-ui
jcollins1983 Oct 24, 2024
42ffa0d
fix typo in comment
jcollins1983 Oct 24, 2024
89631c3
Merge branch 'main' into revamp-ui
jcollins1983 Mar 1, 2026
a5db621
Merge branch 'main' into revamp-ui
jcollins1983 Mar 14, 2026
6ef77b5
remove the 'Result' part of the q.put
jcollins1983 Mar 14, 2026
8bfefc7
fix the things that were getting in the way of the UI tests
jcollins1983 Mar 21, 2026
5c0a2db
make mypy happy
jcollins1983 Mar 22, 2026
e4b9c22
remove unused import
jcollins1983 Mar 22, 2026
5115025
switch to consistent use of f-strings
jcollins1983 Mar 22, 2026
45f2e84
remove unused import
jcollins1983 Mar 22, 2026
3f65a18
addressing review comments
jcollins1983 Mar 22, 2026
70bfe63
add multiplier to account for width of !
jcollins1983 Mar 27, 2026
5cc7272
add manual tests for UI
jcollins1983 Mar 27, 2026
783ec7f
add file used in my setup
jcollins1983 Mar 27, 2026
2096a71
update release notes
jcollins1983 Mar 27, 2026
a72ad7a
one day I will remember all of these things together... bump version
jcollins1983 Mar 27, 2026
a6bb641
Merge branch 'main' into revamp-ui
jcollins1983 Mar 28, 2026
5b088e6
address review comments round 2 and bump black version
jcollins1983 May 17, 2026
b8ada04
sync black version to pre-commit...
jcollins1983 May 17, 2026
e131436
remove black from tox
jcollins1983 May 24, 2026
a1f0c65
forgot the envlist entry for removing black
jcollins1983 May 24, 2026
92be7d5
update mypy version to latest
jcollins1983 May 24, 2026
eca5ab7
remove tox -e black from workflows
jcollins1983 May 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ jobs:
- name: Run tests with tox
run: |
tox -e py
- name: Check formatting
run: |
tox -e black
- name: Run mypy with tox
run: |
tox -e mypy
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ venv37
.vscode/settings.json
docs/_build/
.DS_Store
.env
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ repos:
hooks:
- id: check-yaml
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 26.3.1
hooks:
- id: black
2 changes: 2 additions & 0 deletions docs/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Improvements
- Created a new FixateError base class for all exceptions raised by fixate to use. It inherits from Exception instead of BaseExcepetion to improve error handling.
- DSO Driver function 'waveform_values' now returns a single channels x and y data as two separate lists, without re-acquiring the signal. This function should
now be called after performing signal acquisition.
- UI has been revamped a little. User input methods will no longer return ("Resp", value) but will return just the value - see Issue #177. To use these, from fixate import user_info etc.
- Fixed a bug where falsy values such as 0 or 0.0 were not accepted as valid user input - see Issue #213
- Invert channel and vtime funcitons implemented in the DSO driver.

*************
Expand Down
21 changes: 20 additions & 1 deletion src/fixate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,25 @@
generate_relay_matrix_pin_list as generate_relay_matrix_pin_list,
)

from fixate._ui import (
Validator as Validator,
UiColour as UiColour,
user_input as user_input,
user_input_float as user_input_float,
user_serial as user_serial,
user_yes_no as user_yes_no,
user_info as user_info,
user_info_important as user_info_important,
user_ok as user_ok,
user_action as user_action,
user_image as user_image,
user_image_clear as user_image_clear,
user_gif as user_gif,
user_post_sequence_info_pass as user_post_sequence_info_pass,
user_post_sequence_info_fail as user_post_sequence_info_fail,
user_post_sequence_info as user_post_sequence_info,
)

from fixate.main import run_main_program as run

__version__ = "0.6.4"
__version__ = "0.6.5"
Loading
Loading