itkdb-gtk 0.10.0.dev2__tar.gz → 0.10.2__tar.gz

{itkdb_gtk-0.10.0.dev2 → itkdb_gtk-0.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.0.dev2
+Version: 0.10.2
 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.0.dev2 → itkdb_gtk-0.10.2}/itkdb_gtk/GetShipments.py

@@ -43,7 +43,7 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         global gtk_runs
         if gtk_runs:
             super().__init__(session=session, title="Upload AVS Data",
-                             show_search="Cliick to search shipments",
+                             show_search="Click to search shipments",
                              gtk_runs=gtk_runs, help=help)
 
             self.init_window()

{itkdb_gtk-0.10.0.dev2 → itkdb_gtk-0.10.2}/itkdb_gtk/UploadTest.py

@@ -331,7 +331,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         self.find_attachments()
         self.find_comments()
         self.find_defects()
-        
+
         self.entrySN.set_text(self.data["component"] if self.data["component"] else "")
         self.entryTest.set_text(self.data["testType"])
         self.comments = self.data.get("comments", [])
@@ -365,7 +365,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
                         continue
                 else:
                     the_path = Path(A["path"]).expanduser().resolve()
-                    
+
                 self.attachments.append(ITkDButils.Attachment(the_path, A["title"], A["description"]))
 
         if len(self.attachments) > 0:
@@ -390,7 +390,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         if "comments" in self.data:
             for C in self.data["comments"]:
                 self.comments.append(C)
-                
+
         if len(self.comments) > 0:
             self.btn_comments.set_label("Comments ({})".format(len(self.comments)))
 
@@ -414,7 +414,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         if "defects" in self.data:
             for D in self.data["defects"]:
                 self.defects.append(D)
-                
+
         if len(self.defects) > 0:
             self.btn_defects.set_label("Defects ({})".format(len(self.defects)))
 
@@ -443,7 +443,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
 
         self.data["comments"] = self.comments
         self.data["defects"] = self.defects
-            
+
         rc = ITkDButils.upload_test(self.session, self.data, self.attachments)
         if rc:
             ipos = rc.find("The following details may help:")

{itkdb_gtk-0.10.0.dev2 → itkdb_gtk-0.10.2}/itkdb_gtk/WireBondGui.py

@@ -13,8 +13,11 @@ try:
 
 except ImportError:
     from pathlib import Path
-    cwd = Path(sys.argv[0]).parent.parent
+    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
@@ -410,24 +413,24 @@ def get_module_param(SN):
     return param
 
 
-class WireBond(Gtk.Window):
+class WireBond(dbGtkUtils.ITkDBWindow):
     """Main window."""
 
-    def __init__(self, session=None, title=""):
+    def __init__(self, session, title="", help=__HELP_LINK__):
         """Initialization."""
-        super().__init__(title=title)
+        super().__init__(title=title, session=session, help=help)
         self.pdb = None
-        self.session = session
         self.models = {}
         self.holes = {}
-        self.prepare_window()
+        self.institute = "IFIC"
+        self.inst_combo = None
+        self.module_SN = None
+        self.alternativeID = None
+        self.init_window()
 
-    def prepare_window(self):
+    def init_window(self):
         """Creates the GUI."""
-        self.hb = Gtk.HeaderBar()
-        self.hb.set_show_close_button(True)
         self.hb.props.title = "Wire Bond"
-        self.set_titlebar(self.hb)
 
         # Button to upload
         button = Gtk.Button()
@@ -455,31 +458,41 @@ class WireBond(Gtk.Window):
         button.connect("clicked", self.read_file)
         self.hb.pack_end(button)
 
-        # Create the main box and add it to the window
-        self.mainBox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.mainBox.set_property("margin-left", 6)
-        self.mainBox.set_property("margin-right", 6)
-        self.add(self.mainBox)
-
         # Data panel
         grid = Gtk.Grid(column_spacing=5, row_spacing=1)
+        
+        # The shipment receiver
+        institute = self.create_institute_combo()
+        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)
+        grid.attach(institute, 1, 0, 1, 1)
+        self.inst_combo = institute
+        
+        
         for i, tit in enumerate(["Operator", "Bond Machine", "Wire Batch", "SN", "Date"]):
             lbl = Gtk.Label(label=tit)
             lbl.set_xalign(0)
-            grid.attach(lbl, 0, i, 1, 1)
+            grid.attach(lbl, 0, i+1, 1, 1)
 
         self.operator = dbGtkUtils.new_small_text_entry()
         self.machine = dbGtkUtils.new_small_text_entry()
         self.batch = dbGtkUtils.new_small_text_entry()
-        self.SN = 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.connect("text_changed", self.new_date)
 
-        grid.attach(self.operator,      1, 0, 1, 1)
-        grid.attach(self.machine,       1, 1, 1, 1)
-        grid.attach(self.batch,         1, 2, 1, 1)
-        grid.attach(self.SN,            1, 3, 1, 1)
-        grid.attach(self.date.widget,   1, 4, 1, 1)
+        grid.attach(self.operator,      1, 1, 1, 1)
+        grid.attach(self.machine,       1, 2, 1, 1)
+        grid.attach(self.batch,         1, 3, 1, 1)
+        grid.attach(self.SN.entry,      1, 4, 1, 1)
+        grid.attach(self.date.widget,   1, 5, 1, 1)
 
         self.mainBox.pack_start(grid, True, True, 0)
 
@@ -504,19 +517,28 @@ class WireBond(Gtk.Window):
         #
         # The text view and buffer
         #
-        self.message_panel = dbGtkUtils.MessagePanel(size=100)
         self.mainBox.pack_start(self.message_panel.frame, True, True, 0)
         self.write_message("wirebond GUI\n")
 
-        # The button box
-        btnBox = Gtk.ButtonBox(orientation=Gtk.Orientation.HORIZONTAL)
+    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:
+            return None
+
 
-        btn = Gtk.Button(label="Quit")
-        btn.connect("clicked", self.quit)
-        btnBox.add(btn)
+        obj = itkdb_gtk.ITkDButils.get_DB_component(self.session, value)
+        if obj is not None:
+            entry.set_text(obj["serialNumber"])
+            self.alternativeID = obj["alternativeIdentifier"]
 
-        self.mainBox.pack_end(btnBox, False, True, 0)
-        self.show_all()
+        else:
+            itkdb_gtk.dbGtkUtils.complain("Invalid SN", value)
 
     def on_name_combo_changed(self, combo):
         """Change model in TreeView."""
@@ -627,13 +649,13 @@ class WireBond(Gtk.Window):
         self.hide()
         self.destroy()
 
-    def write_message(self, text):
-        """Writes text to Text Viewer."""
-        self.message_panel.write_message(text)
-
     def compute_unconnected(self):
         """Compute number of unconnected."""
-        param = get_module_param(self.SN.get_text())
+        try:
+            param = get_module_param(self.SN.get_text())
+        except ValueError as E:
+            dbGtkUtils.complain("Wrong SN number", str(E))
+            
         M = ModuleHoles(param=param)
 
         for test in test_parameters.values():
@@ -728,6 +750,7 @@ class WireBond(Gtk.Window):
 
     def parse(self, data):
         """Parses a JSon dictionary."""
+        dbGtkUtils.set_combo_iter(self.inst_combo, data["institution"])
         self.operator.set_text(data["properties"]["OPERATOR"])
         self.machine.set_text(data["properties"]["BOND_MACHINE"])
         self.batch.set_text(data["properties"]["BONDWIRE_BATCH"])
@@ -775,7 +798,7 @@ class WireBond(Gtk.Window):
         if response == Gtk.ResponseType.OK:
             ofile = dialog.get_filename()
             data = self.get_test_data()
-            with open(ofile, 'w') as of:
+            with open(ofile, 'w', encoding="UTF-8") as of:
                 json.dump(data, of, indent=3)
 
         dialog.hide()
@@ -784,6 +807,7 @@ class WireBond(Gtk.Window):
     def get_test_data(self):
         """Get the test data."""
         data = {
+            "institution": self.institute,
             "date": ITkDButils.get_db_date(),
             "properties": {},
             "results": {},
@@ -805,21 +829,27 @@ class WireBond(Gtk.Window):
             SN = dbGtkUtils.get_a_value("Module Serial Number",
                                         "Module serial Number is missing")
 
-        if len(operator) == 0 or len(machine) == 0 or len(batch) == 0:
+        if len(operator) == 0 or len(machine) == 0:
             values = dbGtkUtils.get_a_list_of_values(
                 "Missing Values",
-                ["SN", "Operator", "Wire Bonder", "Wire Batch"],
-                defaults=[SN, operator, machine, batch],
+                ["SN", "Operator", "Wire Bonder"],
+                defaults=[SN, operator, machine],
             )
             if len(values) == 4:
-                SN, operator, machine, batch = values
+                SN, operator, machine = values
             else:
-                self.write_message("Something went wrong whilerequesting missing information.")
+                self.write_message("Something went wrong while requesting missing information.")
 
         data["component"] = SN
         data["properties"]["OPERATOR"] = operator
         data["properties"]["BOND_MACHINE"] = machine
         data["properties"]["BONDWIRE_BATCH"] = batch
+        data["institution"] = self.institute
+        if data["runNumber"] == "-1":
+            data["runNumber"] = "1"
+            
+        data["date"] = self.date.get_text()
+
 
 
     def upload_test(self, *args):
@@ -835,7 +865,7 @@ class WireBond(Gtk.Window):
                 self.session = client
 
         defaults = {
-            "institution": "IFIC",
+            "institution": self.institute,
             "runNumber": "1",
             "date":  ITkDButils.get_db_date()
         }
@@ -851,14 +881,26 @@ class WireBond(Gtk.Window):
 
 def main():
     """Main entry."""
-    win = WireBond(title="WireBond")
+    dlg = ITkDBlogin.ITkDBlogin()
+    client = dlg.get_client()
+    if client is None:
+        print("Could not connect to DB with provided credentials.")
+        dlg.die()
+        sys.exit()
+
+    client.user_gui = dlg
+
+    
+    win = WireBond(client, title="WireBond")
     win.connect("destroy", Gtk.main_quit)
+    win.show_all()
     try:
         Gtk.main()
 
     except KeyboardInterrupt:
         print("Arrrgggg!!!")
 
-
+    dlg.die()
+    
 if __name__ == "__main__":
     main()

{itkdb_gtk-0.10.0.dev2 → itkdb_gtk-0.10.2}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.0.dev2"
+__version__ = "0.10.2"
 
 
 def dash_board():

{itkdb_gtk-0.10.0.dev2 → itkdb_gtk-0.10.2}/itkdb_gtk/dashBoard.py

@@ -7,7 +7,7 @@ try:
     
 except ImportError:
     from pathlib import Path
-    cwd = Path(sys.argv[0]).parent.parent
+    cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
     
     
@@ -22,6 +22,15 @@ from itkdb_gtk import GlueWeight
 from itkdb_gtk import UploadModuleIV
 from itkdb_gtk import WireBondGui
 
+
+HAS_PETALQC=False
+try:
+    from petal_qc.metrology.coreMetrology import CoreMetrology, CoreMetrologyOptions
+    HAS_PETALQC = True
+except ImportError as E:
+    HAS_PETALQC = False
+    
+
 import gi
 
 gi.require_version("Gtk", "3.0")
@@ -39,6 +48,8 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
     GLUE_WEIGHT = 6
     MOD_IV = 7
     WIRE_BOND = 8
+    PETAL_CORE_METRO=9
+    PETAL_CORE_THERMAL=10
     
     def __init__(self, session):
         """Initialization."""
@@ -88,7 +99,12 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         btnWireBond = Gtk.Button(label="Wire Bond")
         btnWireBond.connect("clicked", self.wire_bond)
         grid.attach(btnWireBond, 1, irow, 1, 1)
-
+        
+        if HAS_PETALQC:
+            irow +=1
+            btnPetalMetrology = Gtk.Button(label="Petal Core Metrology")
+            btnPetalMetrology.connect("clicked", self.petal_metrology)
+            grid.attach(btnPetalMetrology, 0, irow, 1, 1)
 
 
         irow += 1
@@ -200,6 +216,24 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         self.mask |= bt
         W = WireBondGui.WireBond(session=self.session, title="Wirebond", help=HELP_LINK)
         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:
+            return
+
+        self.mask |= bt
+        opts = CoreMetrologyOptions()
+        W = CoreMetrology(opts, session=self.session, title="Petal Core Metrology")
+        W.connect("destroy", self.app_closed, bitn)
+        W.show_all()
+        
 
     def app_closed(self, *args):
         """Application window closed. Clear mask."""

{itkdb_gtk-0.10.0.dev2 → itkdb_gtk-0.10.2}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.0.dev2
+Version: 0.10.2
 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.0.dev2 → itkdb_gtk-0.10.2}/pyproject.toml

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