Skip to content

Commit 7ecc226

Browse files
committed
1.3.9 - outsourced ui
1 parent 1dd0519 commit 7ecc226

6 files changed

Lines changed: 55 additions & 35 deletions

File tree

bin/commit_hash.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
HASH = "635febd"
1+
HASH = "1dd0519"

bin/pinfo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"major": 1, "minor": 3, "micro": 8}
1+
{"major": 1, "minor": 3, "micro": 9}

bin/ui/tkinter_app.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def __init__(self, *args, **kwargs):
3737
tk.Tk.__init__(self, *args, **kwargs)
3838

3939

40+
4041
self.menu = Notebook(self,self.get_ui_names())
4142
self.title(f'LPRT - {VERSION}:{HASH}')
4243
self.geometry('1024x768')

bin/ver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version='1.3.8'
1+
version='1.3.9'

bin/workflow_exec.py

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from bin.workflow_modules import *
22
from yaml import safe_load
3+
from bin.workflow_ui import UI
34
from bin.constants import (
45
FIXED_AUDIO_FOLDER
56
)
@@ -46,7 +47,8 @@ def _resolve_value(self, arg_value):
4647
raise NameError(f"Variable '{var_name}' nicht im Kontext gefunden.")
4748

4849
return arg_value
49-
50+
def create_ui(self, config: dict):
51+
UI()
5052
def execute_workflow(self,
5153
config: dict,
5254
initial_depth: int = 0):
@@ -111,37 +113,6 @@ def execute_workflow(self,
111113
print(f"\n=== Workflow ended with exit code: {RETURN_CODE} ===")
112114
return self.context
113115

114-
class UI:
115-
def __init__(self, parent, elements: list):
116-
self.menu = parent.master
117-
self.thread = None
118-
self.automation_callback = None
119-
self.progress_label = ttk.Label(self,)
120-
self.progress_label.grid(sticky='SE',row = 0, column = 2)
121-
122-
123-
for element in elements:
124-
name = element['name']
125-
id = element['id']
126-
master = element.get('master',None)
127-
if master == 'root':
128-
master = parent
129-
else:
130-
master = getattr(self,master[1:])
131-
132-
if 'pack' in element:
133-
put_mode = 'pack'
134-
fill = element['pack'].get('fill',None)
135-
padx = element['pack'].get('padx',None)
136-
pady = element['pack'].get('pady',None)
137-
138-
elif 'grid' in element: #! Not used currently
139-
put_options = element['grid']
140-
put_mode = 'grid'
141-
142-
print(element['name'])
143-
setattr(self, element['id'])
144-
145116
def run_workflow(config_raw: str, initial_vars: dict):
146117
try:
147118
config_data = safe_load(config_raw)

bin/workflow_ui.py

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
2+
import tkinter.ttk as ttk
3+
from bin.ui.progress_bar_manager import ProgressBarManager
4+
from bin.ui.lpep_picker import LPEPPicker
5+
class UI:
6+
def __init__(self, parent, elements: list):
7+
self.menu = parent.master
8+
self.thread = None
9+
self.automation_callback = None
10+
11+
self.progress_label = ttk.Label(self,)
12+
self.progress_label.grid(sticky='SE',row = 0, column = 2)
13+
14+
W = ttk.Frame(parent)
15+
16+
AUTOMATION_ROOT = ttk.Frame(W)
17+
18+
self.AUTOMATION_ROOT = AUTOMATION_ROOT
19+
20+
self.lpep_picker = LPEPPicker(AUTOMATION_ROOT,self.run,'lp-ep')
21+
22+
self.pbm = ProgressBarManager(AUTOMATION_ROOT)
23+
24+
AUTOMATION_ROOT.pack()
25+
26+
W.pack()
27+
28+
for element in elements:
29+
name = element['name']
30+
id = element['id']
31+
master = element.get('master',None)
32+
if master == 'root':
33+
master = W
34+
else:
35+
master = getattr(self,master[1:])
36+
37+
if 'pack' in element:
38+
put_mode = 'pack'
39+
fill = element['pack'].get('fill',None)
40+
padx = element['pack'].get('padx',None)
41+
pady = element['pack'].get('pady',None)
42+
43+
elif 'grid' in element: #! Not used currently
44+
put_options = element['grid']
45+
put_mode = 'grid'
46+
47+
print(element['name'])
48+
setattr(self, element['id'])

0 commit comments

Comments
 (0)