Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ __pycache__
.mypy_cache
.nox
.coverage
*.egg-info

# local environment setup
.env
6 changes: 6 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Click==7.0
cycler==0.10.0
Flask==1.1.1
itsdangerous==1.1.0
Jinja2==2.10.3
kiwisolver==1.1.0
MarkupSafe==1.1.1
matplotlib==3.1.2
numpy==1.17.4
Pillow==6.2.1
Expand All @@ -13,4 +18,5 @@ six==1.13.0
TextGrid==1.5
tqdm==4.40.2
ttkthemes==2.4.0
Werkzeug==0.16.0
xparser==0.0.4
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def get_requirement(line):
"pytest-mock",
"boto3",
"mypy-boto3-s3",
"typeshed", # flask-stubs
]
},
)
4 changes: 2 additions & 2 deletions ultratrace2/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
logging.basicConfig(level=logging.DEBUG)


def main():
def main() -> None:

parser = argparse.ArgumentParser(prog="ultratrace")

Expand Down Expand Up @@ -67,7 +67,7 @@ def main():

args = parser.parse_args()

app = initialize_app(headless=args.headless, path=args.path, theme=args.theme)
app = initialize_app(args.path, headless=args.headless, theme=args.theme)

app.main()

Expand Down
18 changes: 3 additions & 15 deletions ultratrace2/app.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
from tkinter.filedialog import askdirectory as choose_dir
from typing import Optional

from .gui import GUI
from .model.project import Project


class App:
def __init__(
self,
headless: bool = False,
path: Optional[str] = None,
theme: Optional[str] = None,
self, path: str, headless: bool = False, theme: Optional[str] = None,
):

if path is None and not headless:
path = choose_dir()
if not path:
raise ValueError("You must choose a directory to open")

self.project: Project = Project.get_by_path(path)

if not headless:
self.gui = GUI(theme=theme)

def main(self) -> None:
pass

Expand All @@ -32,9 +20,9 @@ def main(self) -> None:


def initialize_app(
headless: bool = False, path: Optional[str] = None, theme: Optional[str] = None
path: str, headless: bool = False, theme: Optional[str] = None
) -> App:

global app
app = App(headless=headless, path=path, theme=theme,)
app = App(path, headless=headless, theme=theme,)
return app
51 changes: 0 additions & 51 deletions ultratrace2/gui/__init__.py

This file was deleted.

37 changes: 0 additions & 37 deletions ultratrace2/gui/themes.py

This file was deleted.

30 changes: 0 additions & 30 deletions ultratrace2/gui/widgets/__init__.py

This file was deleted.

22 changes: 0 additions & 22 deletions ultratrace2/gui/widgets/audio.py

This file was deleted.

6 changes: 0 additions & 6 deletions ultratrace2/gui/widgets/container.py

This file was deleted.

6 changes: 0 additions & 6 deletions ultratrace2/gui/widgets/control.py

This file was deleted.

23 changes: 0 additions & 23 deletions ultratrace2/gui/widgets/dicom.py

This file was deleted.

12 changes: 0 additions & 12 deletions ultratrace2/gui/widgets/div.py

This file was deleted.

11 changes: 0 additions & 11 deletions ultratrace2/gui/widgets/filedialog.py

This file was deleted.

5 changes: 0 additions & 5 deletions ultratrace2/gui/widgets/frame.py

This file was deleted.

19 changes: 0 additions & 19 deletions ultratrace2/gui/widgets/spectrogram.py

This file was deleted.

21 changes: 0 additions & 21 deletions ultratrace2/gui/widgets/textgrid.py

This file was deleted.

6 changes: 0 additions & 6 deletions ultratrace2/gui/widgets/trace.py

This file was deleted.

6 changes: 0 additions & 6 deletions ultratrace2/gui/widgets/undo.py

This file was deleted.

22 changes: 0 additions & 22 deletions ultratrace2/gui/widgets/video.py

This file was deleted.

Loading