itkdb-gtk 0.10.7__tar.gz → 0.10.9.dev1__tar.gz

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.7
+Version: 0.10.9.dev1
 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.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/CreateShipments.py

@@ -28,7 +28,7 @@ gtk_runs, gtk_args = Gtk.init_check()
 class CreateShipments(dbGtkUtils.ITkDBWindow):
     """Create a shipment from input."""
 
-    def __init__(self, session):
+    def __init__(self, session, help=None):
         """Initialization.
 
         Args:
@@ -41,7 +41,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         self.attachment = None
         global gtk_runs
         if gtk_runs:
-            super().__init__(session=session, title="Upload AVS Data", gtk_runs=gtk_runs)
+            super().__init__(session=session, title="Upload AVS Data", help=help, gtk_runs=gtk_runs)
             self.init_window()
 
     def init_window(self):
@@ -193,10 +193,14 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
                     dbGtkUtils.complain("Item {} is already in transit".format(SN),
                                         "This item is already in transit to {}".format(rc['shipmentDestination']['code']))
                     return
+                
                 nick = rc['alternativeIdentifier']
                 id = rc['id']
                 obj = rc['componentType']['name']
                 loc = rc['currentLocation']['code']
+                serialN = rc['serialNumber']
+                if serialN is None:
+                    serialN = id
 
                 # Check tha tthe input is not already there
                 model = self.tree.get_model()
@@ -210,7 +214,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
                     iter = model.iter_next(iter)
 
                 # Add the item in the liststore.
-                model.append([SN, nick, obj, loc, id])
+                model.append([serialN, nick, obj, loc, id])
 
             except Exception:
                 dbGtkUtils.complain("Error querying DB",

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/ITkDBlogin.py

@@ -306,12 +306,12 @@ class ITkDBlogin(Gtk.Dialog):
             #     token_file.write(json.dumps(self.token))
             self.hide()
 
-    def get_client(self):
+    def get_client(self, use_eos=True):
         """Return the client."""
         if not self.is_connected():
             return None
 
-        return itkdb.Client(user=self.user)
+        return itkdb.Client(user=self.user, use_eos=use_eos)
 
     def __del__(self):
         """Delete."""

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/ITkDButils.py

@@ -3,8 +3,10 @@ import mimetypes
 from collections.abc import Iterable
 from datetime import datetime
 from pathlib import Path
+import getpass
 
 import dateutil.parser
+import itkdb
 
 # The response of the DB
 db_response = ""
@@ -281,6 +283,7 @@ def upload_test(client, data, attachments=None):
                 db_response = client.post('createTestRunAttachment',
                                           data=data,
                                           files=attachment)
+                
 
         return None
 
@@ -453,7 +456,7 @@ def get_testrun(session, test_id, out_type="object"):
         return None
 
 
-def get_test_skeleton(session, component, test_code, userdef={}, uservalues={}):
+def get_test_skeleton(session, component, test_code, userdef=None, uservalues=None):
     """Get the skeleton of the given test.
 
     Args:
@@ -465,6 +468,13 @@ def get_test_skeleton(session, component, test_code, userdef={}, uservalues={}):
 
     """
     global db_response
+
+    if userdef is None:
+        userdef = {}
+
+    if uservalues is None:
+        uservalues = {}
+
     defvalues = {
         "string": "",
         "integer": -9999,
@@ -550,3 +560,12 @@ def get_test_skeleton(session, component, test_code, userdef={}, uservalues={}):
             skltn['results'][key] = get_default(par)
 
     return skltn
+
+def create_client():
+    """Create a Client."""
+    client = itkdb.Client()
+    client.user._access_code1 = getpass.getpass("Access 1: ")
+    client.user._access_code2 = getpass.getpass("Access 2: ")
+    client.user.authenticate()
+    print("Hello {} !".format(client.user.name))
+    return client

itkdb_gtk-0.10.9.dev1/itkdb_gtk/PanelVisualInspection.py

@@ -0,0 +1,405 @@
+#!/usr/bin/env python3
+"""PB/Hybrid panel Visual inspection GUI.."""
+import json
+import sys
+import copy
+from pathlib import Path
+
+try:
+    import itkdb_gtk
+
+except ImportError:
+    cwd = Path(__file__).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk.ShowComments import ShowComments
+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"
+
+class TestJson(GObject.Object):
+    """To store test JSOn."""
+    __gtype_name__ = "TestJson"
+
+    def __init__(self, js=None):
+        super().__init__()
+        self.js = copy.deepcopy(js)
+
+    def set_js(self, js):
+        """SEts the dictionary"""
+        self.js = copy.deepcopy(js)
+
+
+class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
+    """PB/Hybryd panel visual inspection GUI."""
+    SN, PASSED, F_NAME, F_PATH, TEST_J, ALL = range(6)
+
+    def __init__(self, session, title="PanelVisualInspection", help=HELP_LINK):
+        super().__init__(title="ITkDB Dashboard",
+                         session=session,
+                         show_search="Find object with given SN.",
+                         help=help)
+
+        self.institute = "IFIC"
+        # action button in header
+        button = Gtk.Button()
+        icon = Gio.ThemedIcon(name="document-send-symbolic")
+        image = Gtk.Image.new_from_gicon(icon, Gtk.IconSize.BUTTON)
+        button.add(image)
+        button.set_tooltip_text("Click to upload ALL tests.")
+        button.connect("clicked", self.upload_tests)
+        self.hb.pack_end(button)
+
+        grid = Gtk.Grid(column_spacing=5, row_spacing=1)
+        self.mainBox.pack_start(grid, False, False, 5)
+
+        irow = 0
+        receiver = self.create_institute_combo()
+        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)
+        grid.attach(receiver, 1, irow, 1, 1)
+
+        irow += 1
+        lbl = Gtk.Label(label="Serial Number")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, irow, 1, 1)
+
+        self.SN = dbGtkUtils.TextEntry(small=True)
+        self.SN.connect("text_changed", self.SN_ready)
+        self.SN.widget.set_tooltip_text("Enter SN of PWD or Hybrid panel.")
+        grid.attach(self.SN.widget, 1, irow, 1, 1)
+
+        self.panel_type = Gtk.Label(label="")
+        grid.attach(self.panel_type, 2, irow, 1, 1)
+
+        irow += 1
+        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)
+
+        # Paned object
+        paned = Gtk.Paned(orientation=Gtk.Orientation.VERTICAL)
+        paned.set_size_request(-1, 200)
+        self.mainBox.pack_start(paned, True, True, 5)
+
+        # the list of attachments
+        tree_view = self.create_tree_view()
+        paned.add1(tree_view)
+
+        # The text view
+        paned.add2(self.message_panel.frame)
+
+
+        self.show_all()
+
+        dbGtkUtils.setup_scanner(self.get_qrcode)
+
+    def on_institute(self, combo):
+        """A new recipient has been chosen."""
+        name = self.get_institute_from_combo(combo)
+        if name:
+            self.institute = name
+
+    def new_date(self, entry, value):
+        """new date given at input."""
+        d = dbGtkUtils.parse_date_as_string(value)
+        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)
+
+    def create_tree_view(self, size=150):
+        """Create the TreeView with the children."""
+        model = self.create_model()
+        self.tree = Gtk.TreeView(model=model)
+        self.tree.connect("button-press-event", self.button_pressed)
+
+        scrolled = Gtk.ScrolledWindow()
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        scrolled.add(self.tree)
+        scrolled.set_size_request(-1, size)
+
+        renderer = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn("SN", renderer, text=PanelVisualInspection.SN)
+        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()
+        renderer.set_alignment(0, y)
+        # renderer.set_property("inconsistent", True)
+        renderer.connect("toggled", self.btn_toggled)
+
+        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)
+        self.tree.append_column(column)
+
+
+        return scrolled
+
+    def btn_toggled(self, renderer, path, *args):
+        """Toggled."""
+        model = self.tree.get_model()
+        val = not model[path][PanelVisualInspection.PASSED]
+        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
+
+        # Create popup menu
+        select = self.tree.get_selection()
+        model, iter = select.get_selected()
+        values = None
+        if iter:
+            values = model[iter]
+
+        if not iter:
+            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]
+
+        if not values:
+            return
+
+        menu = Gtk.Menu()
+
+        item_show = Gtk.MenuItem(label="Upload Image")
+        item_show.connect("activate", self.on_upload_image, (model, 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))
+        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))
+        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))
+        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
+
+            if len(ifiles) > 1:
+                dbGtkUtils.complain("More than one file selected","Choosing first.")
+
+            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)
+
+
+        self.write_message("Upload image\n")
+
+
+    def on_show_json(self, item, data):
+        """Test JSon."""
+        model, 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))
+
+        dlg.hide()
+        dlg.destroy()
+
+    def on_show_comments(self, item, data):
+        """Show comments"""
+        model, 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))
+
+        SC.hide()
+        SC.destroy()
+
+    def on_show_defects(self, item, data):
+        """Show comments"""
+        model, 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))
+
+        SD.hide()
+        SD.destroy()
+
+    def SN_ready(self, *args):
+        """SN is ready in the TextEnttry."""
+        SN = self.SN.get_text()
+        # GEt children.
+        panel = ITkDButils.get_DB_component(self.session, SN)
+        if panel is None:
+            self.write_message(ITkDButils.get_db_response())
+            return
+
+        SN = panel["serialNumber"]
+        args[0].set_text(SN)
+        is_PWB = False
+        defaults = {
+            "institution": self.institute,
+            "runNumber": "1",
+            "date": self.date.get_text()
+        }
+        component_type = None
+        test_code = None
+        if "USED" in SN:
+            # Powerboard Carrier
+            if not SN[6].isdigit():
+                dbGtkUtils.complain("Not a Powerboard Carrier",
+                                    "{}: wrong SN for a powerboard carrier".format(SN))
+                self.SN.widget.set_text("")
+                return
+
+            self.panel_type.set_text("PWB carrier")
+            is_PWB = True
+            component_type = "PWB"
+            test_code = "PICTURE"
+
+        elif "USET" in SN:
+            # Hybrid test panel
+            component_type = "HYBRID_TEST_PANEL"
+            test_code = "VISUAL_INSPECTION_RECEPTION"
+
+            if not SN[6].isdigit or int(SN[6])>5:
+                dbGtkUtils.complain("Not a Hybrid Test Panel",
+                                    "{}: wrong SN for a hybrid test panel".format(SN))
+                self.SN.widget.set_text("")
+                return
+
+            self.panel_type.set_text("HYB test panel")
+
+        else:
+            dbGtkUtils.complain("Invalid SN.",
+                "{}\nNot a PWB carrier not HYB test panel.".format(SN))
+            self.SN.widget.set_text("")
+            return
+
+        # GEt children.
+        skltn = ITkDButils.get_test_skeleton(self.session, component_type, test_code, defaults)
+        model = self.create_model()
+        for child in panel["children"]:
+            if child["component"] is not None:
+                child_SN = child["component"]["serialNumber"]
+                skltn["component"] = child_SN
+                model.append([child_SN, True, "", "", TestJson(skltn)])
+
+        self.tree.set_model(model)
+
+
+    def upload_tests(self, *args):
+        """Upload the current test."""
+        SN = self.SN.get_text()
+
+        model = self.tree.get_model()
+        iter = model.get_iter_first()
+        n_items = 0
+        while iter:
+            values = model[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)
+            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)
+
+            else:
+                self.write_message("Upload {}-{} successfull\n".format(payload["component"], payload["testType"]))
+
+            n_items += 1
+            iter = model.iter_next(iter)
+
+
+    def get_qrcode(self, fd, state, reader):
+        """Read SN from scanner."""
+        txt = dbGtkUtils.scanner_get_line(reader)
+        self.write_message("SN: {}\n".format(txt))
+        self.SN_ready(txt, self.SN.widget)
+
+
+def main():
+    """Main entry."""
+    # DB login
+    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
+
+    gTest = PanelVisualInspection(client)
+
+    gTest.present()
+    gTest.connect("destroy", Gtk.main_quit)
+    try:
+        Gtk.main()
+
+    except KeyboardInterrupt:
+        print("Arrrgggg!!!")
+
+    dlg.die()
+
+if __name__ == "__main__":
+    main()

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/PetalReceptionTests.py

@@ -1,15 +1,16 @@
 #!/usr/bin/env python3
 """Test dashboard."""
-import json
 import sys
+import copy
+from pathlib import Path
 
 try:
     import itkdb_gtk
-    
+
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
+    import itkdb_gtk
 
 from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
 
@@ -66,7 +67,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
 
         self.SN = itkdb_gtk.dbGtkUtils.TextEntry()
         self.SN.connect("text-changed", self.on_SN_changed)
-        
+
         #self.SN = Gtk.Entry()
         #self.SN.connect("focus-in-event", self.on_sn_enter)
         #self.SN.connect("focus-out-event", self.on_sn_leave)
@@ -107,6 +108,8 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         self.create_test_box("Visual Inspection", "VISUAL_INSPECTION")
         self.create_test_box("Grounding", "GROUNDING_CHECK")
         self.create_test_box("Pipe bending", "BENDING120")
+        self.create_test_box("X-rays", "XRAYIMAGING")
+
 
         # The text view
         self.mainBox.pack_end(self.message_panel.frame, True, True, 5)
@@ -117,7 +120,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         """New SN given. Ask in PDB,"""
         if len(value) <= 0:
             return None
-        
+
         self.query_db()
         current_location = self.dbObject["currentLocation"]["code"]
         dbGtkUtils.set_combo_iter(self.inst_cmb, current_location, 0)
@@ -134,7 +137,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         for i in range(npages):
             page = self.notebook.get_nth_page(i)
             page.dict_dialog.factory_reset()
-        
+
 
     def create_test_box(self, label, test_name, institute="IFIC"):
         """Create and add to notebook a test dialog.
@@ -213,6 +216,27 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
                 page.dict_dialog.values["institution"] = self.institute
                 page.dict_dialog.refresh()
 
+    def upload_this_test(self, values):
+        """Upload a single test."""
+        # print(json.dumps(values, indent=2))
+
+        attachments = []
+        if values["testType"] == "XRAYIMAGING":
+            fnam = values["results"]["IMAGELINK"]
+            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")
+                    values["results"]["IMAGELINK"] = P.name
+                    attachments.append(A)
+
+        rc = ITkDButils.upload_test(self.session, values, attachments=attachments)
+        if rc is not None:
+            dbGtkUtils.complain("Could not upload test", rc)
+
+        else:
+            self.write_message("Test uploaded. {} - {}\n".format(values["component"], values["testType"]))
+
     def upload_single_test(self, *args):
         """Upload the current test."""
         SN = self.SN.get_text()
@@ -225,16 +249,9 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         if dctD is None:
             return
 
-        values = dctD.values
+        values = copy.deepcopy(dctD.values)
         values["component"] = SN
-        # print(json.dumps(values, indent=2))
-        rc = ITkDButils.upload_test(self.session, values)
-        if rc is not None:
-            dbGtkUtils.complain("Could not upload test", rc)
-
-        else:
-            dbGtkUtils.ask_for_confirmation("Test uploaded.",
-                                            "{} - {}".format(values["component"], values["testType"]))
+        self.upload_this_test(values)
 
     def upload_tests(self, *args):
         """Upload the current test."""
@@ -251,14 +268,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
 
             values = dctD.values
             values["component"] = SN
-            # print(json.dumps(values, indent=2))
-            rc = ITkDButils.upload_test(self.session, values)
-            if rc is not None:
-                dbGtkUtils.complain("Could not upload test", rc)
-
-            else:
-                self.write_message("Test uploaded. {} - {}\n".format(values["component"], values["testType"]))
-
+            self.upload_this_test(values)
 
 def main():
     """Main entry."""

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/UploadMultipleTests.py

@@ -469,7 +469,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
                             if path.exists():
                                 path = path.expanduser().resolve()
                             else:
-                                path = folder / path
+                                path = folder / path.name
 
                             if path.exists():
                                 attachments.append(ITkDButils.Attachment(path, att["title"], att["description"]))

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/WireBondGui.py

@@ -486,6 +486,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
         
         self.date = dbGtkUtils.TextEntry(small=True)
+        self.date.entry.set_text(ITkDButils.get_db_date())
         self.date.connect("text_changed", self.new_date)
 
         grid.attach(self.operator,      1, 1, 1, 1)

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.7"
+__version__ = "0.10.9.dev1"
 
 
 def dash_board():
@@ -57,3 +57,8 @@ 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()

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/dashBoard.py

@@ -21,6 +21,7 @@ from itkdb_gtk import UploadMultipleTests
 from itkdb_gtk import GlueWeight
 from itkdb_gtk import UploadModuleIV
 from itkdb_gtk import WireBondGui
+from itkdb_gtk import PanelVisualInspection
 
 
 HAS_PETALQC=False
@@ -51,8 +52,10 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
     GLUE_WEIGHT = 6
     MOD_IV = 7
     WIRE_BOND = 8
-    PETAL_CORE_METRO=9
-    PETAL_CORE_THERMAL=10
+    PANEL_VI = 9
+    PETAL_CORE_METRO = 10
+    PETAL_CORE_THERMAL = 11
+    
 
     def __init__(self, session):
         """Initialization."""
@@ -102,6 +105,12 @@ 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)
+        grid.attach(btnModIV, 0, irow, 1, 1)
+
 
         if HAS_PETALQC:
             irow +=1
@@ -225,6 +234,19 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
 
+    def panel_VI(self, *args):
+        """Panel VI tests."""
+        bitn = DashWindow.PANEL_VI
+        bt = 1 << bitn
+        if self.mask & bt:
+            return
+
+        self.mask |= bt
+        W = PanelVisualInspection.PanelVisualInspection(session=self.session, title="Panel Visual Inspection", 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:

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk/dbGtkUtils.py

@@ -69,6 +69,10 @@ def parse_date_as_string(txt):
 def is_a_date(txt):
     """check tha the input string is a date."""
     try:
+        tl = txt.lower()
+        if len(txt)<5 and (tl!="now" and tl!="today"):
+            return False
+
         dateutil.parser.parse(txt, fuzzy=False)
         return True
 
@@ -94,7 +98,7 @@ def set_entry_style(container):
     css = "{} {{ min-height: {}px; }}".format(container.get_name(), font_size)
     provider.load_from_data(css.encode())
     style_context.add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_SETTINGS)
-    return container    
+    return container
 
 def set_button_color(btn, bg_color, fg_color="white"):
     """Set button color"""
@@ -103,7 +107,7 @@ def set_button_color(btn, bg_color, fg_color="white"):
     provider.load_from_data(css.encode())
     style_context = btn.get_style_context()
     style_context.add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
-    
+
 def set_combo_iter(combo, txt, col=0):
     """Set scombo active iter to that containing txt in column col."""
     model = combo.get_model()
@@ -247,7 +251,7 @@ class TextEntry(GObject.GObject):
                 self.widget = new_small_text_entry()
             else:
                 self.widget = Gtk.Entry()
-                
+
             self.widget.connect("focus-in-event", self.on_enter)
             self.widget.connect("focus-out-event", self.on_leave)
 
@@ -480,7 +484,7 @@ class MessagePanel(object):
 
         self.textbuffer.insert(end, msg)
         GLib.idle_add(self.scroll_to_end)
-        
+
     def write(self, txt):
         """A write method."""
         self.write_message(txt, write_date=False)
@@ -533,7 +537,7 @@ class ITkDBWindow(Gtk.Window):
             button.set_tooltip_text(show_search)
             button.connect("clicked", self.query_db)
             self.hb.pack_end(button)
-            
+
         if self.help:
             button = Gtk.Button()
             icon = Gio.ThemedIcon(name="help-browser-symbolic")
@@ -541,7 +545,7 @@ class ITkDBWindow(Gtk.Window):
             button.add(image)
             button.connect("clicked", self.show_help)
             self.hb.pack_end(button)
-            
+
 
         # Create main content box
         self.mainBox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
@@ -570,7 +574,7 @@ class ITkDBWindow(Gtk.Window):
     def show_help(self, *args):
         """Show help"""
         webbrowser.open(self.help)
-    
+
     def query_db(self, *args):
         """Search button clicked."""
         pass
@@ -580,7 +584,7 @@ class ITkDBWindow(Gtk.Window):
         if msg == "<OK>":
             if hasattr(self.session, "user_gui"):
                 self.session = self.session.user_gui.get_client()
-                
+
             if self.userLabel.get_child():
                 self.userLabel.get_child().set_text(self.session.user.name)
 
@@ -725,7 +729,7 @@ class DictDialog(Gtk.Grid):
             else:
                 if itm[last_key] is None:
                     itm[last_key] = txt
-                else:    
+                else:
                     tp = type(itm[last_key])
                     itm[last_key] = tp(txt)
 
@@ -765,6 +769,7 @@ class DictDialog(Gtk.Grid):
             css = "entry {{ min-height: {}px; }}".format(font_size)
             provider.load_from_data(css.encode())
             style_context.add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_SETTINGS)
+            container.connect("populate-popup", self.add_insert_path)
 
             if name:
                 container.set_name(name)
@@ -775,6 +780,28 @@ class DictDialog(Gtk.Grid):
 
         return container
 
+    def add_insert_path(self, entry, menu, *args):
+        """Adds a new item in the pop-up menu."""
+        item = Gtk.MenuItem(label="Get file path")
+        item.connect("activate", self.on_set_path, entry)
+        menu.append(item)
+        menu.show_all()
+
+    def on_set_path(self, menu_item, entry):
+        """Sets the path to the entry."""
+        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
+            if len(ifiles) > 1:
+                complain("More than one file selected","Choosing first.")
+
+            fnam = ifiles[0]
+            entry.set_text(fnam)
+            self.on_leave(entry, None, None, entry.get_name())
+
     def set_value(self, key, value):
         """Set value of a container and key."""
         try:
@@ -815,7 +842,7 @@ class DictDialog(Gtk.Grid):
         self.show_values()
         self.show_all()
         self.queue_draw()
-        
+
     @staticmethod
     def create_json_data_editor(data):
         """Create a dialog to show the JSon file."""
@@ -835,7 +862,7 @@ class DictDialog(Gtk.Grid):
         rc = dlg.run()
         dlg.hide()
         dlg.destroy()
-        
+
         return value.values, rc
 
 
@@ -844,7 +871,7 @@ def create_scrolled_dictdialog(the_dict, hidden=("component", "testType")):
 
     Args:
         the_dict: the input dictionary with values.
-        
+
     Returns:
         scrolled: the scrolled window
         gM: the DictDialog

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk.egg-info/PKG-INFO

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

@@ -32,4 +32,5 @@ itkdb_gtk.egg-info/requires.txt
 itkdb_gtk.egg-info/top_level.txt
 test/testAnimated.py
 test/testComponent.py
+test/test_attachment.py
 test/test_holes.py

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/itkdb_gtk.egg-info/entry_points.txt

@@ -3,6 +3,7 @@ createShipments = itkdb_gtk:createShipments
 getShipments = itkdb_gtk:getShipments
 glueWeight = itkdb_gtk:glueWeight
 itkdb_dashBoard = itkdb_gtk:dash_board
+panelVisualInspection = itkdb_gtk:panelVisualInspection
 petalReceptionTests = itkdb_gtk:petalReceptionTests
 uploadModuleIV = itkdb_gtk:uploadModuleIV
 uploadMultipleTests = itkdb_gtk:uploadMultipleTests

{itkdb_gtk-0.10.7 → itkdb_gtk-0.10.9.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.10.7"
+version = "0.10.9.dev1"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]
@@ -37,6 +37,7 @@ uploadMultipleTests = "itkdb_gtk:uploadMultipleTests"
 uploadModuleIV = "itkdb_gtk:uploadModuleIV"
 wirebondTest = "itkdb_gtk:wirebondTest"
 uploadPetalInformation = "itkdb_gtk:uploadPetalInformation"
+panelVisualInspection = "itkdb_gtk:panelVisualInspection"
 
 [tool.setuptools]
 include-package-data = true

itkdb_gtk-0.10.9.dev1/test/test_attachment.py

@@ -0,0 +1,70 @@
+#!/usr/bine/env python3
+"""test big attachments."""
+
+import json
+import sys
+from pathlib import Path
+import itkdb
+
+try:
+    import itkdb_gtk
+
+except ImportError:
+    cwd = Path(__file__).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from itkdb_gtk import ITkDBlogin, ITkDButils
+
+
+# DB login
+dlg = ITkDBlogin.ITkDBlogin()
+client = dlg.get_client(use_eos=True)
+if client is None:
+    print("Could not connect to DB with provided credentials.")
+    dlg.die()
+    sys.exit()
+
+client.user_gui = dlg
+
+ifile = Path("/Users/lacasta/Nextcloud/ITk/5-Petal_cores/PPC.007/Rx_PPC.007.png")
+core = ITkDButils.get_DB_component(client, "PPC.007")
+data = { "filterMap": { "serialNumber": core["serialNumber"], "testType":["XRAYIMAGING"]},
+}
+
+test_list = client.get("listTestRunsByComponent", json=data)
+ntest = 0
+for tst in test_list:
+    if tst['state'] == 'ready':
+        ntest += 1
+        
+if ntest == 0:
+    defaults = {
+        "institution": "IFIC",
+        "runNumber": "1",
+    }
+
+    tmp = ITkDButils.get_test_skeleton(client, "CORE_PETAL", "XRAYIMAGING", defaults)
+    tmp["component"] = core["serialNumber"]
+    tmp["properties"]["OPERATOR"] = "Nicolas Cespedosa"
+    tmp["properties"]["MACHINEID"] ="X-ray"
+    print(tmp)
+
+
+
+
+#client._use_eos = True 
+A = ITkDButils.Attachment(ifile.as_posix(),  
+                          "{} X-ray".format(core["alternativeIdentifier"]),
+                          "{} X-ray image".format(core["alternativeIdentifier"])
+                            )
+rc = ITkDButils.upload_test(client, data=tmp, attachments=[A])
+
+if rc:
+    ipos = rc.find("The following details may help:")
+    print(rc[ipos:])
+    
+else:
+    print("upload successful")
+    
+    
+dlg.die()

itkdb_gtk-0.10.7/itkdb_gtk/PanelVisualInspection.py

@@ -1,230 +0,0 @@
-#!/usr/bin/env python3
-"""PB/Hybrid panel Visual inspection GUI.."""
-import json
-import sys
-
-try:
-    import itkdb_gtk
-
-except ImportError:
-    from pathlib import Path
-    cwd = Path(__file__).parent.parent
-    sys.path.append(cwd.as_posix())
-
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
-
-import gi
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, Gio
-
-HELP_LINK="https://itkdb-gtk.docs.cern.ch"
-
-class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
-    """PB/Hybryd panel visual inspection GUI."""
-    SN, PASSED, ALL = range(3)
-
-    def __init__(self, session, help=HELP_LINK):
-        super().__init__(title="ITkDB Dashboard",
-                         session=session,
-                         show_search="Find object with given SN.",
-                         help=help)
-
-        # action button in header
-        button = Gtk.Button()
-        icon = Gio.ThemedIcon(name="document-send-symbolic")
-        image = Gtk.Image.new_from_gicon(icon, Gtk.IconSize.BUTTON)
-        button.add(image)
-        button.set_tooltip_text("Click to upload ALL tests.")
-        button.connect("clicked", self.upload_tests)
-        self.hb.pack_end(button)
-
-        grid = Gtk.Grid(column_spacing=5, row_spacing=1)
-        self.mainBox.pack_start(grid, False, False, 5)
-
-        lbl = Gtk.Label(label="Serial Number")
-        lbl.set_xalign(0)
-        grid.attach(lbl, 0, 0, 1, 1)
-
-        self.SN = dbGtkUtils.TextEntry()
-        self.SN.connect("text_changed", self.SN_ready)
-        self.SN.widget.set_tooltip_text("Enter SN of PWD or Hybrid panel.")
-        grid.attach(self.SN.widget, 1, 0, 1, 1)
-
-        self.panel_type = Gtk.Label(label="")
-        grid.attach(self.panel_type, 2, 0, 1, 1)
-
-        # Paned object
-        paned = Gtk.Paned(orientation=Gtk.Orientation.VERTICAL)
-        paned.set_size_request(-1, 200)
-        self.mainBox.pack_start(paned, True, True, 5)
-
-        # the list of attachments
-        tree_view = self.create_tree_view()
-        paned.add1(tree_view)
-
-        # The text view
-        paned.add2(self.message_panel.frame)
-
-
-        self.show_all()
-
-        dbGtkUtils.setup_scanner(self.get_qrcode)
-
-    def create_tree_view(self, size=150):
-        """Create the TreeView with the children."""
-        model = Gtk.ListStore(str, bool)
-        self.tree = Gtk.TreeView(model=model)
-
-        scrolled = Gtk.ScrolledWindow()
-        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
-        scrolled.add(self.tree)
-        scrolled.set_size_request(-1, size)
-        
-        renderer = Gtk.CellRendererText()
-        column = Gtk.TreeViewColumn("SN", renderer, text=PanelVisualInspection.SN)
-        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()
-        renderer.set_alignment(0, y)
-        # renderer.set_property("inconsistent", True)
-        renderer.connect("toggled", self.btn_toggled)
-        
-        column = Gtk.TreeViewColumn("Passed", renderer, active=PanelVisualInspection.PASSED)
-        self.tree.append_column(column)
-
-        return scrolled
-
-    def btn_toggled(self, renderer, path, *args):
-        """Toggled."""
-        model = self.tree.get_model()
-        val = not model[path][PanelVisualInspection.PASSED]
-        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:
-            select = self.tree.get_selection()
-            model, iter = select.get_selected()
-            if not iter:
-                return
-
-            self.on_show_json(None, (model, iter, model[iter]))
-            # self.on_show_attachments(None, (model, iter, model[iter]))
-            return
-
-        if event.button != 3:
-            return
-
-        # Create popup menu
-        select = self.tree.get_selection()
-        model, iter = select.get_selected()
-        values = None
-        if iter:
-            values = model[iter]
-
-        if not iter:
-            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]
-
-        if not values:
-            return
-
-
-    def SN_ready(self, *args):
-        """SN is ready in the TextEnttry."""
-        SN = self.SN.get_text()
-        if not SN.startswith("20U") or len(SN)!=14:
-            dbGtkUtils.complain("Invalid Serial Number",
-                                    "{}: wrong SN".format(SN))
-            return
-
-        if "USED" in SN:
-            # Powerboard Carrier
-            if not SN[6].isdigit():
-                dbGtkUtils.complain("Not a Powerboard Carrier",
-                                    "{}: wrong SN for a powerboard carrier".format(SN))
-                self.SN.widget.set_text("")
-                return
-
-            self.panel_type.set_text("PWB carrier")
-
-        elif "USET" in SN:
-            # Hybrid test panel
-            if not SN[6].isdigit or int(SN[6])>5:
-                dbGtkUtils.complain("Not a Hybrid Test Panel",
-                                    "{}: wrong SN for a hybrid test panel".format(SN))
-                self.SN.widget.set_text("")
-                return
-
-        else:
-            dbGtkUtils.complain("Invalid SN.",
-                "{}\nNot a PWB carrier not HYB test panel.".format(SN))
-            self.SN.widget.set_text("")
-            return
-
-        # GEt children.
-        panel = ITkDButils.get_DB_component(self.session, SN)
-        if panel is None:
-            self.write_message(ITkDButils.get_db_response())
-            return
-
-        children = []
-        for child in panel["children"]:
-            if child["component"] is not None:
-                if child["componentType"]["name"] == "Powerboard":
-                    children.append(child["component"]["serialNumber"])
-
-        model = Gtk.ListStore(str, bool)
-        for child in children:
-            model.append([SN, True])
-            
-        self.tree.set_model(model)
-
-
-    def upload_tests(self, *args):
-        """Upload the current test."""
-        SN = self.SN.get_text()
-
-    def get_qrcode(self, fd, state, reader):
-        """Read SN from scanner."""
-        txt = dbGtkUtils.scanner_get_line(reader)
-        self.write_message("SN: {}\n".format(txt))
-
-
-def main():
-    """Main entry."""
-    # DB login
-    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
-
-    gTest = PanelVisualInspection(client)
-
-    gTest.present()
-    gTest.connect("destroy", Gtk.main_quit)
-    try:
-        Gtk.main()
-
-    except KeyboardInterrupt:
-        print("Arrrgggg!!!")
-
-    dlg.die()
-
-
-if __name__ == "__main__":
-    main()