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.

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

Geometric figure annotator #56

Merged
merged 40 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ae7443e
ZoneAnnotator command-line utility; add ZoneAnnotator into degirum_to…
nklimov23 Aug 30, 2024
0e3d700
fix requirements
nklimov23 Aug 30, 2024
a9595d2
mypy linting fixes
nklimov23 Aug 30, 2024
e7ccabe
fix _zone_annotator_run
nklimov23 Aug 30, 2024
4c25213
generalize zone annotator to geometric shapes
nklimov23 Sep 1, 2024
a880cfe
figure annotator unit tests
nklimov23 Sep 4, 2024
5a9676f
zone_annotator and line_annotator CLI utilities
nklimov23 Sep 4, 2024
c4de1a6
Merge branch 'main' into zone-annotator
nklimov23 Sep 5, 2024
39f630a
argparse bug fix
vlad-nn Sep 5, 2024
1229e97
fixed bug in CLI utilities for figure_annotator
nklimov23 Sep 7, 2024
7d350be
Improved FigureAnnotator GUI
nklimov23 Sep 12, 2024
d299b21
mypy linter fixes
nklimov23 Sep 12, 2024
723c19b
Merge branch 'main' into zone-annotator
nklimov23 Sep 12, 2024
d26fd49
linter fixes
nklimov23 Sep 12, 2024
0f96315
Merge branch 'zone-annotator' of https://github.com/DeGirum/degirum_t…
nklimov23 Sep 12, 2024
d5b6aca
edit
nklimov23 Sep 20, 2024
e3bc919
Merge branch 'main' into zone-annotator
nklimov23 Sep 20, 2024
fe41621
Merge branch 'main' into zone-annotator
nklimov23 Sep 24, 2024
2129575
modified GUI and bug fixes
nklimov23 Sep 26, 2024
a02a31f
Merge branch 'main' into zone-annotator
nklimov23 Sep 27, 2024
14ca74a
Improved GUI and bug fixes
nklimov23 Sep 27, 2024
82e858a
Merge branch 'main' into zone-annotator
nklimov23 Sep 27, 2024
8e36f4a
Improved GUI and bug fixes
nklimov23 Sep 30, 2024
b3c145e
logo file added to release package
nklimov23 Sep 30, 2024
80a052c
Fixing icon path and wheel setup
vlad-nn Oct 1, 2024
05cfe7d
updated icon; GUI modifications
nklimov23 Oct 2, 2024
05268df
color theme as constants
nklimov23 Oct 2, 2024
67d12cb
format
nklimov23 Oct 2, 2024
225d07b
adjust window dimensions and font size
nklimov23 Oct 2, 2024
a7f96e9
Unit tests
nklimov23 Oct 2, 2024
ab747fd
Merge branch 'main' into zone-annotator
nklimov23 Nov 7, 2024
1c0ad40
fix unit tests
nklimov23 Dec 30, 2024
c9db5bd
Merge branch 'main' into zone-annotator
nklimov23 Dec 30, 2024
7797161
linter fixes
nklimov23 Dec 31, 2024
d90568d
modify segmentation model for testing in accordance to PySDK 0.14.3
nklimov23 Dec 31, 2024
acf27d0
modified TFLite segmentation model
nklimov23 Dec 31, 2024
d467c34
Fixing unit tests and code related recent PySDK input shape refactoring
vlad-nn Dec 31, 2024
0f14bc1
Merge branch 'test-fixes' into zone-annotator
nklimov23 Dec 31, 2024
db35d82
linter fix
nklimov23 Dec 31, 2024
bffd09d
bump version to 0.16.1
nklimov23 Dec 31, 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
5 changes: 4 additions & 1 deletion degirum_tools/figure_annotator.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from enum import Enum
from typing import Tuple, List, Dict, Optional
from copy import deepcopy
from pathlib import Path


help_message_line = """
Expand Down Expand Up @@ -483,7 +484,9 @@ def __init__(
self.root.protocol("WM_DELETE_WINDOW", self.on_close)

# Set window icon
self.icon_image = ImageTk.PhotoImage(file="assets/logo.png")
self.icon_image = ImageTk.PhotoImage(
file=str(Path(__file__).parent.parent) + "/assets/logo.png"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like .parent.parent should be just .parent. Otherwise, I get this error:

FileNotFoundError: [Errno 2] No such file or directory: 'C:\\ProgramData\\miniconda3\\Lib\\site-packages\\assets\\logo.png'

)
self.root.iconphoto(True, self.icon_image)

# Set font
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.mypy]
files = "degirum_tools,test"
files = "degirum_tools,test,assets"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You added it to wrong place. This is the list of files to be analyzed by mypy

warn_unused_configs = true
ignore_missing_imports = true
check_untyped_defs = true
Expand Down