Fixed vessel change code in native gui

This commit is contained in:
thooge committed 2026-11-12 19:34:59 +01:00
1 parent 09387280fc
commit db74fb6970
16 files changed
+192 -33

No files matched your search

+33 -20
View File
@@ -111,7 +111,7 @@ class BaseView(View):
self.tree['user'].set_model(self.lst_user)
# list of dropdown lists (static!)
self.lst_lists = Gtk.ListStore(int, str, int)
self.lst_lists = Gtk.ListStore(int, str, int, bool)
sql = (
"SELECT dd.ddval, dd.ddtext, FIND_IN_SET('locked', dd.flags) AS locked, "
"COUNT(n.ddval) AS records "
@@ -130,6 +130,7 @@ class BaseView(View):
else:
data.append(row['ddtext'])
data.append(row['records'])
data.append(row['locked'])
self.lst_lists.append(data)
treeview.create_columns(
self.tree['ddlists'],
@@ -151,8 +152,6 @@ class BaseView(View):
self.ddid_cur = None # Current selected dropdown entry
self.ddval_cur = None
self.ddid_iter = None # to easy update selected item
self.ddval_iter = None # to easy update selected item
self.dd_newrecord = False
# Settings date format selection list
@@ -457,6 +456,11 @@ class BaseView(View):
vessel.remarks = gtkutils.get_text_contents(self.text['vessel_remarks'])
vessel.save()
self.context.publish("vessel_modified", self.context.EVENT_UPD, (vessel.vid, ))
# refresh vessel selection list
model = self.combo['vessel'].get_model()
active = self.combo['vessel'].get_active()
model[active][1] = f"{vessel.vesselname} - {vessel.model}" if vessel.model else vessel.vesselname
# switch to display mode
self.stack['vessel'].set_visible_child(self.box['vessel'])
self.display_vessel(self.context.vessel)
@@ -495,22 +499,22 @@ class BaseView(View):
self.db.conn.commit()
def display_vessel(self, vessel):
self.label['vesselname'].set_text(vessel.vesselname)
self.label['vesselname'].set_text(vessel.vesselname or '')
self.label['model'].set_text(vessel.model or '')
self.label['shipyard'].set_text(str(vessel.shipyard))
self.label['shipyard'].set_text(self.dd_storage.get(vessel.shipyard, '-'))
self.label['year_built'].set_text(self.format_int(vessel.year_built, False, default='n/a'))
self.label['hull_number'].set_text(vessel.hull_number or '')
self.label['loa'].set_text(self.format_float(vessel.loa, 2, suffix="m"))
self.label['lwl'].set_text(self.format_float(vessel.lwl, 2, suffix="m"))
self.label['beam'].set_text(self.format_float(vessel.beam, 2, suffix="m"))
self.label['draught'].set_text(self.format_float(vessel.draught, 2, suffix="m"))
self.label['draught_min'].set_text(self.format_float(vessel.draught_min, 2, suffix="m"))
self.label['displacement'].set_text(self.format_int(vessel.displacement, 2, suffix="kg"))
self.label['ballast'].set_text(self.format_int(vessel.ballast, 2, suffix="kg"))
self.label['belt_bow'].set_text(self.format_float(vessel.beltpos_bow, 2, suffix="m"))
self.label['belt_aft'].set_text(self.format_float(vessel.beltpos_aft, 2, suffix="m"))
self.label['hull_shape'].set_text(vessel.shapefile or '')
self.label['storage_def'].set_text(str(vessel.sid_default))
self.label['loa'].set_text(self.format_float(vessel.loa, 2, suffix='m'))
self.label['lwl'].set_text(self.format_float(vessel.lwl, 2, suffix='m'))
self.label['beam'].set_text(self.format_float(vessel.beam, 2, suffix='m'))
self.label['draught'].set_text(self.format_float(vessel.draught, 2, suffix='m'))
self.label['draught_min'].set_text(self.format_float(vessel.draught_min, 2, suffix='m'))
self.label['displacement'].set_text(self.format_int(vessel.displacement, 2, suffix='kg'))
self.label['ballast'].set_text(self.format_int(vessel.ballast, 2, suffix='kg'))
self.label['belt_bow'].set_text(self.format_float(vessel.beltpos_bow, 2, suffix='m'))
self.label['belt_aft'].set_text(self.format_float(vessel.beltpos_aft, 2, suffix='m'))
self.label['hull_shape'].set_text(vessel.shapefile or '-')
self.label['storage_def'].set_text(self.dd_storage.get(vessel.sid_default, '-'))
self.label['remarks'].set_text(vessel.remarks or '')
def edit_vessel(self, vessel):
@@ -664,6 +668,9 @@ class BaseView(View):
self.entry['dd_text'].grab_focus()
def on_but_list_save_clicked(self, widget):
"""
Flags locked and fixed should not be overwritten!
"""
if self.dd_newrecord:
sql = (
"INSERT INTO dropdown (ddid, ddval, ddtext, ddshort, sort, color, flags) "
@@ -694,7 +701,7 @@ class BaseView(View):
self.entry['dd_short'].get_text(),
self.spin['dd_sort'].get_value_as_int(),
self.entry['dd_color'].get_text().lstrip('#'),
'' # TODO flags
'' # TODO flags: fixed must not be overwritten!
)
treeiter = self.lst_list.append(data)
selection = self.tree['ddlist'].get_selection()
@@ -759,16 +766,21 @@ class BaseView(View):
def on_tvw_ddlists_row_activated(self, widget, path, column):
# load single list
self.ddid_iter = widget.get_selection().get_selected()[1]
self.button['list_save'].set_sensitive(False)
if treeview.get_value(widget, 3) == True:
# List is locked!
self.lst_list.clear()
self.clear_dd_entry()
self.button['list_new'].set_sensitive(False)
return
self.ddid_cur = treeview.get_value(widget, 0)
self.ddval_cur = None
self.load_list_dropdown(self.ddid_cur)
self.clear_dd_entry()
self.button['list_save'].set_sensitive(False)
self.button['list_new'].set_sensitive(True)
def on_tvw_ddlist_row_activated(self, widget, path, column):
# load list entry details
self.ddval_iter = widget.get_selection().get_selected()[1]
self.ddval_cur = treeview.get_value(widget, 0)
sql = (
"SELECT ddtext, ddshort, sort, color, flags "
@@ -797,5 +809,6 @@ class BaseView(View):
self.check['dd_fixed'].set_active('fixed' in flags)
self.check['dd_locked'].set_active('locked' in flags)
self.button['list_delete'].set_sensitive(not 'fixed' in flags)
self.button['list_save'].set_sensitive(True)
self.dd_newrecord = False
+6
View File
@@ -35,6 +35,7 @@ class BoxesView(View):
# subscribe to data change events
self.context.subscribe("storage_modified", self.storage_modified)
self.context.subscribe("dd_boxtype_modified", self.boxtype_modified)
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
@@ -96,6 +97,11 @@ class BoxesView(View):
# not implemented
pass
def vessel_modified(self, eventtype, data):
self.tree['box'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['box'])
def clear_record(self):
self.entry['label'].set_text('')
combobox.activate_row(self.combo['storage'], 1)
+33 -7
View File
@@ -29,8 +29,8 @@ class CablesView(View):
self.dd_type = self.context.lookup.dropdown(Dropdown.CABLE_TYPE)
combobox.load_from_dict(self.combo['type'], {-1: _("─── none ───")} | self.dd_type)
# Cable tech type
self.dd_tech = self.context.lookup.dropdown(Dropdown.CABLE_TECHNAME)
combobox.load_from_dict(self.combo['techname'], {-1: _("─── none ───")} | self.dd_tech)
self.dd_techname = self.context.lookup.dropdown(Dropdown.CABLE_TECHNAME)
combobox.load_from_dict(self.combo['techname'], {-1: _("─── none ───")} | self.dd_techname)
# Supplier
self.dd_supplier = self.context.lookup.company(1)
combobox.load_from_dict(self.combo['supplier'], {-1: _("─── none ───")} | self.dd_supplier)
@@ -42,8 +42,10 @@ class CablesView(View):
combobox.load_from_dict(self.combo['condition'], self.dd_condition, 'unknown')
# subscribe to data change events
#self.context.subscribe("dd_type_modified", self.type_modified)
#self.context.subscribe("dd_techname_modified", self.techname_modified)
self.context.subscribe("dd_cabletype_modified", self.type_modified)
self.context.subscribe("dd_techname_modified", self.techname_modified)
self.context.subscribe("company_modified", self.company_modified)
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
@@ -111,6 +113,30 @@ class CablesView(View):
# not implemented
pass
def company_modified(self, eventtype, data):
if data[1] == 1:
# supplier
self.dd_supplier[data[0]] = data[2]
lst = self.combo['supplier'].get_model()
elif data[1] == 2:
# manufacturer
self.dd_manufacturer[data[0]] = data[2]
lst = self.combo['manufacturer'].get_model()
else:
# all other
return
if eventtype == self.context.EVENT_UPD:
for row in lst:
if row[0] == data[0]:
row[1] = data[2]
elif eventtype == self.context.EVENT_ADD:
lst.append((data[0], data[2]))
def vessel_modified(self, eventtype, data):
self.tree['cables'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['cables'])
def display_record(self):
self.label['name'].set_text(self.cable.cablename or '')
if self.cable.cabletype:
@@ -118,7 +144,7 @@ class CablesView(View):
else:
self.label['type'].set_text('')
if self.cable.techname:
self.label['techname'].set_text(self.dd_tech[self.cable.techname])
self.label['techname'].set_text(self.dd_techname[self.cable.techname])
else:
self.label['techname'].set_text('')
self.label['length'].set_text(self.format_float(self.cable.length, suffix="m"))
@@ -130,8 +156,8 @@ class CablesView(View):
self.label['color'].set_markup(f'#{self.cable.color} <span foreground="#{self.cable.color}">●</span>')
else:
self.label['color'].set_text('')
self.label['supplier'].set_text(str(self.cable.supplier))
self.label['manufacturer'].set_text(str(self.cable.manufacturer))
self.label['supplier'].set_text(self.dd_supplier.get(self.cable.supplier, '-'))
self.label['manufacturer'].set_text(self.dd_manufacturer.get(self.cable.manufacturer, '-'))
self.label['condition'].set_text(self.cable.cablecond)
self.label['remarks'].set_text(self.cable.remarks or '')
-1
View File
@@ -230,7 +230,6 @@ class CompaniesView(View):
pass
self.record_unlock()
if self.newrecord:
#self.load_list()
self.add_row()
self.context.publish("company_modified", self.context.EVENT_ADD,
(self.comp.pk_value, self.comp.comptype, self.comp.compname)
+26
View File
@@ -49,6 +49,8 @@ class EquipmentView(View):
# subscribe to data change events
self.context.subscribe("dd_ecat_modified", self.category_modified)
self.context.subscribe("company_modified", self.company_modified)
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
@@ -89,6 +91,11 @@ class EquipmentView(View):
def on_page_activated(self):
print("Equipment activated")
def vessel_modified(self, eventtype, data):
self.tree['equipment'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['equipment'])
def category_modified(self, eventtype, data):
self.dd_category[data[0]] = data[1]
lst = self.combo['category'].get_model()
@@ -103,6 +110,25 @@ class EquipmentView(View):
# not implemented
pass
def company_modified(self, eventtype, data):
if data[1] == 1:
# supplier
self.dd_supplier[data[0]] = data[2]
lst = self.combo['supplier'].get_model()
elif data[1] == 2:
# manufacturer
self.dd_manufacturer[data[0]] = data[2]
lst = self.combo['manufacturer'].get_model()
else:
# all other
return
if eventtype == self.context.EVENT_UPD:
for row in lst:
if row[0] == data[0]:
row[1] = data[2]
elif eventtype == self.context.EVENT_ADD:
lst.append((data[0], data[2]))
def clear_record(self):
self.equip.clear()
self.entry['name'].set_text('')
+6
View File
@@ -43,6 +43,7 @@ class FusesView(View):
self.context.subscribe("cable_modified", self.cable_modified)
self.context.subscribe("dd_ftype_modified", self.ftype_modified)
self.context.subscribe("dd_location_modified", self.location_modified)
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
@@ -138,6 +139,11 @@ class FusesView(View):
# not implemented
pass
def vessel_modified(self, eventtype, data):
self.tree['fuses'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['fuses'])
def clear_record(self):
self.fuse.clear()
self.spin['fnumber'].set_value(0)
+6
View File
@@ -60,6 +60,7 @@ class InventoryView(View):
self.context.subscribe("box_modified", self.box_modified)
self.context.subscribe("equipment_modified", self.equipment_modified)
self.context.subscribe("dd_invcat_modified", self.category_modified)
self.context.subscribe("vessel_modified", self.vessel_modified)
def load_list(self):
selected_id = treeview.get_value(self.tree['inventory'])
@@ -133,6 +134,11 @@ class InventoryView(View):
# not implemented
pass
def vessel_modified(self, eventtype, data):
self.tree['inventory'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['inventory'])
def on_page_activated(self):
print("Inventory activated")
+8
View File
@@ -44,6 +44,9 @@ class MaintenanceView(View):
self.entry['completion'].set_placeholder_text(context.get_datefmt_placeholder())
self.dt_completion = DatePicker(self.entry['completion'], self.button['completion'], context.get_datefmt())
# subscribe to data change events
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
self.maint.maintid,
@@ -76,6 +79,11 @@ class MaintenanceView(View):
# restore previous selected row
selection.select_iter(treeiter)
def vessel_modified(self, eventtype, data):
self.tree['maintenance'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['maintenance'])
def clear_record(self):
self.maint.clear()
self.entry['activities'].set_text('')
+7
View File
@@ -55,9 +55,11 @@ class MeasurementView(View):
self.entry['date'].set_placeholder_text(context.get_datefmt_placeholder())
DatePicker(self.entry['date'], self.button['date'], context.get_datefmt())
# subscribe to data change events
self.context.subscribe("dd_mcat_modified", self.category_modified)
self.context.subscribe("dd_unit_modified", self.unit_modified)
self.context.subscribe("equipment_modified", self.equipment_modified)
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
unit = self.dd_unit[self.measure.unit]
@@ -165,6 +167,11 @@ class MeasurementView(View):
# not implemented
pass
def vessel_modified(self, eventtype, data):
self.tree['measurement'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['measurement'])
def clear_record(self):
self.measure.clear()
self.entry['name'].set_text('')
+8
View File
@@ -40,6 +40,9 @@ class ProjectsView(View):
self.entry['date_start'].set_placeholder_text(context.get_datefmt_placeholder())
DatePicker(self.entry['date_start'], self.button['date_start'], context.get_datefmt())
# subscribe to data change events
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
self.project.projid,
@@ -82,6 +85,11 @@ class ProjectsView(View):
# restore previous selected row
selection.select_iter(treeiter)
def vessel_modified(self, eventtype, data):
self.tree['projects'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['projects'])
def clear_record(self):
self.project.clear()
self.entry['name'].set_text('')
+6
View File
@@ -54,6 +54,7 @@ class ProvisionsView(View):
self.context.subscribe("box_modified", self.box_modified)
self.context.subscribe("dd_provcat_modified", self.category_modified)
self.context.subscribe("dd_provunit_modified", self.unit_modified)
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
@@ -149,6 +150,11 @@ class ProvisionsView(View):
# not implemented
pass
def vessel_modified(self, eventtype, data):
self.tree['provisions'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['provisions'])
def clear_record(self):
self.prov.clear()
self.entry['name'].set_text('')
+6 -4
View File
@@ -57,9 +57,11 @@ class StatusView:
def vessel_modified(self, eventtype, data):
print(f"Vessel changed. New ID={data[0]}")
self.load_svg()
#? self.area['status'].queue_draw()
def load_svg(self):
if not self.context.vessel.shapefile:
self.svg = None
print("No Shapefile defined for current vessel")
return
shapefile = os.path.join(self.context.cfg['shapedir'], self.context.vessel.shapefile)
@@ -111,13 +113,13 @@ class StatusView:
print("No centerline with id='centerline' found!")
def on_drw_status_draw(self, area, cr):
if self.context.vessel.pk_value is None:
# no vessel defined
return
cr.set_source_rgb(0.92, 0.97, 1.0)
cr.paint()
if self.context.vessel.pk_value is None:
# no vessel defined, empty area
return False
if self.svg:
allocation = area.get_allocation()
scale_x = allocation.width / self.svg_width
+8
View File
@@ -34,6 +34,9 @@ class StorageView(View):
self.dd_capaunit = self.context.lookup.enum('storage.capaunit')
combobox.load_from_dict(self.combo['capaunit'], {"-1": _("─── none ───")} | self.dd_capaunit)
# subscribe to data change events
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
self.storage.sid,
@@ -67,6 +70,11 @@ class StorageView(View):
# restore previous selected row
selection.select_iter(treeiter)
def vessel_modified(self, eventtype, data):
self.tree['storage'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['storage'])
def clear_record(self):
self.storage.clear()
self.entry['sname'].set_text('')
+9 -1
View File
@@ -49,6 +49,9 @@ class TasksView(View):
self.entry['duedate'].set_placeholder_text(context.get_datefmt_placeholder())
self.dt_duedate = DatePicker(self.entry['duedate'], self.button['duedate'], context.get_datefmt())
# subscribe to data change events
self.context.subscribe("vessel_modified", self.vessel_modified)
def get_list_row(self):
return (
self.task.taskid,
@@ -89,6 +92,11 @@ class TasksView(View):
# restore previous selected row
selection.select_iter(treeiter)
def vessel_modified(self, eventtype, data):
self.tree['tasks'].get_selection().unselect_all()
self.load_list()
self.topwidget.set_visible_child(self.box['tasks'])
def clear_record(self):
self.task.clear()
self.entry['name'].set_text('')
@@ -117,7 +125,7 @@ class TasksView(View):
def edit_record(self):
self.entry['name'].set_text(self.task.taskname)
combobox.activate_row(self.combo['project'], self.task.projid)
combobox.activate_row(self.combo['project'], self.task.projid or -1)
combobox.activate_row(self.combo['priority'], self.task.priority)
self.entry['plandate'].set_text(self.format_date(self.task.plandate))
self.entry['duedate'].set_text(self.format_date(self.task.duedate))