erste Fassung mit Refresh der Gui und Rückmeldung an User

This commit is contained in:
2024-01-15 17:12:38 +01:00
parent 9c7325440f
commit 26f1820a72
4 changed files with 57 additions and 73 deletions
+41 -40
View File
@@ -9,7 +9,6 @@ from caditem import CadItem
#logger = logging.getLogger(__name__) #logger = logging.getLogger(__name__)
class TreeView(): class TreeView():
def __init__(self, frame): def __init__(self, frame):
self.controller = None
# a treeview # a treeview
# hier Anzahl der sichtbaren Zeilen des Baums angeben: # hier Anzahl der sichtbaren Zeilen des Baums angeben:
self.tree = ttk.Treeview(frame, height=40) self.tree = ttk.Treeview(frame, height=40)
@@ -62,10 +61,10 @@ class TreeView():
self.tree.tag_configure('good', background='white') self.tree.tag_configure('good', background='white')
self.tree.tag_configure('missing', background='red') self.tree.tag_configure('missing', background='red')
def data_from_model(self): def data_from_model(self, controller):
parent_children_mapping = self.controller.get_parent_children() parent_children_mapping = controller.get_parent_children()
red_ids = self.controller.get_red_ids() red_ids = controller.get_red_ids()
self.create(parent_children_mapping, red_ids) self.refresh(parent_children_mapping, red_ids)
def item_selected(self, event): def item_selected(self, event):
"""callback of TK if an item in the tree has been selected """callback of TK if an item in the tree has been selected
@@ -73,26 +72,17 @@ class TreeView():
cid = self.tree.selection()[0] cid = self.tree.selection()[0]
# trage die neue ID ins Modell ein # trage die neue ID ins Modell ein
self.controller.set_gui_data('teilenummer', cid) self.controller.set_gui_data('teilenummer', cid)
self.controller.refresh_gui()
# for selected_item in self.tree.selection():
# item = self.tree.item(selected_item)
# record = item['values']
# messagebox.showinfo(title='Information', message=','.join(record))
def get_handle(self): def get_handle(self):
return self.tree return self.tree
class AllRightFrames():
class RightFrameLabels():
def __init__(self, frame, nrow=0): def __init__(self, frame, nrow=0):
self.controller = None
self.frame = frame self.frame = frame
self.build_gui() self.build_widgets()
self.set_start_rwo(nrow) self.set_start_rwo(nrow)
def set_controller(self, controller):
self.controller = controller
def get_rows(self): def get_rows(self):
return self.rownum return self.rownum
def set_start_rwo(self, nrow): def set_start_rwo(self, nrow):
@@ -100,7 +90,24 @@ class RightFrameLabels():
raise Exception("this row can not be set") raise Exception("this row can not be set")
self.rownum = nrow self.rownum = nrow
def build_gui(self): def data_to_model(self, controller):
data = self.get_data()
controller.set_gui_dict(data)
class RightFrameLabels():
def __init__(self, frame, nrow=0):
self.frame = frame
self.build_widgets()
self.set_start_rwo(nrow)
def get_rows(self):
return self.rownum
def set_start_rwo(self, nrow):
if nrow < 0:
raise Exception("this row can not be set")
self.rownum = nrow
def build_widgets(self):
frame = self.frame frame = self.frame
self.rownum = 0 self.rownum = 0
col_left = 0 col_left = 0
@@ -138,20 +145,19 @@ class RightFrameLabels():
"teilennummer": self.teilenummer_text.get(), "teilennummer": self.teilenummer_text.get(),
} }
def data_to_model(self): def data_to_model(self, controller):
data = self.get_data() data = self.get_data()
self.controller.set_gui_dict(data) controller.set_gui_dict(data)
def data_from_model(self): def data_from_model(self, controller):
data = self.controller.get_all_gui_data() data = controller.get_all_gui_data()
if 'teilenummer' in data: if 'teilenummer' in data:
self.teilenummer_text.set(data["teilenummer"]) self.teilenummer_text.set(data["teilenummer"])
class RightFramePDM(): class RightFramePDM():
def __init__(self, frame, nrow=0): def __init__(self, frame, nrow=0):
self.controller = None
self.frame = frame self.frame = frame
self.build_gui() self.build_widgets()
self.set_start_rwo(nrow) self.set_start_rwo(nrow)
def get_rows(self): def get_rows(self):
@@ -161,7 +167,7 @@ class RightFramePDM():
raise Exception("this row can not be set") raise Exception("this row can not be set")
self.rownum = nrow self.rownum = nrow
def build_gui(self): def build_widgets(self):
frame = self.frame frame = self.frame
self.rownum = 4 self.rownum = 4
col_left = 0 col_left = 0
@@ -229,15 +235,15 @@ class RightFramePDM():
"zusatzinfos_txt_neu": self.zusatzinfos_text.get(), "zusatzinfos_txt_neu": self.zusatzinfos_text.get(),
} }
def data_to_model(self): def data_to_model(self, controller):
data = self.get_data() data = self.get_data()
self.controller.set_gui_dict(data) controller.set_gui_dict(data)
def data_to_model(self, key, value): def data_to_model(self, controller, key, value):
self.controller.set_gui_data(key, value) controller.set_gui_data(key, value)
def data_from_model(self): def data_from_model(self, controller):
data = self.controller.get_all_gui_data() data = controller.get_all_gui_data()
if 'pdm_kategorie_neu' in data: if 'pdm_kategorie_neu' in data:
self.pdm_category.set(data["pdm_kategorie_neu"]) self.pdm_category.set(data["pdm_kategorie_neu"])
if 'neuaufbau' in data: if 'neuaufbau' in data:
@@ -254,9 +260,6 @@ class RightFramePDM():
# TODO falls nötig # TODO falls nötig
pass pass
def set_controller(self, controller):
self.controller = controller
class App(): class App():
@@ -292,15 +295,13 @@ class App():
# TODO usw. # TODO usw.
def data_from_model(self): def data_from_model(self):
self.tv.set_controller(self.controller) self.tv.data_from_model(self.controller)
self.rf0.set_controller(self.controller) self.rf0.data_from_model(self.controller)
self.rf1.set_controller(self.controller) self.rf1.data_from_model(self.controller)
self.tv.data_from_model()
self.rf0.data_from_model()
self.rf1.data_from_model()
def set_controller(self, controller): def set_controller(self, controller):
self.controller = controller self.controller = controller
self.tv.set_controller(controller)
def mainloop(self): def mainloop(self):
self.root.mainloop() self.root.mainloop()
+5 -4
View File
@@ -55,6 +55,10 @@ class CadItem():
self.parent_children_mapping = {} self.parent_children_mapping = {}
self.data = {} self.data = {}
self.gui_data = {} self.gui_data = {}
self.controller = None
def set_controller(self, controller):
self.controller = controller
def set_asm_id(self, asm_id): def set_asm_id(self, asm_id):
self.asm_id = asm_id self.asm_id = asm_id
@@ -62,10 +66,7 @@ class CadItem():
return self.asm_id return self.asm_id
def get_current_part_id(self): def get_current_part_id(self):
return self.prt_id return self.get_gui_data("teilenummer")
def set_part_id(self, prt_id):
self.prt_id = prt_id
self.gui_data["teilenummer"] = prt_id
def set_parent_children(self, parent_children_mapping): def set_parent_children(self, parent_children_mapping):
+5 -25
View File
@@ -14,25 +14,6 @@ class Observer():
if event_name not in self._observables: if event_name not in self._observables:
self._observables[event_name] = callback self._observables[event_name] = callback
def detach(self, observer):
"""Remove the observer from the observer list"""
try:
self._observers.remove(observer)
except ValueError:
pass
def attach(self, observer):
"""If the observer is not in the list,
append it into the list"""
if observer not in self._observers:
self._observers.append(observer)
def notify(self, modifier = None):
"""Alert the observers"""
for observer in self._observers:
if modifier != observer:
observer.update(self)
class Event(): class Event():
def __init__(self, name, data, autofire = True): def __init__(self, name, data, autofire = True):
self.name = name self.name = name
@@ -48,17 +29,17 @@ class Controller(Observer):
""" """
Class for manipulating the model and returning data for the view Class for manipulating the model and returning data for the view
""" """
def __init__(self): def __init__(self, model, view):
self.model = None self.set_model(model)
self.view = None # currently just one gui/view self.set_view(view)
Observer.__init__(self) #Observer.__init__(self)
def set_model(self, model): def set_model(self, model):
self.model = model self.model = model
def set_view(self, view): def set_view(self, view):
self.view = view self.view = view
def data_to_gui(self): def refresh_gui(self):
self.view.data_from_model() self.view.data_from_model()
def data_from_model(self): def data_from_model(self):
self.view.data_from_model() self.view.data_from_model()
@@ -100,7 +81,6 @@ class Controller(Observer):
def set_gui_data(self, key, value): def set_gui_data(self, key, value):
"""merken der Eingaben des Nutzers der GUI """ """merken der Eingaben des Nutzers der GUI """
self.model.set_gui_data(key, value) self.model.set_gui_data(key, value)
self.notify()
def get_gui_data(self, key): def get_gui_data(self, key):
return self.model.get_gui_data(key) return self.model.get_gui_data(key)
+7 -5
View File
@@ -69,8 +69,8 @@ parent_children_mapping = {'400102196': ['400102125', '400102126', '400102130',
model = CadItem("400102196") model = CadItem("400102196")
model.set_part_id("400102142")
gui_data = { gui_data = {
"teilenummer":"400102142",
"pdm_kategorie_neu":"Einzelteil", "pdm_kategorie_neu":"Einzelteil",
"neuaufbau" :"False", "neuaufbau" :"False",
"lebenszyklus_status_neu" :"Serie", "lebenszyklus_status_neu" :"Serie",
@@ -81,12 +81,14 @@ model.set_gui_dict(gui_data)
model.set_parent_children(parent_children_mapping) model.set_parent_children(parent_children_mapping)
model.set_red_ids(red_ids) model.set_red_ids(red_ids)
controller = Controller()
root = tk.Tk() root = tk.Tk()
app = App(root) app = App(root)
controller = Controller(model, app)
# um ohne Observer pattern auch Rückmeldungen geben zu können
app.set_controller(controller) app.set_controller(controller)
controller.set_view(app) model.set_controller(controller)
controller.set_model(model)
controller.data_to_gui() # Daten des Modells in der Oberfläche darstellen
controller.refresh_gui()
app.mainloop() app.mainloop()