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

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

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

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 """GUI to upload tests."""
-import argparse
 import fnmatch
 import json
 import os
@@ -64,7 +63,26 @@ def all_files(root, patterns='*', single_level=False, yield_folders=False):
 
 
 class TestList(object):
-    SN, TestType, RunNumber, Date, Institute, Stage, currentStage, Path, Json, Nattch, Attachments, Ncomm, Comments, Ndef, Defects, ALL = range(16)
+    """Enumeration with TreeView model columns."""
+    (
+        SN,
+        TestType,
+        RunNumber,
+        Date,
+        Institute,
+        Stage,
+        currentStage,
+        Path,
+        Json,
+        Nattch,
+        Attachments,
+        Ncomm,
+        Comments,
+        Ndef,
+        Defects,
+        Color,
+        ALL,
+    ) = range(17)
 
 
 def check_data(data):
@@ -113,6 +131,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         self.tests = []
         self.data = None
         self.tree = None
+        self.def_color = None
 
         self.init_window()
 
@@ -174,7 +193,23 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
     def create_tree_view(self, size=150):
         """Creates the tree vew with the attachments."""
-        model = Gtk.ListStore(str, str, str, str, str, str, str, str, object, int, object, int, object, int, object)
+        model = Gtk.ListStore(str, # SN
+                              str, # test type
+                              str, # runNumber
+                              str, # date
+                              str, # institute
+                              str, # stage
+                              str, # stage
+                              str, # ifile
+                              object, # data
+                              int, # num. attch.
+                              object, # attachments
+                              int, # num. comments
+                              object, # comments
+                              int, # num defects
+                              object, # defects
+                              str # color
+                              )
         self.tree = Gtk.TreeView(model=model)
         self.tree.connect("button-press-event", self.button_pressed)
         scrolled = Gtk.ScrolledWindow()
@@ -187,7 +222,8 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         self.tree.append_column(column)
 
         renderer = Gtk.CellRendererText()
-        column = Gtk.TreeViewColumn("Test Type", renderer, text=TestList.TestType)
+        self.def_color = renderer.get_property("foreground-rgba").to_string()
+        column = Gtk.TreeViewColumn("Test Type", renderer, text=TestList.TestType, foreground=TestList.Color)
         self.tree.append_column(column)
 
         renderer = Gtk.CellRendererText()
@@ -376,7 +412,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         """Set the test stage."""
         model, lv_iter, val = data
         SN = val[TestList.SN]
-        combo, currentStage = self.get_component_stages(SN)
+        combo, _ = self.get_component_stages(SN)
 
         dlg = Gtk.Dialog(title="Add Attachment")
 
@@ -429,7 +465,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             return combo, currentStage
 
         except Exception:
-            self.write_message("Something went wring with the stages")
+            self.write_message("Something went wrong with the stages\n")
             return [None, None]
 
     def add_tests_to_view(self, files):
@@ -473,8 +509,8 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
                                 path = folder / path.name
 
                             if path.exists():
-                                attachments.append(ITkDButils.Attachment(path=path, 
-                                                                         title=att["title"], 
+                                attachments.append(ITkDButils.Attachment(path=path,
+                                                                         title=att["title"],
                                                                          desc=att["description"]))
                             else:
                                 self.write_message("Ignoring atachment {}".format(data["path"]))
@@ -487,10 +523,18 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
                     defects = data.get("defects", [])
                     the_date = handle_test_date(data["date"])
                     combo, currentStage = self.get_component_stages(data["component"])
+                    if data["passed"]:
+                        if data["problems"]:
+                            color = "orange"
+                        else:
+                            color = self.def_color
+                    else:
+                        color = "firebrick"
+
                     model.append([data["component"], data["testType"], data["runNumber"], the_date,
                                   data["institution"], currentStage, currentStage,
                                   ifile, data, len(attachments), attachments,
-                                  len(comments), comments, len(defects), defects])
+                                  len(comments), comments, len(defects), defects, color])
 
             except Exception as E:
                 self.write_message("Cannot load file {}\n".format(ifile))
@@ -600,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]
@@ -611,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.dev4 → itkdb_gtk-0.10.10.dev6}/itkdb_gtk/UploadTest.py

@@ -9,7 +9,6 @@ try:
     import itkdb_gtk
 
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
@@ -93,6 +92,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         self.attachments = []
         self.comments = []
         self.defects = []
+        self.currentStage = None
         if attachment is not None:
             if isinstance(attachment, ITkDButils.Attachment):
                 if attachment.path is not None:
@@ -219,6 +219,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
             except TypeError:
                 self.load_payload(self.payload)
                 self.write_message("Loaded memory payload.\n")
+                self.testF.set_sensitive(False)
 
         if len(self.attachments) > 0:
             self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
@@ -293,7 +294,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
             self.objStage.set_active(indx)
 
         except Exception:
-            self.write_message("Something went wring with the stages")
+            self.write_message("Something went wrong with the stages\n")
 
 
     def on_test_file(self, fdlg):
@@ -303,7 +304,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
 
         # The file exists by definition
         try:
-            self.data = json.loads(open(fnam).read())
+            self.data = json.loads(open(fnam, encoding="UTF-8").read())
             errors, missing = check_data(self.data)
             self.complete_missing(missing, errors)
             self.set_stages()
@@ -326,7 +327,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
                     self.write_message("Setting Institution to {}\n".format(self.data["institution"]))
 
             else:
-                dbGtkUtils.complain("Invalid JSON data".format('\n'.join(errors)))
+                dbGtkUtils.complain("Invalid JSON data\n{}".format('\n'.join(errors)))
 
         self.find_attachments()
         self.find_comments()

itkdb_gtk-0.10.10.dev6/itkdb_gtk/VisualInspection.py

@@ -0,0 +1,272 @@
+#!/usr/bin/env python3
+"""Module Visual inspection GUI."""
+import sys
+import re
+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.ShowAttachments import ShowAttachments
+from itkdb_gtk.UploadTest import UploadTest
+
+import gi
+gi.require_version("Gtk", "3.0")
+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/Sensor Visual Inspection."""
+
+    def __init__(self, session, title="Visual Inspection", help_link=HELP_LINK):
+        super().__init__(title=title,
+                         session=session,
+                         show_search="Find object with given SN.",
+                         help_link=help_link)
+
+        self.institute = self.pdb_user["institutions"][0]["code"]
+        self.global_image = None
+        self.global_link = None
+        self.data = None
+        self.attachments = []
+        self.comments = []
+        self.defects = []
+
+        # 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 the test.")
+        button.connect("clicked", self.upload_test)
+        self.hb.pack_end(button)
+
+        grid = Gtk.Grid(column_spacing=5, row_spacing=5)
+        self.mainBox.pack_start(grid, False, False, 5)
+
+        irow = 0
+        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)
+
+        lbl = Gtk.Label(label="Institute")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 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 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)
+        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)
+
+        irow +=1
+        self.passed = Gtk.Switch()
+        self.passed.props.halign = Gtk.Align.START
+        self.passed.set_active(True)
+        lbl = Gtk.Label(label="Passed")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, irow, 1, 1)
+        grid.attach(self.passed, 1, irow, 1, 1)
+
+        irow +=1
+        self.problems = Gtk.Switch()
+        self.problems.props.halign = Gtk.Align.START
+        self.problems.set_active(False)
+        lbl = Gtk.Label(label="Problems")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, irow, 1, 1)
+        grid.attach(self.problems, 1, irow, 1, 1)
+
+
+        # The "Add attachment" button.
+        box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
+        self.mainBox.pack_start(box, False, False, 0)
+        self.btn_attch = dbGtkUtils.add_button_to_container(box, "Attachments",
+                                           "Click to edit attachments.",
+                                           self.edit_attachments)
+
+        self.btn_comments = dbGtkUtils.add_button_to_container(box, "Comments",
+                                           "Click to edit comments.",
+                                           self.edit_comments)
+
+        self.btn_defects = dbGtkUtils.add_button_to_container(box, "Defects",
+                                           "Click to edit defects.",
+                                           self.edit_defects)
+
+        self.mainBox.pack_start(self.message_panel.frame, True, True, 5)
+        self.write_message("Module Visual Inspection\n")
+        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 SN_ready(self, *args):
+        """SN is ready in the TextEnttry."""
+        SN = self.SN.get_text()
+        # GEt children.
+        module = ITkDButils.get_DB_component(self.session, SN)
+        if module is None:
+            self.write_message(ITkDButils.get_db_response())
+            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)
+
+
+    def edit_attachments(self, *args):
+        """Edit test attachmetns."""
+        SA = ShowAttachments("Test Attachments", self.session, self.attachments, parent=self)
+        response = SA.run()
+        if response == Gtk.ResponseType.OK:
+            self.attachments = SA.attachments
+
+        SA.hide()
+        SA.destroy()
+
+        if len(self.attachments) > 0:
+            self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
+
+    def edit_comments(self, *args):
+        """Edit test comments."""
+        SC = ShowComments("Test Comments", self.comments, self)
+        rc = SC.run()
+        if rc == Gtk.ResponseType.OK:
+            self.comments = SC.comments
+
+        SC.hide()
+        SC.destroy()
+
+        if len(self.comments) > 0:
+            self.btn_comments.set_label("Comments ({})".format(len(self.comments)))
+
+    def edit_defects(self, *args):
+        """Edit test defects."""
+        SD = ShowDefects("Test Defects", self.defects, self)
+        rc = SD.run()
+        if rc == Gtk.ResponseType.OK:
+            self.defects = SD.defects
+
+        SD.hide()
+        SD.destroy()
+
+        if len(self.defects) > 0:
+            self.btn_defects.set_label("Defects ({})".format(len(self.defects)))
+
+    def upload_test(self, *args):
+        """Upload the test."""
+        SN = self.SN.get_text()
+        if len(SN) == 0 or self.obj_type is None:
+            dbGtkUtils.complain("Invalid Serial Number", SN)
+            return
+
+        defaults = {
+            "component": SN,
+            "institution": self.institute,
+            "passed": self.passed.get_active(),
+            "problems": self.problems.get_active(),
+            "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,
+                                                 self.obj_type,
+                                                 test_type,
+                                                 defaults)
+
+        self.data["comments"] = self.comments
+        self.data["defects"] = self.defects
+        uploadW = UploadTest(self.session, self.data, self.attachments)
+
+
+
+    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 = ModuleVisualInspection(client)
+
+    gTest.present()
+    gTest.connect("destroy", Gtk.main_quit)
+    try:
+        Gtk.main()
+
+    except KeyboardInterrupt:
+        print("Arrrgggg!!!")
+
+    dlg.die()
+
+if __name__ == "__main__":
+    main()