itkdb-gtk 0.10.10.dev1__tar.gz → 0.10.10.dev3__tar.gz

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.10.dev1
+Version: 0.10.10.dev3
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk/CreateShipments.py

@@ -19,7 +19,7 @@ from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
 
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gio, GLib
+from gi.repository import Gtk, Gio
 
 # Check if Gtk can be open
 gtk_runs, gtk_args = Gtk.init_check()
@@ -181,6 +181,9 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         # For the later we get the SN in the argument list.
         if isinstance(args[0], Gtk.Button):
             txt = dbGtkUtils.get_a_value("Enter item SN", is_tv=True)
+            if txt is None:
+                return
+
             tmp = re.split(';|,| |\n|\t', txt)
             SNlist = [s.strip() for s in tmp if len(s.strip())>0]
         else:
@@ -346,7 +349,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
                 self.tree.set_model(model)
                 self.comments.set_text("")
                 self.name.set_text("")
-                self.attachments = None
+                self.attachment = None
 
         else:
             self.write_message("Empty list of items when creating shipment.")

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk/GetShipments.py

@@ -96,7 +96,7 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         self.mainBox.pack_start(grid, False, True, 0)
 
         # The shipment receiver
-        receiver = self.create_institute_combo()
+        receiver = self.create_institute_combo(only_user=True)
         receiver.connect("changed", self.on_receiver)
         receiver.set_tooltip_text("Select the Institute receiving the items.")
         dbGtkUtils.set_combo_iter(receiver, self.recipient)
@@ -256,7 +256,7 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
 
     def query_db(self, *args):
         """Query for shipments in DB."""
-        if self.institute is None or self.state == "":
+        if self.state == "":
             return
 
         payload = {
@@ -272,7 +272,11 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         # the tree view.
         cmb_store = Gtk.ListStore(str, str)
         for s in shpmts:
-            if s["recipient"]["code"] == self.recipient and s['sender']['code'] == self.institute:
+            valid_sender = True
+            if self.institute is not None:
+                valid_sender = s['sender']['code'] == self.institute
+                
+            if s["recipient"]["code"] == self.recipient and valid_sender:
                 store = self.get_tree_view_model()
                 cmb_store.append([s['name'], s['id']])
                 items = self.session.get("listShipmentItems", json={"shipment": s["id"]})
@@ -290,8 +294,15 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
             self.write_message("Could not find any shipment in DB.\n")
 
         self.cmb_shipment.set_model(cmb_store)
-        self.cmb_shipment.set_entry_text_column(0)
-        self.cmb_shipment.set_active(0)
+        if len(cmb_store)>0:
+            self.cmb_shipment.set_entry_text_column(0)
+            self.cmb_shipment.set_active(0)
+        else:
+            self.cmb_shipment.set_active(-1)
+            self.cmb_shipment.get_child().set_text("")
+            
+            
+        self.tree.set_model(Gtk.ListStore(str, str, str, bool))
 
     def receive_items(self, *args):
         """Receive shipment items."""

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk/ITkDButils.py

@@ -83,7 +83,7 @@ def get_db_date(timestamp=None):
         try:
             this_date = dateutil.parser.parse(timestamp)
             out = date2string(this_date)
-            
+
         except (OverflowError, dateutil.parser.ParserError):
             out = ""
 
@@ -282,10 +282,7 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
     # Check the given run_number. If already existing, give another one which
     # will try to be consecutive.
     if check_runNumber:
-        def get_new_value(values):
-            run_no = max([x for x in values.keys()])+1
-            return run_no
-
+        # Get all the runNumbers in this test
         test_list = client.get("listTestRunsByComponent",
                                json={
                                     "filterMap":{
@@ -295,20 +292,27 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
                                     }
                                 }
                                )
-        values = {}
+        runN= {}
         for T in test_list:
-            try:
-                run_no = int(T["runNumber"])
-            except ValueError:
-                run_no = get_new_value(values)
+            runN[T["runNumber"]] = 1
 
-            values[run_no] = 1
+        if data["runNumber"] in runN:
+            # if the given runNumber is there, try to create a new one.
+            print("runNumber {} already in {} of {}".format(data["runNumber"], data["testType"], data["component"]))
+            try:
+                irun = int(data["runNumber"])
+                for i in range(irun+1, 100):
+                    newRn = "{}".format(i+1)
+                    if newRn not in runN:
+                        data["runNumber"] = newRn
+                        break
 
-        try:
-            if int(data["runNumber"]) in values.keys():
-                data["runNumber"] = "{}".format(get_new_value(values))
-        except ValueError:
-            data["runNumber"] = "{}".format(get_new_value(values))
+            except ValueError:
+                for i in range(100):
+                    newRn = "{}_{}".format(data["runNumber"], i+1)
+                    if newRn not in runN:
+                        data["runNumber"] = newRn
+                        break
 
     # Try to upload the test
     try:
@@ -368,10 +372,10 @@ def set_test_run_parameter(session, test_run, parameter, value):
     """
     global db_response
     try:
-        db_response = session.post("setTestRunParameter", 
+        db_response = session.post("setTestRunParameter",
                                    json={"testRun": test_run, "code": parameter, "value": value})
         return None
-    
+
     except Exception as E:
         return (str(E))
 
@@ -380,11 +384,11 @@ def create_test_run_comment(session, test_run, comments):
     global db_response
     if not isinstance(comments, Iterable):
         comments = (comments)
-    
+
     try:
         db_response = session.post("createTestRunComment", json={"testRun": test_run, "comments": comments})
         return None
-    
+
     except Exception as E:
         return (str(E))
 
@@ -672,12 +676,12 @@ def get_db_user(client):
 
     Args:
         client (itkdb.Client): The DB client.
-        
+
     """
     global db_response
     if client is None:
         return None
-    
+
     try:
         db_response = client.get("getUser", json={"userIdentity": client.user.identity})
         return db_response

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk/PanelVisualInspection.py

@@ -64,7 +64,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         self.mainBox.pack_start(grid, False, False, 5)
 
         irow = 0
-        receiver = self.create_institute_combo()
+        receiver = self.create_institute_combo(only_user=True)
         receiver.connect("changed", self.on_institute)
         receiver.set_tooltip_text("Select the Institute making the test.")
         dbGtkUtils.set_combo_iter(receiver, self.institute)
@@ -511,7 +511,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                 ipos = rc.find("The following details may help:")
                 msg = rc[ipos:]
                 dbGtkUtils.complain("Failed uploading test {}-{}".format(payload["component"], payload["testType"]), msg)
-                self.write_message(msg)
+                self.write_message(msg+"\n")
 
             else:
                 self.write_message("Upload {}-{} successfull\n".format(payload["component"], payload["testType"]))
@@ -525,15 +525,16 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                     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)
+                        dbGtkUtils.complain("Failed updating LINK_TO_PICTURE {}-{}".format(payload["component"],
+                                                                                           payload["testType"]), msg)
+                        self.write_message(msg+'\n')
 
                 elif payload["testType"] == "VISUAL_INSPECTION_RECEPTION":
                     rc = ITkDButils.create_test_run_comment(self.session,
@@ -542,8 +543,9 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                     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)
+                        dbGtkUtils.complain("Failed adding global link as comment: {}-{}".format(payload["component"],
+                                                                                                 payload["testType"]), msg)
+                        self.write_message(msg+"\n")
 
 
             n_items += 1

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk/PetalReceptionTests.py

@@ -84,7 +84,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         grid.attach(lbl, 0, 1, 1, 1)
 
         self.institute = self.pdb_user["institutions"][0]["code"]
-        inst = self.create_institute_combo()
+        inst = self.create_institute_combo(only_user=True)
         inst.connect("changed", self.new_institute)
         inst.set_tooltip_text("Select the Institute.")
         grid.attach(inst, 1, 1, 1, 1)

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk/WireBondGui.py

@@ -15,7 +15,6 @@ try:
     import itkdb_gtk
 
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
     import itkdb_gtk
@@ -33,7 +32,7 @@ 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()
@@ -449,6 +448,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         self.combo = None
         self.tree = None
         self.lut = {}
+        self.module_type = None
         self.init_window()
 
     def init_window(self):
@@ -571,54 +571,65 @@ class WireBond(dbGtkUtils.ITkDBWindow):
             dbGtkUtils.complain("Cannot open Luukup Table.",
                                 "File {} does not exist.".format(fnam))
             return
-        
+
         lut = {}
+        module_map = {}
+        section = None
         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
-                
+
+                # Check for new section
+                ipos = line.find(':')
+                if ipos >= 0:
+                    section = line[:ipos].strip().upper()
+                    if section in module_map:
+                        dbGtkUtils.complain("Section {} already in map.".format(section), "Stop parsing bond Lookup table.")
+                        return
+
+                    lut = {}
+                    module_map[section] = lut
+                    continue
+
+                if section is None:
+                    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.", 
+                    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
+
+        self.lut = module_map
 
     def convert_channel(self, C):
         """Convert channel according to LUT
 
         Args:
             C (str): channel number
-            
+
         """
         try:
-            return self.lut[C]
-        
+            return self.lut[self.module_type][C]
+
         except KeyError:
             return C
 
@@ -631,13 +642,20 @@ class WireBond(dbGtkUtils.ITkDBWindow):
     def on_SN_changed(self, entry, value):
         """New SN given. Ask in PDB,"""
         if len(value) <= 0:
-            return None
-
+            return
 
         obj = itkdb_gtk.ITkDButils.get_DB_component(self.session, value)
         if obj is not None and obj["serialNumber"] is not None:
             entry.set_text(obj["serialNumber"])
-            self.alternativeID = obj["alternativeIdentifier"]
+            alternativeID = obj["alternativeIdentifier"]
+            module_SN = obj["serialNumber"]
+            if len(module_SN) == 14 and module_SN.startswith("20USEM"):
+                self.module_SN = module_SN
+                self.alternativeID = alternativeID
+                self.module_type = module_SN[5:7]
+
+            else:
+                itkdb_gtk.dbGtkUtils.complain("Invalid SN: {}".format(module_SN), "Not a Ring module")
 
         else:
             itkdb_gtk.dbGtkUtils.complain("Invalid SN", value)
@@ -948,7 +966,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
                 values = list(map(str.strip, key.split(',')))
                 if ',' in key or '-' in key:
                     range_items.append(key)
-                    
+
                 else:
                     continue
 

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.10.dev1"
+__version__ = "0.10.10.dev3"
 
 
 def dash_board():

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk/dbGtkUtils.py

@@ -246,6 +246,7 @@ class TextEntry(GObject.GObject):
         GObject.GObject.__init__(self)
         self.tmp_txt = ""
         self.nlines = n_lines
+        self.do_emit = True
         if self.nlines > 1:
             self.widget = Gtk.Frame()
             scrolled = Gtk.ScrolledWindow()
@@ -265,7 +266,6 @@ class TextEntry(GObject.GObject):
 
             self.widget.connect("focus-in-event", self.on_enter)
             self.widget.connect("focus-out-event", self.on_leave)
-
             self.entry = self.widget
 
     def do_my_signal(self, *args):
@@ -281,7 +281,9 @@ class TextEntry(GObject.GObject):
         """On leave."""
         val = self.widget.get_text().strip()
         if val != self.tmp_txt:
+            self.do_emit = False
             self.emit("text_changed", val)
+            self.do_emit = True
 
     def get_text(self):
         """Return the text."""
@@ -303,7 +305,10 @@ class TextEntry(GObject.GObject):
             self.entry.get_buffer().set_text(text)
         else:
             self.entry.set_text(text)
-
+            if self.do_emit:
+                self.do_emit = False
+                self.emit("text_changed", text)
+                self.do_emit = True
 
 def get_a_value(main_title, second_text=None, is_tv=False, parent=None):
     """Open a dialog to get a value.

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.10.dev1
+Version: 0.10.10.dev3
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

{itkdb_gtk-0.10.10.dev1 → itkdb_gtk-0.10.10.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.10.10.dev1"
+version = "0.10.10.dev3"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]