Skip to content
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.

Sign up for GitHub

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

Add Recoordination Process with Ghost Point #12

Merged
merged 105 commits into from
Apr 3, 2024
Merged

Add Recoordination Process with Ghost Point #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
a1a0920
Add initial recoordination dialog window
leorudczenko Jul 19, 2023
d1c365a
Remove old files
leorudczenko Jul 19, 2023
fe616a6
Updating point id incrementing to use max current id
leorudczenko Jul 19, 2023
867b051
Change reload_analysis_points to take a transform function
leorudczenko Jul 24, 2023
3da1a5b
Move TableView formatting into table_view file
leorudczenko Jul 24, 2023
56da59e
Update formatting for table elements
leorudczenko Jul 24, 2023
41f1a87
Move some scaling logic out of window
leorudczenko Jul 24, 2023
bd0c809
Update formatting for the graphics elements
leorudczenko Jul 24, 2023
c06ffc4
Move CSV parsing functions into transformation.py
leorudczenko Jul 24, 2023
4d8f876
Move automated ID incrementing function to table_model
leorudczenko Jul 24, 2023
795e686
Add disable_analysis_points option to the GraphicsView
leorudczenko Jul 24, 2023
12f75fa
Add convenience property methods to the main class
leorudczenko Jul 24, 2023
b761aa0
Flake8 fixes
leorudczenko Jul 24, 2023
9f070a3
Add joint logger setup across all classes
leorudczenko Jul 24, 2023
5979570
Add John's affine experimenation files
leorudczenko Jul 24, 2023
34f75ff
Update docstring
leorudczenko Jul 24, 2023
754b1a7
Add numpy to environments
leorudczenko Jul 24, 2023
5fd1538
Update default log messages during tests to be level DEBUG
leorudczenko Jul 24, 2023
c20e969
Refactor export CSV functionality to new file
leorudczenko Jul 24, 2023
78bf336
Move recoordination functionality out of window.py
leorudczenko Jul 24, 2023
045e4f5
Update dialogs to be a method property
leorudczenko Aug 2, 2023
2364a18
Add initial recoordination functionality to application with UI
leorudczenko Aug 2, 2023
8674878
Fix FileDialog path logic
leorudczenko Aug 2, 2023
4998306
Flake8 fix
leorudczenko Aug 2, 2023
b87f5d5
Update import tactool csv error message
leorudczenko Aug 2, 2023
71b744d
Add more argumnents to recoordinate_sem_points to allow differing CSV…
leorudczenko Aug 2, 2023
0d6ea5c
Update path types
leorudczenko Aug 2, 2023
3a1ae86
Add recoordinate SEM CSV file test
leorudczenko Aug 2, 2023
710623e
Update transform function to round rather than rely on int conversion
leorudczenko Aug 2, 2023
e0b4930
Updating error logging
leorudczenko Aug 2, 2023
08c1bdf
Minor formatting
leorudczenko Aug 2, 2023
6ff3757
Parameterise test_recoordinate_sem_points
leorudczenko Aug 2, 2023
14c8e33
Add test_recoordinate_sem_points case with dummy SEM CSV file
leorudczenko Aug 2, 2023
82792d5
Remove special characters from headers
leorudczenko Aug 2, 2023
725721a
Rename variable
leorudczenko Aug 2, 2023
10b2479
Update test structure to split it over more files
leorudczenko Aug 3, 2023
994d06a
Move rectangle toggling to disabling main widgets method
leorudczenko Aug 3, 2023
19f10ae
Update show_message dialog to only open if not in testing_mode
leorudczenko Aug 3, 2023
6515ee4
Update toggle scaling mode formatting
leorudczenko Aug 3, 2023
10071f7
Add cancel button to recoordinate dialog
leorudczenko Aug 3, 2023
b109686
Add toggle recoordinate dialog test
leorudczenko Aug 3, 2023
ddc7d9d
Add typehint for logger to LoggerMixin
leorudczenko Aug 11, 2023
f5f8411
Update recoordination process to invert x axis dest points for origin…
leorudczenko Aug 11, 2023
76cbd3d
Only pass the first 3 reference points to the recoordination dialog
leorudczenko Aug 11, 2023
25eee3b
Add current_message to window __init__
leorudczenko Aug 11, 2023
7c1a067
Add warning message when recoordinated points extend the current imag…
leorudczenko Aug 11, 2023
d382163
Update show_message type checking process
leorudczenko Aug 11, 2023
9234c70
Move only 3 ref points logic to recoordination dialog and apply to so…
leorudczenko Aug 11, 2023
acfc75e
Add new recoordination test cases with 4 ref points
leorudczenko Aug 11, 2023
82678f3
Remove Qt.WindowStaysOnTopHint from dialogs
leorudczenko Aug 15, 2023
4acbeeb
Update README list of tests
leorudczenko Aug 15, 2023
92932dd
Update instructions formatting
leorudczenko Aug 15, 2023
eea35f7
Add recoordination instructions
leorudczenko Aug 15, 2023
91f5de0
Update menu_bar_file naming
leorudczenko Aug 15, 2023
82740b5
Move method down in file
leorudczenko Aug 15, 2023
77da597
Rename some variables for consistency
leorudczenko Aug 16, 2023
bea1499
Add missing typehint
leorudczenko Aug 16, 2023
28479bf
Update mermaid diagram
leorudczenko Aug 16, 2023
b6ecc3a
Fix recoordination image boundary warning conditions
leorudczenko Aug 16, 2023
87497de
Add warning if points extend image boundary when importing TACtool CSV
leorudczenko Aug 16, 2023
e4577c2
Make graphics_scene remove point by attribute arguments optional
leorudczenko Aug 17, 2023
658d842
Update ap argument formatting and add colour setting function
leorudczenko Aug 17, 2023
4b613a3
Move tablemodel point addition/deletion handling from GraphicsScene t…
leorudczenko Aug 17, 2023
2a075fa
Update TableModel referencing
leorudczenko Aug 18, 2023
94a0ef3
Update class relationship diagram to reflect latest changes
leorudczenko Aug 18, 2023
bb15221
Remove logging if logic mistake
leorudczenko Aug 18, 2023
355e345
Move transformation methods to recoordinate_dialog.py
leorudczenko Aug 21, 2023
ce16e52
Update import formatting
leorudczenko Aug 21, 2023
7c671b2
Add test for reload_analysis_points with no arguments
leorudczenko Aug 25, 2023
21c6c2c
Add extra tests for incrementing IDs
leorudczenko Aug 25, 2023
6e76394
Add initial ghost point experimentation
leorudczenko Aug 17, 2023
bf8494d
Combine analysis point and ghost point creation into a single function
leorudczenko Aug 18, 2023
a8a2a7d
Add remove_analysis_point to GraphicsScene rather than remove_graphic…
leorudczenko Aug 18, 2023
b18cccd
Add logic to fix AnalysisPoint deletion when using ghost points
leorudczenko Aug 18, 2023
da5183d
Add Ghost Point option to toolbar
leorudczenko Aug 18, 2023
901c7d3
Fix logging logic mistake
leorudczenko Aug 18, 2023
e53a6e2
Fix rebase changes
leorudczenko Aug 21, 2023
f15da13
Add ghost handling when entering special modes
leorudczenko Aug 21, 2023
4c01b92
Update ghost point to move upon mouse movement
leorudczenko Aug 21, 2023
cb36481
Update log message
leorudczenko Aug 21, 2023
469faec
Add initial ghost point tests
leorudczenko Aug 22, 2023
baefbcf
Increase pytest verbosity
leorudczenko Aug 22, 2023
8eff73a
Rename scaling_rect to transparent_window
leorudczenko Aug 22, 2023
77ef2e6
Add more ghost point tests and toggle_main_input_widgets test
leorudczenko Aug 22, 2023
de2c43d
Replace show_message method with standard QMessageBoxes
leorudczenko Jan 25, 2024
1191fda
Rename menu toolbar variables
leorudczenko Jan 25, 2024
7c54f47
Normalise documentation
leorudczenko Jan 25, 2024
8acb93f
Use pytest.approx to compare floats
leorudczenko Jan 25, 2024
0fd8834
Use monkeypatch during tests when checking if image is under mouse
leorudczenko Jan 25, 2024
fd8bfbc
Rename create_mock_event -> create_mock_mouse_event for clarity
leorudczenko Jan 25, 2024
66b4373
Load re-coordinated SEM points into TACtool rather than exporting them
leorudczenko Jan 25, 2024
85cb0a9
Update re-coordination tests for new functionality
leorudczenko Jan 26, 2024
2ebd3dc
Remove list of tests from README
leorudczenko Jan 26, 2024
7db379f
Normalise docstrings and spelling
leorudczenko Jan 26, 2024
8313576
Do not clear existing reference points if user cancels recoordination…
leorudczenko Jan 26, 2024
e28d2fb
Remove unused methods
leorudczenko Jan 26, 2024
a87f85a
Update instructions to reflect new recoordination process
leorudczenko Jan 26, 2024
61c6ff8
Update class relationship diagram fully
leorudczenko Jan 26, 2024
22f8efd
Use mermaid code in README rather than image file
leorudczenko Jan 26, 2024
e9e1fd7
Add local directory to gitignore
leorudczenko Jan 26, 2024
1ef36b5
Add note to instructions on inverted x axis
leorudczenko Feb 7, 2024
7725e41
Fix typos
leorudczenko Feb 7, 2024
16fe579
Update environment to reduce compiled exe file size
leorudczenko Feb 13, 2024
0d69f77
Run test workflow on environment changes
leorudczenko Feb 13, 2024
17b2a7f
Specify python=3.11
leorudczenko Feb 13, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
paths:
- '**.py'
- 'environments/*.yml'
- '.github/workflows/test.yml'

jobs:
test:
Expand All @@ -29,4 +31,4 @@ jobs:
shell: bash -l {0}
run: |
export PYTHONPATH=.
pytest -vs test/
pytest -vvs test/
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
__pycache__
build
dist
.pytest_cache
.pytest_cache
_LOCAL_LEO
*.spec
Loading
Loading