Skip to content

Commit

Permalink
upgraded dependencies, optimized imports, bump to v1.7.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Ley committed Aug 14, 2024
1 parent 500978d commit ad9b01a
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 46 deletions.
69 changes: 40 additions & 29 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "ontoloviz"
version = "1.7.4"
version = "1.7.5"
description = "OntoloViz drug- and phenotype-ontology visualization GUI"
authors = ["Matthias Ley <matthias.ley@delta4.ai>"]
license = "MIT"
Expand Down
14 changes: 8 additions & 6 deletions src/ontoloviz/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
from threading import Thread
import time
import textwrap

from tkinter import Tk, StringVar, BooleanVar, IntVar, filedialog, messagebox, END
from tkinter.ttk import LabelFrame, Frame, Style
from .core import MeSHSunburst, ATCSunburst
from .obo_utils import get_remote_ontology, build_non_separator_based_tree
from .app_utils import Button, Entry, Combobox, Checkbutton, Label, Radiobutton
from .app_utils import create_tooltip, exception_as_popup
from .app_utils import ExportPopup, ColorScalePopup, BorderPopup, SelectOptionsPopup

from src.ontoloviz.core import MeSHSunburst, ATCSunburst
from src.ontoloviz.obo_utils import get_remote_ontology, build_non_separator_based_tree
from src.ontoloviz.app_utils import Button, Entry, Combobox, Checkbutton, Label, Radiobutton
from src.ontoloviz.app_utils import create_tooltip, exception_as_popup
from src.ontoloviz.app_utils import ExportPopup, ColorScalePopup, BorderPopup, SelectOptionsPopup


class App(Tk):
Expand All @@ -20,7 +22,7 @@ def __init__(self):
"""App Initialization, styles, memory variables"""
super().__init__()
self.title("OntoloViz")
self.resizable(False, False)
self.resizable(True, True)
self.minsize(400, 80)

# highres settings for screenshot
Expand Down
9 changes: 5 additions & 4 deletions src/ontoloviz/app_test.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from time import sleep
from threading import Thread
from .core_utils import rgb_to_hex, chunks, generate_color_range
from .core import SunburstBase, MeSHSunburst, ATCSunburst
from .app import App, BorderPopup, ExportPopup, ColorScalePopup
import requests

import tkinter
import plotly

from src.ontoloviz.core_utils import rgb_to_hex, chunks, generate_color_range
from src.ontoloviz.core import SunburstBase, MeSHSunburst, ATCSunburst
from src.ontoloviz.app import App, BorderPopup, ExportPopup, ColorScalePopup


def test_rgb_to_hex():
"""Test utility function rgb_to_hex"""
Expand Down
6 changes: 4 additions & 2 deletions src/ontoloviz/app_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
from re import match
from functools import partial
from traceback import format_exc

from tkinter import Toplevel, messagebox, ttk, StringVar, BooleanVar, IntVar, END
from tkinter.ttk import LabelFrame, Frame
from tkinter import Label as LabelOG, Entry as EntryOG
from tkinter.colorchooser import askcolor
from .core import MeSHSunburst, ATCSunburst
from .core_utils import rgb_to_hex, hex_to_rgb

from src.ontoloviz.core import MeSHSunburst, ATCSunburst
from src.ontoloviz.core_utils import rgb_to_hex, hex_to_rgb


_key_release = "<KeyRelease>"
Expand Down
8 changes: 4 additions & 4 deletions src/ontoloviz/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
from re import match
from string import ascii_uppercase
from textwrap import wrap
from tkinter import Tk, messagebox
from typing import List, Dict, Any

from tkinter import Tk, messagebox
from openpyxl import Workbook, load_workbook
from openpyxl.styles import PatternFill
from plotly.graph_objects import Figure, Sunburst, Icicle, Treemap
from plotly.offline import plot as plotly_plot
from plotly.subplots import make_subplots
from .obo_utils import sanitize_string
from .core_utils import chunks, generate_color_range, prioritize_bright_colors

from src.ontoloviz.obo_utils import sanitize_string
from src.ontoloviz.core_utils import chunks, generate_color_range, prioritize_bright_colors


class SunburstBase:
Expand Down

0 comments on commit ad9b01a

Please sign in to comment.