itkdb-gtk 0.11.0__tar.gz → 0.12.0__tar.gz

{itkdb_gtk-0.11.0 → itkdb_gtk-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.11.0
+Version: 0.12.0
 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.11.0 → itkdb_gtk-0.12.0}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.11.0"
+__version__ = "0.12.0"
 
 
 def dash_board():
@@ -20,13 +20,6 @@ def glueWeight():
     from .GlueWeight import main
     main()
 
-
-def petalReceptionTests():
-    """GND/VI tests."""
-    from .PetalReceptionTests import main
-    main()
-
-
 def createShipments():
     """Send items."""
     from .CreateShipments import main

{itkdb_gtk-0.11.0 → itkdb_gtk-0.12.0}/itkdb_gtk/dashBoard.py

@@ -13,7 +13,6 @@ except ImportError:
 
 from itkdb_gtk import dbGtkUtils
 from itkdb_gtk import GetShipments
-from itkdb_gtk import PetalReceptionTests
 from itkdb_gtk import ITkDBlogin
 from itkdb_gtk import CreateShipments
 from itkdb_gtk import UploadTest
@@ -31,6 +30,7 @@ try:
     from petal_qc.thermal.coreThermal import CoreThermal
     from petal_qc.thermal.IRPetalParam import IRPetalParam
     from petal_qc.metrology.uploadPetalInformation import AVSPanel, AVSOptions
+    from petal_qc import PetalReceptionTests
 
     HAS_PETALQC = True
 except ImportError as E:
@@ -50,7 +50,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
     UPLOAD_MANY_TESTS = 2
     CREATE_SHIPMNT = 3
     RECV_SHIPMNT = 4
-    PETAL_GND = 5
+    PETAL_RECEPTION = 5
     GLUE_WEIGHT = 6
     MOD_IV = 7
     WIRE_BOND = 8
@@ -69,9 +69,9 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         self.set_border_width(10)
 
         # Prepare dashboard
-        lbl = Gtk.Label()
-        lbl.set_markup("<big><b>ITkDB available commands.</b></big>")
-        self.mainBox.pack_start(lbl, True, True, 0)
+        #lbl = Gtk.Label()
+        #lbl.set_markup("<big><b>ITkDB available commands.</b></big>")
+        #self.mainBox.pack_start(lbl, True, True, 0)
 
         grid = Gtk.Grid(column_spacing=5, row_spacing=5)
         self.mainBox.pack_start(grid, False, True, 5)
@@ -91,15 +91,20 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         btnTest.connect("clicked", self.upload_multiple_tests)
         grid.attach(btnTest, 1, irow, 1, 1)
 
-        irow += 1
-        btnGnd = Gtk.Button(label="Petal Reception")
-        btnGnd.connect("clicked", self.petal_gnd)
-        grid.attach(btnGnd, 0, irow, 1, 1)
+        irow +=1
+        separator = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)
+        grid.attach(separator, 0, irow, 2, 1)
 
-        btnWeight = Gtk.Button(label="GlueWeight")
-        btnWeight.connect("clicked", self.glue_weight)
-        grid.attach(btnWeight, 1, irow, 1, 1)
+        irow += 1
+        btnModVI = Gtk.Button(label="Module/Sensor Visual Insp.")
+        btnModVI.connect("clicked", self.module_VI)
+        grid.attach(btnModVI, 0, irow, 1, 1)
+        
 
+        btnPanelVI = Gtk.Button(label="Panel Visual Insp.")
+        btnPanelVI.connect("clicked", self.panel_VI)
+        grid.attach(btnPanelVI, 1, irow, 1, 1)
+        
         irow += 1
         btnModIV = Gtk.Button(label="Sensor/Module IV")
         btnModIV.connect("clicked", self.module_IV)
@@ -110,20 +115,26 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         grid.attach(btnWireBond, 1, irow, 1, 1)
 
         irow += 1
-        btnPanelVI = Gtk.Button(label="Panel Visual Insp.")
-        btnPanelVI.connect("clicked", self.panel_VI)
-        grid.attach(btnPanelVI, 1, irow, 1, 1)
+        btnWeight = Gtk.Button(label="GlueWeight")
+        btnWeight.connect("clicked", self.glue_weight)
+        grid.attach(btnWeight, 0, irow, 1, 1)
+
 
-        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
+            separator = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)
+            grid.attach(separator, 0, irow, 2, 1)
+
             irow +=1
             btnPetalInfo = Gtk.Button(label="AVS Petal Info")
             btnPetalInfo.connect("clicked", self.upload_petal_info)
             grid.attach(btnPetalInfo, 0, irow, 1, 1)
 
+            btnGnd = Gtk.Button(label="Petal Reception")
+            btnGnd.connect("clicked", self.petal_reception)
+            grid.attach(btnGnd, 1, irow, 1, 1)
+
             irow +=1
             btnPetalMetrology = Gtk.Button(label="Petal Core Metrology")
             btnPetalMetrology.connect("clicked", self.petal_metrology)
@@ -211,19 +222,6 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         )
         W.connect("destroy", self.app_closed, bitn)
 
-    def petal_gnd(self, *args):
-        """Petal GND/VI test."""
-        bitn = DashWindow.PETAL_GND
-        bt = 1 << bitn
-        if self.mask & bt:
-            return
-
-        self.mask |= bt
-        W = PetalReceptionTests.PetalReceptionTests(
-            self.session,
-            help_link="{}/petalReceptionTests.html".format(HELP_LINK)
-        )
-        W.connect("destroy", self.app_closed, bitn)
 
     def glue_weight(self, *args):
         """Glue Weight test."""
@@ -297,6 +295,21 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         )
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
+        
+    def petal_reception(self, *args):
+        """Petal GND/VI test."""
+        bitn = DashWindow.PETAL_RECEPTION
+        bt = 1 << bitn
+        if self.mask & bt:
+            return
+
+        self.mask |= bt
+        W = PetalReceptionTests.PetalReceptionTests(
+            self.session,
+            help_link="{}/petalReceptionTests.html".format(HELP_LINK)
+        )
+        W.connect("destroy", self.app_closed, bitn)
+
 
     def upload_petal_info(self, *srgs):
         """Upload petal Info."""

{itkdb_gtk-0.11.0 → itkdb_gtk-0.12.0}/itkdb_gtk.egg-info/PKG-INFO

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

@@ -8,7 +8,6 @@ itkdb_gtk/ITkDB.svg
 itkdb_gtk/ITkDBlogin.py
 itkdb_gtk/ITkDButils.py
 itkdb_gtk/PanelVisualInspection.py
-itkdb_gtk/PetalReceptionTests.py
 itkdb_gtk/SensorUtils.py
 itkdb_gtk/ShowAttachments.py
 itkdb_gtk/ShowComments.py

{itkdb_gtk-0.11.0 → itkdb_gtk-0.12.0}/itkdb_gtk.egg-info/entry_points.txt

@@ -4,7 +4,6 @@ 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
 uploadTest = itkdb_gtk:uploadTest

{itkdb_gtk-0.11.0 → itkdb_gtk-0.12.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.11.0"
+version = "0.12.0"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]
@@ -30,7 +30,6 @@ classifiers = [
 itkdb_dashBoard = "itkdb_gtk:dash_board"
 getShipments = "itkdb_gtk:getShipments"
 glueWeight = "itkdb_gtk:glueWeight"
-petalReceptionTests = "itkdb_gtk:petalReceptionTests"
 createShipments = "itkdb_gtk:createShipments"
 uploadTest = "itkdb_gtk:uploadTest"
 uploadMultipleTests = "itkdb_gtk:uploadMultipleTests"

itkdb_gtk-0.11.0/itkdb_gtk/PetalReceptionTests.py

@@ -1,308 +0,0 @@
-#!/usr/bin/env python3
-"""Test dashboard."""
-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())
-    import itkdb_gtk
-
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
-
-import gi
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gio
-
-
-def find_children(W):
-    """Find DictDialog among the children."""
-    try:
-        for c in W.get_children():
-            if "DictDialog" in c.get_name():
-                return c
-
-            else:
-                return find_children(c)
-
-    except Exception:
-        return None
-
-    return None
-
-
-class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
-    """Petl Reception Test GUI."""
-
-    def __init__(self, session, help_link=None):
-        """Initialization."""
-        super().__init__(title="Petal Reception Tests",
-                         session=session,
-                         show_search="Find object with given SN.",
-                         help_link=help_link)
-
-        # Members
-        self.dbObject = None
-
-        # 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 = 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)
-        grid.attach(self.SN.entry, 1, 0, 1, 1)
-
-        self.alias = Gtk.Label(label="")
-        grid.attach(self.alias, 2, 0, 1, 1)
-
-        self.stage = Gtk.Label(label="")
-        grid.attach(self.stage, 3, 0, 1, 1)
-
-        lbl = Gtk.Label(label="Institute")
-        lbl.set_xalign(0)
-        grid.attach(lbl, 0, 1, 1, 1)
-
-        self.institute = self.pdb_user["institutions"][0]["code"]
-        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)
-        self.inst_cmb = inst
-
-        # The "Add/Remove/Send Item" buttons.
-        box = Gtk.ButtonBox(orientation=Gtk.Orientation.HORIZONTAL)
-        box.set_layout(Gtk.ButtonBoxStyle.END)
-        self.mainBox.pack_start(box, False, False, 0)
-        dbGtkUtils.add_button_to_container(box, "Upload test", "Upload this test", self.upload_single_test)
-        dbGtkUtils.add_button_to_container(box, "Add Defect", "Click to add a defect", self.add_defect)
-        dbGtkUtils.add_button_to_container(box, "Add Comment", "Click to add a comment", self.add_comment)
-
-        # The notebook
-        self.notebook = Gtk.Notebook()
-        self.notebook.set_tab_pos(Gtk.PositionType.LEFT)
-        self.notebook.set_size_request(-1, 250)
-        self.mainBox.pack_start(self.notebook, True, True, 0)
-
-        # Create the Notebook pages
-        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)
-
-        # Set the default institute
-        dbGtkUtils.set_combo_iter(inst, self.institute)
-
-
-        self.show_all()
-
-    def on_SN_changed(self, entry, value):
-        """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)
-
-        stg = self.dbObject["currentStage"]["name"]
-        self.stage.set_text(stg)
-
-        entry.set_text(self.dbObject["serialNumber"])
-
-        alias = self.dbObject["alternativeIdentifier"]
-        self.alias.set_text(alias)
-
-        npages = self.notebook.get_n_pages()
-        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=None):
-        """Create and add to notebook a test dialog.
-
-        Args:
-            label: The label for the Notebook
-            test_name: The DB name of the test
-            institute: The institute.
-
-        """
-        if institute is None:
-            institute = self.institute
-
-        defaults = {
-            "institution": institute,
-            "runNumber": "1",
-        }
-        dto = ITkDButils.get_test_skeleton(self.session, "CORE_PETAL", test_name, defaults)
-        if test_name == "VISUAL_INSPECTION":
-            scrolled, gM = dbGtkUtils.create_scrolled_dictdialog(dto, ("component", "testType", "results"))
-        else:
-            scrolled, gM = dbGtkUtils.create_scrolled_dictdialog(dto)
-
-        box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        box.set_border_width(5)
-        box.pack_end(scrolled, True, True, 0)
-        box.dict_dialog = gM
-        gM.box = box
-
-        self.notebook.append_page(box, Gtk.Label(label=label))
-
-        return gM
-
-    def query_db(self, *args):
-        """Search button clicked."""
-        SN = self.SN.get_text()
-        if len(SN) == 0:
-            dbGtkUtils.complain("Empty Serial number",
-                                "You should enter a valid Serial number for the petal core.",
-                                parent=self)
-
-        try:
-            self.dbObject = ITkDButils.get_DB_component(self.session, SN)
-
-        except Exception as E:
-            self.write_message(str(E)+'\n')
-            dbGtkUtils.complain("Could not find object in DB", str(E))
-            self.dbObject = None
-            return
-
-        #print(json.dumps(self.dbObject, indent=3))
-
-    def add_defect(self, btn):
-        """Add a new defect."""
-        page = self.notebook.get_nth_page(self.notebook.get_current_page())
-        values = dbGtkUtils.get_a_list_of_values("Insert new defect", ("Type", "Description/v"))
-        if len(values)>0:
-            defect = {"name": values[0], "description": values[1]}
-            page.dict_dialog.values["defects"].append(defect)
-            page.dict_dialog.refresh()
-
-    def add_comment(self, btn):
-        """Add a new comment."""
-        page = self.notebook.get_nth_page(self.notebook.get_current_page())
-        comment = dbGtkUtils.get_a_value("Insert new comment", is_tv=True)
-        if comment:
-            page.dict_dialog.values["comments"].append(comment)
-            page.dict_dialog.refresh()
-
-    def new_institute(self, combo):
-        """A new institute has been selected."""
-        inst = self.get_institute_from_combo(combo)
-        if inst:
-            self.institute = inst
-
-            npages = self.notebook.get_n_pages()
-            for i in range(npages):
-                page = self.notebook.get_nth_page(i)
-                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(path=P.as_posix(), title=P.name, desc="X-ray image")
-                    values["results"]["IMAGELINK"] = P.name
-                    attachments.append(A)
-
-        rc = ITkDButils.upload_test(self.session, values, attachments=attachments, check_runNumber=True)
-        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()
-        if len(SN) == 0:
-            dbGtkUtils.complain("Petal SN is empty")
-            return
-
-        page = self.notebook.get_nth_page(self.notebook.get_current_page())
-        dctD = find_children(page)
-        if dctD is None:
-            return
-
-        values = copy.deepcopy(dctD.values)
-        values["component"] = SN
-        self.upload_this_test(values)
-
-    def upload_tests(self, *args):
-        """Upload the current test."""
-        SN = self.SN.get_text()
-        if len(SN) == 0:
-            dbGtkUtils.complain("Petal SN is empty")
-            return
-
-        for ipage in range(self.notebook.get_n_pages()):
-            page = self.notebook.get_nth_page(ipage)
-            dctD = find_children(page)
-            if dctD is None:
-                continue
-
-            values = dctD.values
-            values["component"] = SN
-            self.upload_this_test(values)
-
-def main():
-    """Main entry."""
-    # DB login
-    HELP_LINK="https://itkdb-gtk.docs.cern.ch/petalReceptionTests.html"
-
-    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 = PetalReceptionTests(client, help_link=HELP_LINK)
-
-    gTest.present()
-    gTest.connect("destroy", Gtk.main_quit)
-    try:
-        Gtk.main()
-
-    except KeyboardInterrupt:
-        print("Arrrgggg!!!")
-
-    dlg.die()
-
-
-if __name__ == "__main__":
-    main()