itkdb-gtk 0.10.9.dev3__py3-none-any.whl → 0.10.10.dev1__py3-none-any.whl

itkdb_gtk/PanelVisualInspection.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 """PB/Hybrid panel Visual inspection GUI.."""
-import json
 import sys
 import copy
 from pathlib import Path
@@ -18,12 +17,11 @@ from itkdb_gtk.ShowDefects import ShowDefects
 from itkdb_gtk.UploadTest import create_json_data_editor
 
 
-
 import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, Gio, GObject
 
-HELP_LINK="https://itkdb-gtk.docs.cern.ch"
+HELP_LINK="https://itkdb-gtk.docs.cern.ch/panelVisualInspection.html"
 
 class TestJson(GObject.Object):
     """To store test JSOn."""
@@ -40,15 +38,19 @@ class TestJson(GObject.Object):
 
 class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
     """PB/Hybryd panel visual inspection GUI."""
-    SN, PASSED, F_NAME, F_PATH, TEST_J, ALL = range(6)
+    SN, ORDER, PASSED, N_FILES, F_LIST, TEST_J, ALL = range(7)
+    F_DEFECT, F_NAME, F_PATH = range(3)
 
-    def __init__(self, session, title="PanelVisualInspection", help=HELP_LINK):
-        super().__init__(title="ITkDB Dashboard",
+    def __init__(self, session, title="PanelVisualInspection", help_link=HELP_LINK):
+        super().__init__(title=title,
                          session=session,
                          show_search="Find object with given SN.",
-                         help=help)
+                         help_link=help_link)
+
+        self.institute = self.pdb_user["institutions"][0]["code"]
+        self.global_image = None
+        self.global_link = None
 
-        self.institute = "IFIC"
         # action button in header
         button = Gtk.Button()
         icon = Gio.ThemedIcon(name="document-send-symbolic")
@@ -66,7 +68,10 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         receiver.connect("changed", self.on_institute)
         receiver.set_tooltip_text("Select the Institute making the test.")
         dbGtkUtils.set_combo_iter(receiver, self.institute)
-        grid.attach(Gtk.Label(label="Institute"), 0, irow, 1, 1)
+
+        lbl = Gtk.Label(label="Institute")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, irow, 1, 1)
         grid.attach(receiver, 1, irow, 1, 1)
 
         irow += 1
@@ -86,12 +91,22 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         lbl = Gtk.Label(label="Date")
         lbl.set_xalign(0)
         grid.attach(lbl, 0, irow, 1, 1)
-        
+
         self.date = dbGtkUtils.TextEntry(small=True)
         grid.attach(self.date.widget, 1, irow, 1, 1)
         self.date.entry.set_text(ITkDButils.get_db_date())
         self.date.connect("text_changed", self.new_date)
 
+        irow += 1
+        self.fC = Gtk.FileChooserButton()
+        self.fC.connect("file-set", self.on_global_image)
+
+        lbl = Gtk.Label(label="Global Image")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, irow, 1, 1)
+        grid.attach(self.fC, 1, irow, 1, 1)
+
+
         # Paned object
         paned = Gtk.Paned(orientation=Gtk.Orientation.VERTICAL)
         paned.set_size_request(-1, 200)
@@ -109,6 +124,17 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
 
         dbGtkUtils.setup_scanner(self.get_qrcode)
 
+    def on_global_image(self, *args):
+        """We choose the global image."""
+        fnam = self.fC.get_filename()
+        if fnam is None or not Path(fnam).exists():
+            dbGtkUtils.complain("Could not find image", fnam, parent=self)
+            return
+
+        self.global_image = Path(fnam).expanduser().resolve()
+
+
+
     def on_institute(self, combo):
         """A new recipient has been chosen."""
         name = self.get_institute_from_combo(combo)
@@ -121,10 +147,13 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         if d is not None:
             self.date.set_text(d)
 
-
     def create_model(self):
         """Create tree view model."""
-        return Gtk.ListStore(str, bool, str, str, TestJson)
+        return Gtk.ListStore(str, int, bool, int, Gtk.ListStore, TestJson)
+
+    def create_file_model(self):
+        """Create model for file list"""
+        return Gtk.ListStore(str, str, str)
 
     def create_tree_view(self, size=150):
         """Create the TreeView with the children."""
@@ -141,12 +170,16 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         column = Gtk.TreeViewColumn("SN", renderer, text=PanelVisualInspection.SN)
         self.tree.append_column(column)
 
+        renderer = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn("position", renderer, text=PanelVisualInspection.ORDER)
+        self.tree.append_column(column)
+
         renderer = Gtk.CellRendererToggle()
         renderer.set_property("activatable", True)
         renderer.set_property("radio", True)
         renderer.set_padding(5, 0)
 
-        x, y = renderer.get_alignment()
+        _, y = renderer.get_alignment()
         renderer.set_alignment(0, y)
         # renderer.set_property("inconsistent", True)
         renderer.connect("toggled", self.btn_toggled)
@@ -154,12 +187,10 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         column = Gtk.TreeViewColumn("Passed", renderer, active=PanelVisualInspection.PASSED)
         self.tree.append_column(column)
 
-
         renderer = Gtk.CellRendererText()
-        column = Gtk.TreeViewColumn("Image", renderer, text=PanelVisualInspection.F_NAME)
+        column = Gtk.TreeViewColumn("N. Images", renderer, text=PanelVisualInspection.N_FILES)
         self.tree.append_column(column)
 
-
         return scrolled
 
     def btn_toggled(self, renderer, path, *args):
@@ -169,110 +200,208 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         model[path][PanelVisualInspection.PASSED] = val
 
 
-    def button_pressed(self, tree, event):
-        """Button pressed on tree view."""
-        # double click shows attachments
-        if event.button == 1 and event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS:
-            self.write_message("This is a double click.\n")
-            return
-
-        if event.button != 3:
-            return
-
+    def get_iter_at_position(self, tree, event):
+        """Get the model and iterator at position."""
         # Create popup menu
-        select = self.tree.get_selection()
-        model, iter = select.get_selected()
+        select = tree.get_selection()
+        model, lv_iter = select.get_selected()
         values = None
-        if iter:
-            values = model[iter]
+        if lv_iter:
+            values = model[lv_iter]
 
-        if not iter:
+        else:
             P = tree.get_path_at_pos(event.x, event.y)
             if P:
-                print(P[0].to_string())
-                iter = model.get_iter(P[0])
-                values = model[iter]
+                lv_iter = model.get_iter(P[0])
+                values = model[lv_iter]
+
+        return model, lv_iter, values
 
+
+    def button_pressed(self, tree, event):
+        """Button pressed on tree view."""
+        # Create popup menu
+        model, lv_iter, values = self.get_iter_at_position(tree, event)
         if not values:
             return
 
+        # double click shows attachments
+        if event.button == 1 and event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS:
+            #self.write_message("This is a double click.\n")
+            self.on_upload_image(None, (model, lv_iter, values))
+            return
+
+        if event.button != 3:
+            return
+
         menu = Gtk.Menu()
 
         item_show = Gtk.MenuItem(label="Upload Image")
-        item_show.connect("activate", self.on_upload_image, (model, iter, values))
+        item_show.connect("activate", self.on_upload_image, (model, lv_iter, values))
         menu.append(item_show)
 
         item_show_json = Gtk.MenuItem(label="Show JSOn")
-        item_show_json.connect("activate", self.on_show_json, (model, iter, values))
+        item_show_json.connect("activate", self.on_show_json, (model, lv_iter, values))
         menu.append(item_show_json)
 
         item_show_com = Gtk.MenuItem(label="Edit Comments")
-        item_show_com.connect("activate", self.on_show_comments, (model, iter, values))
+        item_show_com.connect("activate", self.on_show_comments, (model, lv_iter, values))
         menu.append(item_show_com)
 
         item_show_def = Gtk.MenuItem(label="Edit Defects")
-        item_show_def.connect("activate", self.on_show_defects, (model, iter, values))
+        item_show_def.connect("activate", self.on_show_defects, (model, lv_iter, values))
         menu.append(item_show_def)
 
         menu.show_all()
         menu.popup_at_pointer(event)
 
     def on_upload_image(self, item, data):
-        """Choose file."""
-        fdlg = Gtk.FileChooserNative(action=Gtk.FileChooserAction.OPEN, accept_label="Select")
-        response = fdlg.run()
-        if response == Gtk.ResponseType.ACCEPT:
-            ifiles = [ipath for ipath in fdlg.get_filenames()]
-            if len(ifiles)<1:
-                return
+        """Add defects with images.."""
+
+        model, lv_iter, val = data
+
+        irow = 0
+        tree = Gtk.TreeView(model=val[self.F_LIST])
+        tree.connect("button-press-event", self.on_file_pressed)
 
-            if len(ifiles) > 1:
-                dbGtkUtils.complain("More than one file selected","Choosing first.")
+        btn = Gtk.Button(label="Add image")
+        btn.set_tooltip_text("Click to add a new image.")
+        btn.connect("clicked", self.on_add_image, val[PanelVisualInspection.F_LIST])
 
-            fnam = ifiles[0]
-            model, iter, val = data
-            model.set_value(iter, PanelVisualInspection.F_PATH, fnam)
-            model.set_value(iter, PanelVisualInspection.F_NAME, Path(fnam).name)
+        scrolled = Gtk.ScrolledWindow()
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        scrolled.add(tree)
+        scrolled.set_size_request(-1, 150)
+
+        renderer = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn("Description", renderer, text=PanelVisualInspection.F_DEFECT)
+        tree.append_column(column)
+
+        renderer = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn("File", renderer, text=PanelVisualInspection.F_NAME)
+        tree.append_column(column)
+
+        dlg = Gtk.Dialog(title="Add Image")
+        dlg.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                        Gtk.STOCK_OK, Gtk.ResponseType.OK)
+        box = dlg.get_content_area()
+        box.add(btn)
+        box.add(scrolled)
+        dlg.show_all()
+        rc = dlg.run()
+        if rc == Gtk.ResponseType.OK:
+            f_model = tree.get_model()
+            n_files = f_model.iter_n_children()
+            model.set_value(lv_iter, PanelVisualInspection.F_LIST, f_model)
+            model.set_value(lv_iter, PanelVisualInspection.N_FILES, n_files)
+
+        dlg.hide()
+        dlg.destroy()
+
+        self.write_message("Defects added\n")
+
+    def on_file_pressed(self, tree, event):
+        """Called when right button clicked in add image dialog.
 
+        Opens a pop-up menu to delete the selected entry."""
+        # double click shows attachments
+        if event.button == 1 and event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS:
+            self.write_message("This is a double click.\n")
+            return
 
-        self.write_message("Upload image\n")
 
+        if event.button != 3:
+            return
+
+        model, lv_iter, values = self.get_iter_at_position(tree, event)
+        if not values:
+            return
+        menu = Gtk.Menu()
+
+        item_show = Gtk.MenuItem(label="Delete")
+        item_show.connect("activate", self.on_delete_image, (model, lv_iter, values))
+        menu.append(item_show)
+
+        menu.show_all()
+        menu.popup_at_pointer(event)
+
+    def on_delete_image(self, item, data):
+        """Delete a defect and image"""
+        model, lv_iter, _ = data
+        model.remove(lv_iter)
+
+    def on_add_image(self, btn, model):
+        """Adds a new image."""
+        dlg = Gtk.Dialog(title="Add Image")
+
+        dlg.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                        Gtk.STOCK_OK, Gtk.ResponseType.OK)
+        box = dlg.get_content_area()
+        grid = Gtk.Grid(column_spacing=5, row_spacing=1)
+        box.add(grid)
+
+        irow = 0
+        lbl = Gtk.Label(label="Description")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, irow, 1, 1)
+
+        desc = Gtk.Entry()
+        grid.attach(desc, 1, irow, 1, 1)
+
+        irow += 1
+        lbl = Gtk.Label(label="Image")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, irow, 1, 1)
+
+        fC = Gtk.FileChooserButton()
+        grid.attach(fC, 1, irow, 1, 1)
+
+        dlg.show_all()
+
+        rc = dlg.run()
+        if rc == Gtk.ResponseType.OK:
+            D = desc.get_text()
+            P = Path(fC.get_filename()).expanduser().resolve()
+            model.append([D, P.name, P.as_posix()])
+
+        dlg.hide()
+        dlg.destroy()
 
     def on_show_json(self, item, data):
         """Test JSon."""
-        model, iter, val = data
+        model, lv_iter, val = data
         payload = val[PanelVisualInspection.TEST_J].js
         value, dlg = create_json_data_editor(payload)
         rc = dlg.run()
         if rc == Gtk.ResponseType.OK:
             payload = value.values
-            model.set_value(iter, PanelVisualInspection.TEST_J, TestJson(payload))
+            model.set_value(lv_iter, PanelVisualInspection.TEST_J, TestJson(payload))
 
         dlg.hide()
         dlg.destroy()
 
     def on_show_comments(self, item, data):
         """Show comments"""
-        model, iter, val = data
+        model, lv_iter, val = data
         js = val[PanelVisualInspection.TEST_J].js
         SC = ShowComments("Test Comments", js["comments"], self)
         rc = SC.run()
         if rc == Gtk.ResponseType.OK:
             js["comments"] = SC.comments
-            model.set_value(iter, PanelVisualInspection.TEST_J, TestJson(js))
+            model.set_value(lv_iter, PanelVisualInspection.TEST_J, TestJson(js))
 
         SC.hide()
         SC.destroy()
 
     def on_show_defects(self, item, data):
         """Show comments"""
-        model, iter, val = data
+        model, lv_iter, val = data
         js = val[PanelVisualInspection.TEST_J].js
         SD = ShowDefects("Test Defects", js["defects"], self)
         rc = SD.run()
         if rc == Gtk.ResponseType.OK:
             js["defects"] = SD.defects
-            model.set_value(iter, PanelVisualInspection.TEST_J, TestJson(js))
+            model.set_value(lv_iter, PanelVisualInspection.TEST_J, TestJson(js))
 
         SD.hide()
         SD.destroy()
@@ -335,7 +464,17 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
             if child["component"] is not None:
                 child_SN = child["component"]["serialNumber"]
                 skltn["component"] = child_SN
-                model.append([child_SN, True, "", "", TestJson(skltn)])
+                if is_PWB:
+                    position = child["order"]
+                else:
+                    position = -1
+                    for P in child["properties"]:
+                        if P["code"] == "HYBRID_POSITION":
+                            if P["value"] is not None:
+                                position = int(P["value"])
+                                break
+
+                model.append([child_SN, position, True, 0, self.create_file_model(), TestJson(skltn)])
 
         self.tree.set_model(model)
 
@@ -345,18 +484,29 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         SN = self.SN.get_text()
 
         model = self.tree.get_model()
-        iter = model.get_iter_first()
+        lv_iter = model.get_iter_first()
         n_items = 0
-        while iter:
-            values = model[iter]
+        global_link = None
+        while lv_iter:
+            values = model[lv_iter]
             payload = values[PanelVisualInspection.TEST_J].js
-            ifile = values[PanelVisualInspection.F_PATH]
-            if len(ifile)>0:
-                attachments = [ITkDButils.Attachment(ifile, "Image", "Image")]
-            else:
-                attachments = []
 
-            rc = ITkDButils.upload_test(self.session, payload, attachments)
+            attachments = []
+            if global_link is None:
+                A = ITkDButils.Attachment(path=self.global_image, title="Global Image", desc="Image of whole panel")
+                attachments.append(A)
+
+            im_model = values[PanelVisualInspection.F_LIST]
+            im_iter = im_model.get_iter_first()
+            idef = 1
+            while im_iter:
+                defect, name, path = im_model[im_iter]
+                A = ITkDButils.Attachment(path=path, title="Defect {}".format(idef), desc=defect)
+                attachments.append(A)
+                idef += 1
+                im_iter = im_model.iter_next(im_iter)
+
+            rc = ITkDButils.upload_test(self.session, payload, attachments, check_runNumber=True)
             if rc:
                 ipos = rc.find("The following details may help:")
                 msg = rc[ipos:]
@@ -365,9 +515,39 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
 
             else:
                 self.write_message("Upload {}-{} successfull\n".format(payload["component"], payload["testType"]))
+                if global_link is None:
+                    try:
+                        global_link = ITkDButils.attachment_urls[self.global_image.name]
+                    except KeyError:
+                        pass
+
+                if payload["testType"] == "PICTURE":
+                    rc = ITkDButils.set_test_run_parameter(self.session,
+                                                           ITkDButils.uploaded_test_runs[0],
+                                                           "COMMENT", "Picture of PW carrier")
+                    
+                    rc = ITkDButils.set_test_run_parameter(self.session,
+                                                           ITkDButils.uploaded_test_runs[0],
+                                                           "LINK_TO_PICTURE", global_link)
+                    if rc:
+                        ipos = rc.find("The following details may help:")
+                        msg = rc[ipos:]
+                        dbGtkUtils.complain("Failed updating LINK_TO_PICTURE {}-{}".format(payload["component"], payload["testType"]), msg)
+                        self.write_message(msg)
+
+                elif payload["testType"] == "VISUAL_INSPECTION_RECEPTION":
+                    rc = ITkDButils.create_test_run_comment(self.session,
+                                                            ITkDButils.uploaded_test_runs[0],
+                                                            ["Link to global image:\n {}".format(global_link)])
+                    if rc:
+                        ipos = rc.find("The following details may help:")
+                        msg = rc[ipos:]
+                        dbGtkUtils.complain("Failed adding global link as comment: {}-{}".format(payload["component"], payload["testType"]), msg)
+                        self.write_message(msg)
+
 
             n_items += 1
-            iter = model.iter_next(iter)
+            lv_iter = model.iter_next(lv_iter)
 
 
     def get_qrcode(self, fd, state, reader):
@@ -402,4 +582,4 @@ def main():
     dlg.die()
 
 if __name__ == "__main__":
-    main()
+    main()

itkdb_gtk/PetalReceptionTests.py

@@ -38,12 +38,12 @@ def find_children(W):
 class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
     """Petl Reception Test GUI."""
 
-    def __init__(self, session, help=None):
+    def __init__(self, session, help_link=None):
         """Initialization."""
-        super().__init__(title="ITkDB Dashboard",
+        super().__init__(title="Petal Reception Tests",
                          session=session,
                          show_search="Find object with given SN.",
-                         help=help)
+                         help_link=help_link)
 
         # Members
         self.dbObject = None
@@ -83,7 +83,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         lbl.set_xalign(0)
         grid.attach(lbl, 0, 1, 1, 1)
 
-        self.institute = "IFIC"
+        self.institute = self.pdb_user["institutions"][0]["code"]
         inst = self.create_institute_combo()
         inst.connect("changed", self.new_institute)
         inst.set_tooltip_text("Select the Institute.")
@@ -114,6 +114,10 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         # The text view
         self.mainBox.pack_end(self.message_panel.frame, True, True, 5)
 
+        # Set the default institute
+        dbGtkUtils.set_combo_iter(inst, self.institute)
+
+
         self.show_all()
 
     def on_SN_changed(self, entry, value):
@@ -139,7 +143,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
             page.dict_dialog.factory_reset()
 
 
-    def create_test_box(self, label, test_name, institute="IFIC"):
+    def create_test_box(self, label, test_name, institute=None):
         """Create and add to notebook a test dialog.
 
         Args:
@@ -148,6 +152,9 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
             institute: The institute.
 
         """
+        if institute is None:
+            institute = self.institute
+            
         defaults = {
             "institution": institute,
             "runNumber": "1",
@@ -226,11 +233,11 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
             if fnam is not None and len(fnam)>0:
                 P = Path(fnam).expanduser().resolve()
                 if P.exists():
-                    A = ITkDButils.Attachment(P.as_posix(), P.name, "X-ray image")
+                    A = ITkDButils.Attachment(path=P.as_posix(), title=P.name, desc="X-ray image")
                     values["results"]["IMAGELINK"] = P.name
                     attachments.append(A)
 
-        rc = ITkDButils.upload_test(self.session, values, attachments=attachments)
+        rc = ITkDButils.upload_test(self.session, values, attachments=attachments, check_runNumber=True)
         if rc is not None:
             dbGtkUtils.complain("Could not upload test", rc)
 

itkdb_gtk/SensorUtils.py

@@ -1,10 +1,8 @@
 #!/usr/bin/env python3
 """A collection of utilities for sensor data."""
-import io
 from pathlib import Path
-import numpy as np
 import warnings
-import tempfile
+import numpy as np
 from itkdb_gtk import ITkDButils
 
 #
@@ -210,7 +208,7 @@ def LocateMicroDischarge(
         V_BDV_ind = V_BDV_ind[ind]
         if V_avg_BD.shape == (0,):
             return NO_BD_CONST
-        
+
     return NO_BD_CONST
 
 
@@ -260,8 +258,12 @@ def sensor_data_to_json(session, mdata, mod_type, logger=None):
     passed = True
 
     # Find Current @ 500V
-    indx = np.where(V == 500)[0]
-    i_500 = I[indx][0] / area
+    try:
+        indx = np.where(V == 500)[0]
+        i_500 = I[indx][0] / area
+    except IndexError:
+        i_500 = 999
+
     if logger:
         logger.write_message("I @ 500V = {:.2f} nA/cm2\n".format(i_500))
 
@@ -296,7 +298,7 @@ def sensor_data_to_json(session, mdata, mod_type, logger=None):
             )
             if logger:
                 logger.write_message("...{}. FAILED\n".format(txt))
-                
+
             passed = False
     else:
         if MicroDischargeV == NO_BD_CONST:
@@ -388,7 +390,7 @@ def save_sensor_data(fnam, mdata, name=None):
     Args:
         fnam: file name or file object.
         mdata (dict): data as returned by :function:`read_sensor_file`
-        
+
     """
     if hasattr(fnam, "write") and callable(fnam.write):
         data_out = fnam
@@ -396,17 +398,17 @@ def save_sensor_data(fnam, mdata, name=None):
             fnam = name
         else:
             fnam = build_file_name(mdata)
-            
+
     else:
         data_out = open(fnam, 'w', encoding="utf-8")
         fnam = Path(fnam).name
-        
+
     is_module = "Module_SN" in mdata
     if is_module:
         SN = mdata["Module_SN"]
     else:
         SN = mdata["Component"]
-        
+
     if is_module:
         items = [
             "Type",
@@ -446,7 +448,7 @@ def save_sensor_data(fnam, mdata, name=None):
             "Humidity",
             "Comments",
         ]
-    
+
     data_out.write("{}\n".format(fnam))
     for key in items:
         if key == "Module_SN" or key == "Component":
@@ -469,7 +471,7 @@ def save_sensor_data(fnam, mdata, name=None):
     V = np.abs(mdata["curve"]["V"])
     I = np.abs(mdata["curve"]["I"])
     S = np.abs(mdata["curve"]["S"])
-    
+
     ndata = len(V)
     for i in range(ndata):
         data_out.write("{:10.2f}\t{:10.2f}\t{:10.2f}\n".format(V[i], I[i], S[i]))
@@ -487,4 +489,4 @@ def build_file_name(mdata):
         SN = mdata["Component"]
         fnam = "{}-W{}_IV_{}".format(mdata["Batch"], mdata["Wafer"], mdata["RunNumber"])
 
-    return fnam
+    return fnam

itkdb_gtk/ShowAttachments.py

@@ -232,7 +232,9 @@ class ShowAttachments(Gtk.Dialog):
         rc = dlg.run()
         if rc == Gtk.ResponseType.OK:
             path = Path(dlg.fC.get_filename())
-            A = ITkDButils.Attachment(path, dlg.att_title.get_text().strip(), dlg.att_desc.get_text().strip())
+            A = ITkDButils.Attachment(path=path, 
+                                      title=dlg.att_title.get_text().strip(), 
+                                      desc=dlg.att_desc.get_text().strip())
             self.append_attachment_to_view(A)
             self.attachments.append(A)