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

itkdb_gtk/WireBondGui.py

@@ -2,11 +2,14 @@
 """Wirebonding GUI for PSB."""
 
 import sys
+import re
 import json
+import copy
+from pathlib import Path
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gio, GLib
+from gi.repository import Gtk, Gio, Gdk
 
 try:
     import itkdb_gtk
@@ -16,12 +19,29 @@ except ImportError:
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
     import itkdb_gtk
-    
+
 __HELP_LINK__="https://itkdb-gtk.docs.cern.ch/wirebondTest.html"
 
 from itkdb_gtk import dbGtkUtils
 from itkdb_gtk import ITkDBlogin, ITkDButils, UploadTest
 
+
+#valid_channel = re.compile("(^[0-9]+)-([0-9]+)")
+valid_channel = re.compile("^[0-9]+[\\s*\\,\\s,-[0-9]+]*")
+
+def range_to_list(V):
+    """Convert a range (ch1-ch2) to a list."""
+    if '-' not in V:
+        return [V]
+    
+    out = []
+    endpoints = list(map(int, V.split('-')))
+    endpoints.sort()
+    for i in range(endpoints[0], endpoints[1]+1):
+        out.append(str(i))
+
+    return out
+
 test_parameters = {
         "Repaired Row 1": "REPAIRED_FRONTEND_ROW1",
         "Failed Row 1": "FAILED_FRONTEND_ROW1",
@@ -173,7 +193,7 @@ class HybridHoles:
 
         Returns:
             True if added, False otherwise.
-            
+
         """
         first_chan = self.param[irow][0]
         last_chan = self.param[irow][1]
@@ -310,13 +330,13 @@ class SensorHoles:
 
     def get_sensor_holes(self):
         """Return holes sensor.
-        
+
         Return a list of [sensor, hybrid, segment, ichan, width]
         """
         holes = []
         for hyb in self.hybrids:
             H = hyb.get_sensor_holes()
-            for _, ih, isegment, ichan, width in H: 
+            for _, ih, isegment, ichan, width in H:
                 holes.append([self.id, ih, isegment, ichan, width])
 
         return holes
@@ -360,7 +380,7 @@ class ModuleHoles:
         """
         holes = []
         for S in self.sensors:
-            for _, ihyb, isegment, ichan, width in S.get_sensor_holes():                
+            for _, ihyb, isegment, ichan, width in S.get_sensor_holes():
                 holes.append([S.id, ihyb, isegment, ichan, width])
 
         return holes
@@ -416,16 +436,19 @@ def get_module_param(SN):
 class WireBond(dbGtkUtils.ITkDBWindow):
     """Main window."""
 
-    def __init__(self, session, title="", help=__HELP_LINK__):
+    def __init__(self, session, title="", help_link=__HELP_LINK__):
         """Initialization."""
-        super().__init__(title=title, session=session, help=help)
+        super().__init__(title=title, session=session, help_link=help_link)
         self.pdb = None
         self.models = {}
         self.holes = {}
-        self.institute = "IFIC"
+        self.institute = self.pdb_user["institutions"][0]["code"]
         self.inst_combo = None
         self.module_SN = None
         self.alternativeID = None
+        self.combo = None
+        self.tree = None
+        self.lut = {}
         self.init_window()
 
     def init_window(self):
@@ -460,17 +483,33 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
         # Data panel
         grid = Gtk.Grid(column_spacing=5, row_spacing=1)
-        
+
         # The shipment receiver
-        institute = self.create_institute_combo()
+        institute = self.create_institute_combo(True)
         institute.connect("changed", self.on_institute)
         institute.set_tooltip_text("Select the Institute.")
         dbGtkUtils.set_combo_iter(institute, self.institute)
-        grid.attach(Gtk.Label(label="Institute"), 0, 0, 1, 1)
+
+        lbl = Gtk.Label(label="Institute")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, 0, 1, 1)
         grid.attach(institute, 1, 0, 1, 1)
         self.inst_combo = institute
-        
-        
+
+
+
+        # The lookup table
+        lbl = Gtk.Label(label="Lookup Table")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 2, 0, 1, 1)
+
+        self.testF = Gtk.FileChooserButton()
+        self.testF.set_tooltip_text("Click to select Lookup table.")
+
+        grid.attach(self.testF, 3, 0, 1, 1)
+        self.testF.connect("file-set", self.on_lut)
+
+
         for i, tit in enumerate(["Operator", "Bond Machine", "Wire Batch", "SN", "Date"]):
             lbl = Gtk.Label(label=tit)
             lbl.set_xalign(0)
@@ -480,11 +519,11 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         self.machine = dbGtkUtils.new_small_text_entry()
         self.batch = dbGtkUtils.new_small_text_entry()
         #self.SN = dbGtkUtils.new_small_text_entry()
-        
+
         self.SN = itkdb_gtk.dbGtkUtils.TextEntry(small=True)
         self.SN.connect("text-changed", self.on_SN_changed)
 
-        
+
         self.date = dbGtkUtils.TextEntry(small=True)
         self.date.entry.set_text(ITkDButils.get_db_date())
         self.date.connect("text_changed", self.new_date)
@@ -511,22 +550,84 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
         box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         self.mainBox.pack_start(box, False, False, 0)
-        dbGtkUtils.add_button_to_container(box, "Add Item",
-                                           "Click to add a new item.",
+        dbGtkUtils.add_button_to_container(box, "Add Bond",
+                                           "Click to add a new bond or bond range.",
                                            self.add_item)
 
+        dbGtkUtils.add_button_to_container(box, "Remove Bond",
+                                           "Click to remove selected bond.",
+                                           self.remove_item)
+
         #
         # The text view and buffer
         #
         self.mainBox.pack_start(self.message_panel.frame, True, True, 0)
         self.write_message("wirebond GUI\n")
 
+    def on_lut(self, fdlg):
+        """Get look-up table."""
+        fnam = Path(fdlg.get_filename())
+        if not fnam.exists():
+            dbGtkUtils.complain("Cannot open Luukup Table.",
+                                "File {} does not exist.".format(fnam))
+            return
+        
+        lut = {}
+        with open(fnam, 'r', encoding="UTF-8") as fin:
+            for line in fin:
+                line = line.strip()
+                    
+                if len(line) == 0:
+                    continue
+                
+                # Remove comments.
+                if line[0]=='#':
+                    continue
+                
+                ipos = line.find('#')
+                if ipos >= 0:
+                    line = line[:ipos].strip()
+                        
+                if len(line) == 0:
+                    continue
+                
+                values = list(map(str.strip, line.split(',')))
+                if len(values)!=2:
+                    dbGtkUtils.complain("Cannot read Lookup table.", "Wrong line format: {}".format(line))
+                    return
+                
+                v_local = range_to_list(values[0])
+                v_std = range_to_list(values[1])
+                
+                if len(v_local) != len(v_std):
+                    dbGtkUtils.complain("Wrong Lookup table.", 
+                                        "Ranges have different length: {}".format(line))
+                    return
+                
+                for L, S in zip(v_local, v_std):
+                    lut[L] = S
+                    
+        self.lut = lut
+
+    def convert_channel(self, C):
+        """Convert channel according to LUT
+
+        Args:
+            C (str): channel number
+            
+        """
+        try:
+            return self.lut[C]
+        
+        except KeyError:
+            return C
+
     def on_institute(self, combo):
         """Institute changed."""
         name = self.get_institute_from_combo(combo)
         if name:
             self.institute = name
-        
+
     def on_SN_changed(self, entry, value):
         """New SN given. Ask in PDB,"""
         if len(value) <= 0:
@@ -534,7 +635,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
 
         obj = itkdb_gtk.ITkDButils.get_DB_component(self.session, value)
-        if obj is not None:
+        if obj is not None and obj["serialNumber"] is not None:
             entry.set_text(obj["serialNumber"])
             self.alternativeID = obj["alternativeIdentifier"]
 
@@ -614,8 +715,9 @@ class WireBond(dbGtkUtils.ITkDBWindow):
     def channel_edited(self, widget, path, text):
         """Handles edition in channel number cell."""
         if not text.isnumeric():
-            dbGtkUtils.complain("Wrong channel number", "Invalid channel number: {}".format(text))
-            return
+            if valid_channel.match(text) is None:
+                dbGtkUtils.complain("Wrong channel number", "Invalid channel number: {}".format(text))
+                return
 
         self.text_edited(0, path, text)
 
@@ -630,9 +732,52 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         if d is not None:
             self.date.set_text(d)
 
-    def button_pressed(self, *args):
+    def button_pressed(self, tree, event):
         """Button pressed."""
-        pass
+         # 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
+
+        # Create popup menu
+        select = self.tree.get_selection()
+        model, lv_iter = select.get_selected()
+        values = None
+        if lv_iter:
+            values = model[lv_iter]
+
+        else:
+            P = tree.get_path_at_pos(event.x, event.y)
+            if P:
+                lv_iter = model.get_iter(P[0])
+                values = model[lv_iter]
+
+        if not values:
+            return
+
+        menu = Gtk.Menu()
+
+        item_show = Gtk.MenuItem(label="Delete")
+        item_show.connect("activate", self.on_delete_item, (model, lv_iter, values))
+        menu.append(item_show)
+
+        menu.show_all()
+        menu.popup_at_pointer(event)
+
+    def on_delete_item(self, item, data):
+        """Delete bond in list view."""
+        model, lv_iter, _ = data
+        model.remove(lv_iter)
+
+    def remove_item(self, *args):
+        """REmoves selected bond."""
+        select = self.tree.get_selection()
+        model, lv_iter = select.get_selected()
+        if lv_iter:
+            model.remove(lv_iter)
 
     def add_item(self, *args):
         """Adds a new item in the current model."""
@@ -656,7 +801,8 @@ class WireBond(dbGtkUtils.ITkDBWindow):
             param = get_module_param(self.SN.get_text())
         except ValueError as E:
             dbGtkUtils.complain("Wrong SN number", str(E))
-            
+            return None
+
         M = ModuleHoles(param=param)
 
         for test in test_parameters.values():
@@ -701,10 +847,10 @@ class WireBond(dbGtkUtils.ITkDBWindow):
             self.write_message("{}\n".format(str(H)))
             if H[-1] > mxW:
                 mxW = H[-1]
-            
+
         if mxW > 0:
             self.write_message("Max width: {}". format(mxW))
-            
+
         out["MAX_UNCON_SENSOR_CHAN"] = mxW
         nstrips = 0
         for v in unconnected:
@@ -717,6 +863,9 @@ class WireBond(dbGtkUtils.ITkDBWindow):
     def get_unconnected(self, skeleton):
         """Fill the test DTO with unconnected information."""
         out = self.compute_unconnected()
+        if out is None:
+            raise ValueError("Wrong SN")
+
         for key, val in out.items():
             skeleton["results"][key] = val
 
@@ -755,7 +904,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
             dbGtkUtils.set_combo_iter(self.inst_combo, data["institution"])
         except KeyError:
             self.write_message("institution value is not in the loaded file.")
-        
+
         self.operator.set_text(data["properties"]["OPERATOR"])
         self.machine.set_text(data["properties"]["BOND_MACHINE"])
         self.batch.set_text(data["properties"]["BONDWIRE_BATCH"])
@@ -772,17 +921,58 @@ class WireBond(dbGtkUtils.ITkDBWindow):
     def get_list_of_channels(self, data):
         """Creates the lists of channels."""
         for key, model in self.models.items():
-            iter = model.get_iter_first()
+            lv_iter = model.get_iter_first()
             out = {}
-            while iter:
-                chan, comm = model[iter]
+            while lv_iter:
+                chan, comm = model[lv_iter]
                 if len(chan) > 0:
                     out[chan] = comm
 
-                iter = model.iter_next(iter)
+                lv_iter = model.iter_next(lv_iter)
 
             data["results"][key] = out
 
+    def fix_list_of_channels(self, data):
+        """Expand ranges and, eventually, apply LUT.
+
+        Args:
+            data: The test payload.
+        """
+        for tit, section in data["results"].items():
+            if not isinstance(section, dict):
+                continue
+
+            range_items = []
+            added_items = []
+            for key, comment in section.items():
+                values = list(map(str.strip, key.split(',')))
+                if ',' in key or '-' in key:
+                    range_items.append(key)
+                    
+                else:
+                    continue
+
+                for V in values:
+                    if '-' in V:
+                        for i in range_to_list(V):
+                            added_items.append((str(i), comment))
+
+                    elif len(V)>0:
+                        added_items.append((V, comment))
+
+            for key in range_items:
+                section.pop(key)
+
+            for key, comm in added_items:
+                section[key] = comm
+
+            if len(self.lut)>0 and len(section)>0:
+                tmp = copy.deepcopy(section)
+                section.clear()
+                for key, val in tmp.items():
+                    section[self.convert_channel(key)] = val
+
+
     def save_test(self, *args):
         """Save Test file."""
         dialog = Gtk.FileChooserDialog(
@@ -814,6 +1004,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         data = {
             "institution": self.institute,
             "date": ITkDButils.get_db_date(),
+            "runNumber": "1",
             "properties": {},
             "results": {},
             "comments": [],
@@ -852,7 +1043,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         data["institution"] = self.institute
         if data["runNumber"] == "-1":
             data["runNumber"] = "1"
-            
+
         data["date"] = self.date.get_text()
 
 
@@ -878,7 +1069,12 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
         self.get_test_header(skeleton)
         self.get_list_of_channels(skeleton)
-        self.get_unconnected(skeleton)
+        self.fix_list_of_channels(skeleton)
+        try:
+            self.get_unconnected(skeleton)
+
+        except ValueError:
+            return
 
         uploadW = UploadTest.UploadTest(self.session, payload=skeleton)
         # uploadW.run()
@@ -895,7 +1091,7 @@ def main():
 
     client.user_gui = dlg
 
-    
+
     win = WireBond(client, title="WireBond")
     win.connect("destroy", Gtk.main_quit)
     win.show_all()
@@ -906,6 +1102,6 @@ def main():
         print("Arrrgggg!!!")
 
     dlg.die()
-    
+
 if __name__ == "__main__":
     main()

itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.9.dev3"
+__version__ = "0.10.10.dev1"
 
 
 def dash_board():
@@ -60,5 +60,5 @@ def uploadPetalInformation():
 
 def panelVisualInspection():
     """Visual inspection of PWB or HYB panels."""
-    from .panelVisualInspection import main
+    from .PanelVisualInspection import main
     main()

itkdb_gtk/dashBoard.py

@@ -55,11 +55,11 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
     PANEL_VI = 9
     PETAL_CORE_METRO = 10
     PETAL_CORE_THERMAL = 11
-    
+
 
     def __init__(self, session):
         """Initialization."""
-        super().__init__(title="ITkDB Dashboard", session=session, help=HELP_LINK)
+        super().__init__(title="ITkDB Dashboard", session=session, help_link=HELP_LINK)
         self.mask = 0
 
         # set border width
@@ -105,7 +105,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         btnWireBond = Gtk.Button(label="Wire Bond")
         btnWireBond.connect("clicked", self.wire_bond)
         grid.attach(btnWireBond, 1, irow, 1, 1)
-        
+
         irow += 1
         btnModIV = Gtk.Button(label="Panel Visual Insp.")
         btnModIV.connect("clicked", self.panel_VI)
@@ -117,11 +117,11 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             btnPetalMetrology = Gtk.Button(label="Petal Core Metrology")
             btnPetalMetrology.connect("clicked", self.petal_metrology)
             grid.attach(btnPetalMetrology, 0, irow, 1, 1)
-            
+
             btnPetalThermal = Gtk.Button(label="Petal Core Thermal")
             btnPetalThermal.connect("clicked", self.petal_thermal)
             grid.attach(btnPetalThermal, 1, irow, 1, 1)
-            
+
 
         irow += 1
         grid.attach(Gtk.Label(), 0, irow, 1, 1)
@@ -153,7 +153,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = UploadTest.UploadTest(self.session, help=HELP_LINK)
+        W = UploadTest.UploadTest(self.session, help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
 
     def upload_multiple_tests(self, *args):
@@ -164,7 +164,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = UploadMultipleTests.UploadMultipleTests(self.session, help=HELP_LINK)
+        W = UploadMultipleTests.UploadMultipleTests(self.session, help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
 
     def create_shipment(self, *args):
@@ -175,7 +175,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = CreateShipments.CreateShipments(self.session, help=HELP_LINK)
+        W = CreateShipments.CreateShipments(self.session, help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
 
     def receive_shipment(self, *args):
@@ -186,7 +186,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = GetShipments.ReceiveShipments(self.session, help=HELP_LINK)
+        W = GetShipments.ReceiveShipments(self.session, help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
 
     def petal_gnd(self, *args):
@@ -197,7 +197,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = PetalReceptionTests.PetalReceptionTests(self.session, help=HELP_LINK)
+        W = PetalReceptionTests.PetalReceptionTests(self.session, help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
 
     def glue_weight(self, *args):
@@ -208,7 +208,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = GlueWeight.GlueWeight(self.session, help=HELP_LINK)
+        W = GlueWeight.GlueWeight(self.session, help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
 
     def module_IV(self, *args):
@@ -219,7 +219,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = UploadModuleIV.IVwindow(self.session, help=HELP_LINK)
+        W = UploadModuleIV.IVwindow(self.session, help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
 
     def wire_bond(self, *args):
@@ -230,7 +230,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = WireBondGui.WireBond(session=self.session, title="Wirebond", help=HELP_LINK)
+        W = WireBondGui.WireBond(session=self.session, title="Wirebond", help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
 
@@ -242,7 +242,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = PanelVisualInspection.PanelVisualInspection(session=self.session, title="Panel Visual Inspection", help=HELP_LINK)
+        W = PanelVisualInspection.PanelVisualInspection(session=self.session, title="Panel Visual Inspection", help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
 
@@ -291,6 +291,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
 
 
 def main():
+    """main entry."""
     # DB login
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()