Native gui make almost every data editable
This commit is contained in:
1 parent
b8ac8d0185
commit
1a6674c819
48 files changed
+2168
-737
No files matched your search
+80
-28
@@ -12,6 +12,9 @@ class MeasurementView(View):
|
||||
|
||||
def __init__(self, context):
|
||||
super().__init__(context, _("Measurements"), "measurement.ui")
|
||||
self.infobar.set_revealed(False)
|
||||
self.infobar_label = Gtk.Label()
|
||||
self.infobar.get_content_area().add(self.infobar_label)
|
||||
|
||||
self.measure = measurement.Measurement(context.db) # current record
|
||||
self.newrecord = False
|
||||
@@ -22,9 +25,10 @@ class MeasurementView(View):
|
||||
|
||||
# accuracy
|
||||
self.dd_accuracy = self.context.lookup.enum('measurement.accuracy')
|
||||
combobox.load_from_dict(self.combo['accuracy'], {"-1": _("─── none ───")} | self.dd_accuracy)
|
||||
combobox.load_from_dict(self.combo['accuracy'], self.dd_accuracy, 'unknown')
|
||||
|
||||
# measurement units
|
||||
# ATTENTION: Minimum one element in list has to be defined!
|
||||
self.dd_unit = self.context.lookup.dropdown(Dropdown.UNIT)
|
||||
combobox.load_from_dict(self.combo['unit'], self.dd_unit, 1)
|
||||
|
||||
@@ -37,6 +41,19 @@ class MeasurementView(View):
|
||||
combobox.load_from_dict(self.combo['category'], {-1: _("─── none ───")} | self.dd_category)
|
||||
|
||||
self.lst_measurement = Gtk.ListStore(int, str, str, str, str, str)
|
||||
self.load_list()
|
||||
|
||||
treeview.add_column(self.tree['measurement'], _('ID'), 0)
|
||||
treeview.add_column(self.tree['measurement'], _('Measurement'), 1)
|
||||
treeview.add_column(self.tree['measurement'], _('Value'), 2)
|
||||
treeview.add_column(self.tree['measurement'], _('Accuracy'), 3)
|
||||
treeview.add_column(self.tree['measurement'], _('Equipment'), 4)
|
||||
treeview.add_column(self.tree['measurement'], _('Note'), 5)
|
||||
self.tree['measurement'].set_model(self.lst_measurement)
|
||||
|
||||
def load_list(self):
|
||||
selected_id = treeview.get_value(self.tree['measurement'])
|
||||
self.lst_measurement.clear()
|
||||
sql = (
|
||||
"SELECT m.mid, m.mname, m.nval, m.val1, m.val2, m.val3, m.unit, "
|
||||
"m.accuracy, m.note, e.ename "
|
||||
@@ -44,7 +61,8 @@ class MeasurementView(View):
|
||||
"WHERE m.vid=%s "
|
||||
"ORDER BY m.mid"
|
||||
)
|
||||
self.db.dcur.execute(sql, (context.vessel.vid,))
|
||||
self.db.dcur.execute(sql, (self.context.vessel.vid,))
|
||||
selection = self.tree['measurement'].get_selection()
|
||||
for row in self.db.dcur.fetchall():
|
||||
if row['nval'] == 1:
|
||||
value = "{} {}".format(row['val1'], row['unit'])
|
||||
@@ -63,23 +81,18 @@ class MeasurementView(View):
|
||||
row['ename'],
|
||||
row['note'] or ''
|
||||
)
|
||||
self.lst_measurement.append(data)
|
||||
|
||||
treeview.add_column(self.tree['measurement'], _('ID'), 0)
|
||||
treeview.add_column(self.tree['measurement'], _('Measurement'), 1)
|
||||
treeview.add_column(self.tree['measurement'], _('Value'), 2)
|
||||
treeview.add_column(self.tree['measurement'], _('Accuracy'), 3)
|
||||
treeview.add_column(self.tree['measurement'], _('Equipment'), 4)
|
||||
treeview.add_column(self.tree['measurement'], _('Note'), 5)
|
||||
self.tree['measurement'].set_model(self.lst_measurement)
|
||||
treeiter = self.lst_measurement.append(data)
|
||||
if row[0] == selected_id:
|
||||
# restore previous selected row
|
||||
selection.select_iter(treeiter)
|
||||
|
||||
def clear_record(self):
|
||||
self.measure.clear()
|
||||
self.entry['name'].set_text('')
|
||||
combobox.activate_row(self.combo['dimensions'], -1)
|
||||
self.spin['val1'].set_value(0)
|
||||
self.spin['val2'].set_value(0)
|
||||
self.spin['val3'].set_value(0)
|
||||
combobox.activate_row(self.combo['dimensions'], 1)
|
||||
self.spin['val1'].set_text('')
|
||||
self.spin['val2'].set_text('')
|
||||
self.spin['val3'].set_text('')
|
||||
combobox.activate_row(self.combo['accuracy'], 'unknown')
|
||||
self.entry['date'].set_text('')
|
||||
combobox.activate_row(self.combo['equipment'], -1)
|
||||
@@ -87,29 +100,45 @@ class MeasurementView(View):
|
||||
self.text['note'].get_buffer().set_text('')
|
||||
self.entry['name'].grab_focus()
|
||||
|
||||
self.label['edit_val2'].set_visible(False)
|
||||
self.spin['val2'].set_visible(False)
|
||||
self.label['edit_val3'].set_visible(False)
|
||||
self.spin['val3'].set_visible(False)
|
||||
|
||||
def display_record(self):
|
||||
self.label['name'].set_text(self.measure.mname)
|
||||
self.label['dimensions'].set_text(self.measure.nval)
|
||||
self.label['val1'].set_text(self.measure.val1)
|
||||
self.label['dimensions'].set_text(self.dd_dimensions[self.measure.nval])
|
||||
self.label['val1'].set_text(self.format_int(self.measure.val1))
|
||||
if self.measure.nval >= 2:
|
||||
self.label['val2'].set_text(self.measure.val2 or '')
|
||||
self.label['val2'].set_text(self.format_int(self.measure.val2))
|
||||
else:
|
||||
self.label['val2'].set_text('n/a')
|
||||
if self.measure.nval == 3:
|
||||
self.label['val3'].set_text(self.measure.val3 or '')
|
||||
self.label['val3'].set_text(self.format_int(self.measure.val3))
|
||||
else:
|
||||
self.label['val3'].set_text('n/a')
|
||||
# TODO
|
||||
# unit
|
||||
# accuracy
|
||||
# category
|
||||
self.label['unit'].set_text(self.dd_unit.get(self.measure.unit, ''))
|
||||
self.label['accuracy'].set_text(self.dd_accuracy[self.measure.accuracy])
|
||||
self.label['date'].set_text(self.format_date(self.measure.mdate))
|
||||
self.label['category'].set_text(self.dd_category[self.measure.mcat])
|
||||
self.label['note'].set_text(self.measure.note or '')
|
||||
|
||||
def edit_record(self):
|
||||
self.entry['name'].set_text(self.measure.mname)
|
||||
combobox.activate_row(self.combo['dimensions'], self.measure.nval)
|
||||
self.spin['val1'].set_value(self.measure.val1)
|
||||
self.spin['val2'].set_value(self.measure.val2 or 0)
|
||||
self.spin['val3'].set_value(self.measure.val3 or 0)
|
||||
if self.measure.val1 is None:
|
||||
self.spin['val1'].set_text('')
|
||||
else:
|
||||
self.spin['val1'].set_value(self.measure.val1)
|
||||
if self.measure.val2 is None:
|
||||
self.spin['val2'].set_text('')
|
||||
else:
|
||||
self.spin['val2'].set_value(self.measure.val2)
|
||||
if self.measure.val3 is None:
|
||||
self.spin['val3'].set_text('')
|
||||
else:
|
||||
self.spin['val3'].set_value(self.measure.val3)
|
||||
combobox.activate_row(self.combo['unit'], self.measure.unit or 1)
|
||||
combobox.activate_row(self.combo['accuracy'], self.measure.accuracy)
|
||||
self.entry['date'].set_text(self.measure.mdate)
|
||||
combobox.activate_row(self.combo['equipment'], self.measure.eid)
|
||||
@@ -117,6 +146,11 @@ class MeasurementView(View):
|
||||
self.text['note'].get_buffer().set_text(self.task.note or '')
|
||||
self.entry['name'].grab_focus()
|
||||
|
||||
self.label['edit_val2'].set_visible(self.measure.nval > 1)
|
||||
self.spin['val2'].set_visible(self.measure.nval > 1)
|
||||
self.label['edit_val3'].set_visible(self.measure.nval > 2)
|
||||
self.spin['val3'].set_visible(self.measure.nval > 2)
|
||||
|
||||
def save_record(self):
|
||||
# fields must have been validated beforehand
|
||||
self.measure.mname = self.entry['name'].get_text()
|
||||
@@ -124,7 +158,7 @@ class MeasurementView(View):
|
||||
self.measure.val1 = self.spin['val1'].get_value_as_int()
|
||||
self.measure.val2 = self.spin['val2'].get_value_as_int()
|
||||
self.measure.val3 = self.spin['val3'].get_value_as_int()
|
||||
self.measure.accuracy = combobox.get_list_value(self.combo['accurace'])
|
||||
self.measure.accuracy = combobox.get_list_value(self.combo['accuracy'])
|
||||
self.measure.mdate = self.entry['date'].get_text()
|
||||
self.measure.eid = combobox.get_list_value(self.combo['equipment'])
|
||||
self.measure.mcat = combobox.get_list_value(self.combo['category'])
|
||||
@@ -163,6 +197,13 @@ class MeasurementView(View):
|
||||
self.topwidget.set_visible_child(self.box['measure_detail'])
|
||||
self.button['close'].grab_focus()
|
||||
|
||||
def on_cmb_dimensions_changed(self, widget):
|
||||
ndim = combobox.get_list_value(widget)
|
||||
self.label['edit_val2'].set_visible(ndim > 1)
|
||||
self.spin['val2'].set_visible(ndim > 1)
|
||||
self.label['edit_val3'].set_visible(ndim > 2)
|
||||
self.spin['val3'].set_visible(ndim > 2)
|
||||
|
||||
# buttons on detail page
|
||||
# edit2 uses edit callback
|
||||
def on_but_close_clicked(self, widget):
|
||||
@@ -180,12 +221,23 @@ class MeasurementView(View):
|
||||
# buttons on edit page
|
||||
def on_but_save_clicked(self, widget):
|
||||
# check mandatory fields
|
||||
if not self.entry['mname'].get_text().strip():
|
||||
if not self.entry['name'].get_text().strip():
|
||||
# TODO error marker
|
||||
print("Save error mandatory fields missing")
|
||||
self.infobar.set_message_type(Gtk.MessageType.WARNING)
|
||||
self.infobar_label.set_text("Save error mandatory fields missing")
|
||||
self.infobar.set_revealed(True)
|
||||
return
|
||||
else:
|
||||
self.infobar_label.set_text('')
|
||||
self.infobar.set_revealed(False)
|
||||
self.save_record()
|
||||
print(self.measure)
|
||||
self.measure.save()
|
||||
if self.newrecord:
|
||||
self.load_list()
|
||||
self.newrecord = False
|
||||
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['measure_detail'])
|
||||
|
||||
|
||||
Reference in new issue
Block a user