itkdb-gtk 0.10.10.dev5__tar.gz → 0.10.10.dev6__tar.gz

{itkdb_gtk-0.10.10.dev5 → itkdb_gtk-0.10.10.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.10.dev5
+Version: 0.10.10.dev6
 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.dev5 → itkdb_gtk-0.10.10.dev6}/itkdb_gtk/UploadMultipleTests.py

@@ -644,6 +644,8 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         """Uploads tests and attachments."""
         model = self.tree.get_model()
         lv_iter = model.get_iter_first()
+        ngood = 0
+        nbad = 0
         while lv_iter:
             past_iter = None
             values = model[lv_iter]
@@ -655,17 +657,24 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             if rc:
                 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)
+                dbGtkUtils.complain("Failed uploading test {}-{}".format(payload["component"], payload["testType"]))
+                self.write_message("Failed uploading test {}-{}\n{}\n".format(payload["component"], payload["testType"], msg))
+                nbad += 1
 
             else:
                 self.write_message("Upload {}-{} successfull\n".format(payload["component"], payload["testType"]))
                 past_iter = lv_iter
+                ngood += 1
 
             lv_iter = model.iter_next(lv_iter)
             if past_iter:
                 model.remove(past_iter)
 
+        if nbad>0:
+            dbGtkUtils.complain("Failed to upload all tests", "{} test had errors.\nThey are left in the ListView.")
+        else:
+            dbGtkUtils.complain("All {} tests uploaded succesfully".format(ngood))
+
 
 def main():
     """Main entry."""

itkdb_gtk-0.10.10.dev5/itkdb_gtk/ModuleVisualInspection.py → itkdb_gtk-0.10.10.dev6/itkdb_gtk/VisualInspection.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """Module Visual inspection GUI."""
 import sys
+import re
 from pathlib import Path
 
 try:
@@ -22,10 +23,15 @@ from gi.repository import Gtk, Gio
 
 HELP_LINK="https://itkdb-gtk.docs.cern.ch/moduleVisualInspection.html"
 
+
+module_type = re.compile("20USE(M[0-5]{1}|[345]{1}[LR]{1})[0-9]{7}")
+sensor_type = re.compile("20USES[0-5]{1}[0-9]{7}")
+
+
 class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
-    """Module Visual Inspection."""
+    """Module/Sensor Visual Inspection."""
 
-    def __init__(self, session, title="Module Visual Inspection", help_link=HELP_LINK):
+    def __init__(self, session, title="Visual Inspection", help_link=HELP_LINK):
         super().__init__(title=title,
                          session=session,
                          show_search="Find object with given SN.",
@@ -72,6 +78,10 @@ class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
         self.SN.widget.set_tooltip_text("Enter SN of module.")
         grid.attach(self.SN.widget, 1, irow, 1, 1)
 
+        self.obj_type = None
+        self.obj_type_label = Gtk.Label()
+        grid.attach(self.obj_type_label, 2, irow, 1, 1)
+
         irow += 1
         lbl = Gtk.Label(label="Date")
         lbl.set_xalign(0)
@@ -144,6 +154,17 @@ class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
             return
 
         SN = module["serialNumber"]
+        if module_type.match(SN):
+            self.obj_type_label.set_text("Module")
+            self.obj_type = "MODULE"
+        elif sensor_type.match(SN):
+            self.obj_type_label.set_text("Sensor")
+            self.obj_type = "SENSOR"
+        else:
+            self.obj_type_label.set_text("Invalid SN")
+            self.obj_type = None
+            dbGtkUtils.complain("Invalid SN", "Not a module nor a sensor.")
+
         args[0].set_text(SN)
 
 
@@ -189,7 +210,7 @@ class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
     def upload_test(self, *args):
         """Upload the test."""
         SN = self.SN.get_text()
-        if len(SN) == 0:
+        if len(SN) == 0 or self.obj_type is None:
             dbGtkUtils.complain("Invalid Serial Number", SN)
             return
 
@@ -201,9 +222,13 @@ class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
             "runNumber": "1",
             "date": self.date.get_text()
         }
+        test_type = "VISUAL_INSPECTION"
+        if self.obj_type == "SENSOR":
+            test_type = "VIS_INSP_RES_MOD_V2"
+            
         self.data = ITkDButils.get_test_skeleton(self.session,
-                                                 "MODULE",
-                                                 "VISUAL_INSPECTION",
+                                                 self.obj_type,
+                                                 test_type,
                                                  defaults)
 
         self.data["comments"] = self.comments

{itkdb_gtk-0.10.10.dev5 → itkdb_gtk-0.10.10.dev6}/itkdb_gtk/WireBondGui.py

@@ -92,9 +92,38 @@ module_param = {
     ],
 }
 
+module_to_tf = {
+    0: [],
+    1: [],
+    2: [],
+    3: [],
+    4: [],
+    5: []
+}
+
+hyb_to_pb = {
+    0: [],
+    1: [],
+    2: [],
+    3: [],
+    4: [],
+    5: []
+}
+
+
 def range_to_list(V):
-    """Convert a range (ch1-ch2) to a list."""
-    if '-' not in V and ',' not in V:
+    """Convert a range to a list.
+
+        ch1-ch2 or ch1:ch2 -> [ch1, ch1+1, ch1+2, ..., ch2] or
+        ch1:step:ch2 -> [ch1, ch1+sep, ch1+2*step, ..., ch2]
+    """
+    nfound = 0
+    for c in "-:,":
+        if c in V:
+            nfound += 1
+            break
+
+    if nfound == 0:
         return [V]
 
     out = []
@@ -105,6 +134,21 @@ def range_to_list(V):
             endpoints.sort()
             for i in range(endpoints[0], endpoints[1]+1):
                 out.append(str(i))
+        elif ':' in V:
+            endpoints = list(map(int, V.split(':')))
+            if len(endpoints) == 2:
+                endpoints.sort()
+                for i in range(endpoints[0], endpoints[1]+1):
+                    out.append(str(i))
+
+            elif len(endpoints) == 3:
+                for i in range(endpoints[0], endpoints[2]+1, endpoints[1]):
+                    out.append(str(i))
+
+            else:
+                print("Wring range specification. {}".format(V))
+                continue
+
         else:
             out.append(V)
 
@@ -330,12 +374,11 @@ class SensorHoles:
 
         This is ordered by row.
         """
-        n_strip_row = 2*len(self.hybrids)
-        mx_width = [0 for x in range(n_strip_row)]
+        mx_width = [0 for x in range(4)]
         for hyb in self.hybrids:
             mxW = hyb.get_max_consecutive()
-            for j in range(4):
-                mx_width[j] = max(mx_width[j] , mxW[j])
+            for j, val in enumerate(mxW):
+                mx_width[j] = max(mx_width[j] , val)
 
         return mx_width
 

{itkdb_gtk-0.10.10.dev5 → itkdb_gtk-0.10.10.dev6}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.10.dev5"
+__version__ = "0.10.10.dev6"
 
 
 def dash_board():
@@ -53,17 +53,12 @@ def wirebondTest():
     from .WireBondGui import main
     main()
 
-def uploadPetalInformation():
-    """Read files from AVS nd create Petal core in PDB."""
-    from .UploadPetalInformation import main
-    main()
-
 def panelVisualInspection():
     """Visual inspection of PWB or HYB panels."""
     from .PanelVisualInspection import main
     main()
 
-def moduleVisualInspection():
-    """Visual inspection of Modules."""
-    from .ModuleVisualInspection import main
+def visualInspection():
+    """Visual inspection of Modules/Sensors."""
+    from .VisualInspection import main
     main()

{itkdb_gtk-0.10.10.dev5 → itkdb_gtk-0.10.10.dev6}/itkdb_gtk/dashBoard.py

@@ -22,7 +22,7 @@ from itkdb_gtk import GlueWeight
 from itkdb_gtk import UploadModuleIV
 from itkdb_gtk import WireBondGui
 from itkdb_gtk import PanelVisualInspection
-from itkdb_gtk import ModuleVisualInspection
+from itkdb_gtk import VisualInspection
 
 
 HAS_PETALQC=False
@@ -30,6 +30,7 @@ try:
     from petal_qc.metrology.coreMetrology import CoreMetrology, CoreMetrologyOptions
     from petal_qc.thermal.coreThermal import CoreThermal
     from petal_qc.thermal.IRPetalParam import IRPetalParam
+    from petal_qc.metrology.uploadPetalInformation import AVSPanel, AVSOptions
 
     HAS_PETALQC = True
 except ImportError as E:
@@ -57,6 +58,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
     MODULE_VI = 10
     PETAL_CORE_METRO = 11
     PETAL_CORE_THERMAL = 12
+    PETAL_INFORMATION = 13
 
 
     def __init__(self, session):
@@ -113,12 +115,17 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         btnPanelVI.connect("clicked", self.panel_VI)
         grid.attach(btnPanelVI, 1, irow, 1, 1)
 
-        btnModVI = Gtk.Button(label="Module Visual Insp.")
+        btnModVI = Gtk.Button(label="Module/Sensor Visual Insp.")
         btnModVI.connect("clicked", self.module_VI)
         grid.attach(btnModVI, 0, irow, 1, 1)
 
 
         if HAS_PETALQC:
+            irow +=1
+            btnPetalInfo = Gtk.Button(label="AVS Petal Info")
+            btnPetalInfo.connect("clicked", self.upload_petal_info)
+            grid.attach(btnPetalInfo, 0, irow, 1, 1)
+
             irow +=1
             btnPetalMetrology = Gtk.Button(label="Petal Core Metrology")
             btnPetalMetrology.connect("clicked", self.petal_metrology)
@@ -262,18 +269,35 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = ModuleVisualInspection.ModuleVisualInspection(session=self.session,
-                                                          title="Module Visual Inspection",
+        W = VisualInspection.ModuleVisualInspection(session=self.session,
+                                                          title="Module/Sensor Visual Inspection",
                                                           help_link=HELP_LINK)
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
 
 
+    def upload_petal_info(self, *srgs):
+        """Upload petal Info."""
+        if not HAS_PETALQC:
+            return
+
+        bitn = DashWindow.PETAL_INFORMATION
+        bt = 1 << bitn
+        if self.mask & bt:
+            return
+
+        self.mask |= bt
+        W = AVSPanel(self.session, AVSOptions())
+        W.connect("destroy", self.app_closed, bitn)
+        W.show_all()
+
+
     def petal_metrology(self, *args):
         """Do petal metrology"""
         if not HAS_PETALQC:
             return
 
+
         bitn = DashWindow.PETAL_CORE_METRO
         bt = 1 << bitn
         if self.mask & bt:

{itkdb_gtk-0.10.10.dev5 → itkdb_gtk-0.10.10.dev6}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.10.dev5
+Version: 0.10.10.dev6
 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.dev5 → itkdb_gtk-0.10.10.dev6}/itkdb_gtk.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ itkdb_gtk/ITkDB.desktop
 itkdb_gtk/ITkDB.svg
 itkdb_gtk/ITkDBlogin.py
 itkdb_gtk/ITkDButils.py
-itkdb_gtk/ModuleVisualInspection.py
 itkdb_gtk/PanelVisualInspection.py
 itkdb_gtk/PetalReceptionTests.py
 itkdb_gtk/SensorUtils.py
@@ -16,13 +15,12 @@ itkdb_gtk/ShowComments.py
 itkdb_gtk/ShowDefects.py
 itkdb_gtk/UploadModuleIV.py
 itkdb_gtk/UploadMultipleTests.py
-itkdb_gtk/UploadPetalInformation.py
 itkdb_gtk/UploadTest.py
+itkdb_gtk/VisualInspection.py
 itkdb_gtk/WireBondGui.py
 itkdb_gtk/__init__.py
 itkdb_gtk/dashBoard.py
 itkdb_gtk/dbGtkUtils.py
-itkdb_gtk/readAVSdata.py
 itkdb_gtk/readGoogleSheet.py
 itkdb_gtk/untrash_component.py
 itkdb_gtk.egg-info/PKG-INFO
@@ -34,5 +32,7 @@ itkdb_gtk.egg-info/top_level.txt
 test/testAnimated.py
 test/testBatch.py
 test/testComponent.py
+test/testRange.py
+test/testThread.py
 test/test_attachment.py
 test/test_holes.py

{itkdb_gtk-0.10.10.dev5 → itkdb_gtk-0.10.10.dev6}/itkdb_gtk.egg-info/entry_points.txt

@@ -3,11 +3,10 @@ createShipments = itkdb_gtk:createShipments
 getShipments = itkdb_gtk:getShipments
 glueWeight = itkdb_gtk:glueWeight
 itkdb_dashBoard = itkdb_gtk:dash_board
-moduleVisualInspection = itkdb_gtk:moduleVisualInspection
 panelVisualInspection = itkdb_gtk:panelVisualInspection
 petalReceptionTests = itkdb_gtk:petalReceptionTests
 uploadModuleIV = itkdb_gtk:uploadModuleIV
 uploadMultipleTests = itkdb_gtk:uploadMultipleTests
-uploadPetalInformation = itkdb_gtk:uploadPetalInformation
 uploadTest = itkdb_gtk:uploadTest
+visualInspection = itkdb_gtk:visualInspection
 wirebondTest = itkdb_gtk:wirebondTest

{itkdb_gtk-0.10.10.dev5 → itkdb_gtk-0.10.10.dev6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.10.10.dev5"
+version = "0.10.10.dev6"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]
@@ -36,9 +36,8 @@ uploadTest = "itkdb_gtk:uploadTest"
 uploadMultipleTests = "itkdb_gtk:uploadMultipleTests"
 uploadModuleIV = "itkdb_gtk:uploadModuleIV"
 wirebondTest = "itkdb_gtk:wirebondTest"
-uploadPetalInformation = "itkdb_gtk:uploadPetalInformation"
 panelVisualInspection = "itkdb_gtk:panelVisualInspection"
-moduleVisualInspection = "itkdb_gtk:moduleVisualInspection"
+visualInspection = "itkdb_gtk:visualInspection"
 
 [tool.setuptools]
 include-package-data = true

itkdb_gtk-0.10.10.dev6/test/testRange.py

@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+"""Tests the range parser."""
+def range_to_list(V):
+    """Convert a range to a list.
+
+        ch1-ch2 or ch1:ch2 -> [ch1, ch1+1, ch1+2, ..., ch2] or
+        ch1:step:ch2 -> [ch1, ch1+sep, ch1+2*step, ..., ch2]
+    """
+    nfound = 0
+    for c in "-:,":
+        if c in V:
+            nfound += 1
+            break
+
+    if nfound == 0:
+        return [V]
+
+    out = []
+    values = V.split(',')
+    for V in values:
+        if '-' in V:
+            endpoints = list(map(int, V.split('-')))
+            endpoints.sort()
+            for i in range(endpoints[0], endpoints[1]+1):
+                out.append(str(i))
+        elif ':' in V:
+            endpoints = list(map(int, V.split(':')))
+            if len(endpoints) == 2:
+                endpoints.sort()
+                for i in range(endpoints[0], endpoints[1]+1):
+                    out.append(str(i))
+
+            elif len(endpoints) == 3:
+                for i in range(endpoints[0], endpoints[2]+1, endpoints[1]):
+                    out.append(str(i))
+
+            else:
+                print("Wring range specification. {}".format(V))
+                continue
+
+        else:
+            out.append(V)
+
+    return out
+
+def main():
+    r = "1-5"
+    print(r, range_to_list(r))
+
+    r = "1:5"
+    print(r, range_to_list(r))
+
+    r = "1:2:12"
+    print(r, range_to_list(r))
+
+
+if __name__ == "__main__":
+    main()

itkdb_gtk-0.10.10.dev6/test/testThread.py

@@ -0,0 +1,18 @@
+import threading
+
+
+class Test:
+    def __init__(self):
+        self.a = "a"
+        self.T = threading.Thread(target=self.my_method, args=["zzz"])
+        
+    def my_method(self, x):
+        print("Hole: {}".format(x))
+        
+    def start(self):
+        self.T.start()
+        
+
+T = Test()
+T.start()
+