Native gui first steps: storage, box and companies are editable
This commit is contained in:
1 parent
1eea4058bf
commit
06a9834688
47 files changed
+3119
-883
No files matched your search
+62
-12
@@ -12,6 +12,8 @@ from gi.repository import GLib, Gtk, Gdk, Rsvg
|
||||
from datetime import datetime
|
||||
import subprocess
|
||||
import locale
|
||||
import xml.etree.ElementTree as ET
|
||||
import json
|
||||
|
||||
from .view import View
|
||||
from yms import gtkutils, combobox, treeview
|
||||
@@ -76,19 +78,29 @@ class BaseView(View):
|
||||
self.context.vessel.vesselname = "Ghost"
|
||||
|
||||
# default storage for current vessel
|
||||
sql = "SELECT sid, sname FROM storage WHERE stype=0 AND vid=%s ORDER BY sname"
|
||||
self.db.cur.execute(sql, (self.context.vessel.vid,))
|
||||
storages = dict(self.db.cur.fetchall())
|
||||
#sql = "SELECT sid, sname FROM storage WHERE stype=0 AND vid=%s ORDER BY sname"
|
||||
#self.db.cur.execute(sql, (self.context.vessel.vid,))
|
||||
#storages = dict(self.db.cur.fetchall())
|
||||
storages = self.context.lookup.storage(self.context.vessel.vid)
|
||||
combobox.load_from_dict(self.combo['storage'], {-1: _("─── none ───")} | storages)
|
||||
|
||||
# Hull types
|
||||
self.dd_htype = self.context.lookup.enum('vessel.htype')
|
||||
combobox.load_from_dict(self.combo['htype'], self.dd_htype)
|
||||
|
||||
# List of available shapes for combobox selection
|
||||
shapes = self.load_shapes()
|
||||
combobox.load_from_dict(self.combo['hull_shape'], {"-1": _("─── none ───")} | shapes)
|
||||
|
||||
# get list of vessels
|
||||
vessellist = {}
|
||||
self.db.dcur.execute("SELECT vid, vesselname, model FROM vessel ORDER BY vid")
|
||||
for row in self.db.dcur.fetchall():
|
||||
vessellist[row['vid']] = (
|
||||
row['vesselname'] if row['model'] is None
|
||||
else row['vesselname'] + " - " + row['model']
|
||||
)
|
||||
#vessellist = {}
|
||||
#self.db.dcur.execute("SELECT vid, vesselname, model FROM vessel ORDER BY vid")
|
||||
#for row in self.db.dcur.fetchall():
|
||||
# vessellist[row['vid']] = (
|
||||
# row['vesselname'] if row['model'] is None
|
||||
# else row['vesselname'] + " - " + row['model']
|
||||
# )
|
||||
vessellist = self.context.lookup.vessel()
|
||||
combobox.load_from_dict(self.combo['vessel'], vessellist, self.context.vessel.vid)
|
||||
# vessel load triggered from combobox init
|
||||
|
||||
@@ -138,6 +150,7 @@ class BaseView(View):
|
||||
#viewport.height = 240
|
||||
#self._svg.render_document(ctx, viewport)
|
||||
|
||||
|
||||
# WIP generic remarks handling
|
||||
self.text['vessel_remarks'].set_size_request(200, 70)
|
||||
|
||||
@@ -149,6 +162,36 @@ class BaseView(View):
|
||||
storages = dict(self.db.cur.fetchall())
|
||||
combobox.refresh_dict(self.combo['storage'], {-1: _("─── none ───")} | storages)
|
||||
|
||||
def load_shapes(self):
|
||||
# TODO / WIP process shapeindex
|
||||
# returns dict of filename: title
|
||||
indexfile = os.path.join(self.context.cfg['docpath'], "shapeindex.json")
|
||||
if os.path.isfile(indexfile):
|
||||
# load json
|
||||
with open(indexfile, "r", encoding="utf-8") as fh:
|
||||
sflist = json.load(fh)
|
||||
print("Shapefile found and loaded")
|
||||
else:
|
||||
# create shapeindex (first simple version)
|
||||
sflist = {}
|
||||
for fname in os.listdir(self.context.cfg['shapedir']):
|
||||
if fname.lower().endswith(".svg"):
|
||||
shapefile = os.path.join(self.context.cfg['shapedir'], fname)
|
||||
try:
|
||||
root = ET.parse(shapefile).getroot()
|
||||
title_element = root.find("{http://www.w3.org/2000/svg}title")
|
||||
if title_element is not None and title_element.text:
|
||||
title = title_element.text.strip()
|
||||
else:
|
||||
title = os.path.splitext(fname)[0]
|
||||
except ET.ParseError:
|
||||
title = os.path.splitext(fname)[0]
|
||||
sflist[fname] = title
|
||||
with open(indexfile, "w", encoding="utf-8") as fh:
|
||||
json.dump(sflist, fh, ensure_ascii=False, indent=4)
|
||||
print("Created new shapeindex file")
|
||||
return sflist
|
||||
|
||||
def find_usb_sticks(self):
|
||||
result = []
|
||||
for name in os.listdir("/sys/block"):
|
||||
@@ -304,7 +347,6 @@ class BaseView(View):
|
||||
self.stack['vessel'].set_visible_child(self.box['vessel_edit'])
|
||||
|
||||
def on_but_vessel_save_clicked(self, widget):
|
||||
print("Save vessel")
|
||||
vessel = self.context.vessel
|
||||
vessel.vesselname = self.entry['vesselname'].get_text()
|
||||
vessel.model = self.entry['model'].get_text()
|
||||
@@ -316,6 +358,9 @@ class BaseView(View):
|
||||
vessel.draught_min = self.spin['draught_min'].get_value()
|
||||
vessel.displacement = self.spin['displacement'].get_value_as_int()
|
||||
vessel.ballast = self.spin['ballast'].get_value_as_int()
|
||||
vessel.beltpos_bow = self.spin['belt_bow'].get_value()
|
||||
vessel.beltpos_aft = self.spin['belt_aft'].get_value()
|
||||
vessel.shapefile = combobox.get_list_value(self.combo['hull_shape'])
|
||||
vessel.remarks = gtkutils.get_text_contents(self.text['vessel_remarks'])
|
||||
vessel.save()
|
||||
self.stack['vessel'].set_visible_child(self.box['vessel'])
|
||||
@@ -337,6 +382,7 @@ class BaseView(View):
|
||||
self.label['model'].set_text(vessel.model or '')
|
||||
self.label['shipyard'].set_text(str(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"))
|
||||
@@ -361,9 +407,13 @@ class BaseView(View):
|
||||
self.spin['draught_min'].set_value(vessel.draught_min or 0)
|
||||
self.spin['displacement'].set_value(vessel.displacement or 0)
|
||||
self.spin['ballast'].set_value(vessel.ballast or 0)
|
||||
self.text['vessel_remarks'].get_buffer().set_text(vessel.remarks or '')
|
||||
self.spin['belt_bow'].set_value(vessel.beltpos_bow or 0)
|
||||
self.spin['belt_aft'].set_value(vessel.beltpos_aft or 0)
|
||||
combobox.activate_row(self.combo['shipyard'], vessel.shipyard or -1)
|
||||
self.entry['hull_number'].set_text(vessel.hull_number or '')
|
||||
combobox.activate_row(self.combo['hull_shape'], vessel.shapefile or "-1")
|
||||
combobox.activate_row(self.combo['storage'], vessel.sid_default or -1)
|
||||
self.text['vessel_remarks'].get_buffer().set_text(vessel.remarks or '')
|
||||
|
||||
def display_user(self, user):
|
||||
self.entry['user_login'].set_text(user.login)
|
||||
|
||||
Reference in new issue
Block a user