itkdb-gtk 0.18.0.dev3__py3-none-any.whl → 0.19.1__py3-none-any.whl

itkdb_gtk/QRScanner.py

@@ -2,43 +2,12 @@
 """A set of utilities for teh warp scanner."""
 import pathlib
 import serial
+import serial.tools.list_ports as list_ports
 
 import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import GLib
 
-def setup_scanner(callback):
-    """Setup scanner and callback function."""
-    rdr = None
-    for fnam in ["/dev/ttyACM0", "/dev/cu.usbmodemS_N_G19F204881"]:
-        P = pathlib.Path(fnam)
-        if P.exists():
-            rdr = serial.Serial(fnam, 9600)
-            GLib.unix_fd_add_full(
-                GLib.PRIORITY_DEFAULT,
-                rdr.fileno(),
-                GLib.IOCondition.IN | GLib.IOCondition.ERR | GLib.IOCondition.HUP | GLib.IOCondition.NVAL,
-                callback,
-                rdr,
-            )
-            break
-
-    return rdr
-
-def scanner_get_line(reader):
-    """Reads a line from serial."""
-    available = reader.in_waiting
-    while True:
-        delta = reader.in_waiting - available
-        if not delta:
-            break
-
-    # Get data from serial device passed in via
-    data = reader.read_until(expected='\r', size=reader.in_waiting).strip()
-    txt = data.decode('utf-8')
-    return txt
-
-
 class QRScanner:
     """Contains information to detect the scanner."""
     def __init__(self, callback):
@@ -78,19 +47,19 @@ class QRScanner:
             return
 
         self.reader = None
-        for fnam in ["/dev/ttyACM0", "/dev/cu.usbmodemS_N_G19F204881"]:
-            P = pathlib.Path(fnam)
-            if P.exists():
-                self.reader = serial.Serial(fnam, 9600)
-                self.source_id = GLib.unix_fd_add_full(
-                    GLib.PRIORITY_DEFAULT,
-                    self.reader.fileno(),
-                    #GLib.IOCondition.IN | GLib.IOCondition.ERR | GLib.IOCondition.HUP | GLib.IOCondition.NVAL,
-                    GLib.IOCondition.IN | GLib.IOCondition.ERR | GLib.IOCondition.NVAL,
-                    self.get_line,
-                    self.callback,
+        device_signature = '05f9:4204|1a86:7523'
+        candidates = list(list_ports.grep(device_signature))
+        if not candidates:
+            return
+
+        self.reader = serial.Serial(candidates[0].device, 9600)
+        self.source_id = GLib.unix_fd_add_full(
+                GLib.PRIORITY_DEFAULT,
+                self.reader.fileno(),
+                GLib.IOCondition.IN | GLib.IOCondition.ERR | GLib.IOCondition.NVAL,
+                self.get_line,
+                self.callback,
                 )
-                break
 
 
     def finish_timeout(self):
@@ -140,6 +109,7 @@ def get_text_from_scanner(txt):
 def test_scanner():
     """Test the thing."""
     scanner = QRScanner(get_text_from_scanner)
+    
     loop = GLib.MainLoop()
     try:
         loop.run()
@@ -147,4 +117,4 @@ def test_scanner():
         loop.quit()
 
 if __name__ == "__main__":
-    test_scanner()
+    test_scanner()

itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.18.0.dev3"
+__version__ = "0.19.1"
 
 
 def dash_board():

{itkdb_gtk-0.18.0.dev3.dist-info → itkdb_gtk-0.19.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itkdb_gtk
-Version: 0.18.0.dev3
+Version: 0.19.1
 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.18.0.dev3.dist-info → itkdb_gtk-0.19.1.dist-info}/RECORD

@@ -6,7 +6,7 @@ itkdb_gtk/ITkDB.svg,sha256=Ry702zrUkxvG61SqThbUNfXySyiLMqalwYpcM-b_KWo,24242
 itkdb_gtk/ITkDBlogin.py,sha256=40tipm_j5eUS4dnZnBT8VyL6Bu_8csuqS9TPWKxvKSY,10038
 itkdb_gtk/ITkDButils.py,sha256=mcvxxvg1Sqhw4cGe6BUi2Zq4tDNWFWD49izFPI8qhzo,21632
 itkdb_gtk/PanelVisualInspection.py,sha256=0Uy30SNA4I-F1PJfK3tqNb6VQZLGH84VBEwlT3HdF5E,20466
-itkdb_gtk/QRScanner.py,sha256=s37NBL1bL7y51-9ZvXij8XDp7-EQ3t3xAYnx7eEsQ3k,4499
+itkdb_gtk/QRScanner.py,sha256=igSxIyaPSbWxChhd6du4MKuQ0m6Sd3irrAt374KZlB0,3480
 itkdb_gtk/SensorUtils.py,sha256=fYWF9TeutAbore53dLWNlZnVn9P3OsKYcFLNGOs8cnI,15426
 itkdb_gtk/ShowAttachments.py,sha256=KExxPCdbcb04XS8JSUkg5xF1McvlB8e9btwctDCKNXU,8498
 itkdb_gtk/ShowComments.py,sha256=OiMTFLnhGbbKRj5x61D517BYHAt-qY5Y1lvR3EQz3c0,3151
@@ -16,14 +16,14 @@ itkdb_gtk/UploadMultipleTests.py,sha256=tFXGyeIC-c1Gh_Fyjr_AddDnKReGMrMphdotRzIs
 itkdb_gtk/UploadTest.py,sha256=ukgJ5-IG12bqa1QIp3bXIV8hkdXCv5UDxh1lQswN_ko,16832
 itkdb_gtk/VisualInspection.py,sha256=sTEhWrWW9Cez2ABLq1nggnvnncT2nZEsb3KWCSN6GCM,9798
 itkdb_gtk/WireBondGui.py,sha256=WFTLOw4l5JxSbvh4vZMxcF65fqlwvNw0fOyEru9ijqQ,39850
-itkdb_gtk/__init__.py,sha256=3hxtTYPuQ7PS9M06-6dwu0zC4pFDtYf8KQeCjTE-6uo,1274
+itkdb_gtk/__init__.py,sha256=hD3XECiCxyrCgHEJWVJqLHjwgXae3MyRRsZLbUfWwco,1269
 itkdb_gtk/dashBoard.py,sha256=1kNSJn-iJ-ME6Nhtz-TfjFQsdKIlBooExrD8U_LgyEA,12293
 itkdb_gtk/dbGtkUtils.py,sha256=UEdqVdw8OxAmDzVeCKncUq7mUJkCclV7tEZu0dadics,29629
 itkdb_gtk/findComponent.py,sha256=zXksALmvsKRDasYMfRETY_dYZ2P73GRLTmioVRHZD9w,4113
 itkdb_gtk/readGoogleSheet.py,sha256=Lzm_oPWwDqZZzKoBUgsp277F9-wCfr_BA0X4VD2Eolo,2673
 itkdb_gtk/untrash_component.py,sha256=VrN46-f-kF7voOxtoh7OL-bZSWAaIFb7-Xbx6_WT7K8,757
-itkdb_gtk-0.18.0.dev3.dist-info/METADATA,sha256=djaTqNjH90ETBGAxJiD_YfT24rVFWO8aS_y-NX452r4,3154
-itkdb_gtk-0.18.0.dev3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-itkdb_gtk-0.18.0.dev3.dist-info/entry_points.txt,sha256=vN0_mqIT6NwsnHirFsf3JHu-wq8CSHXE1IlhZzB5sbU,481
-itkdb_gtk-0.18.0.dev3.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
-itkdb_gtk-0.18.0.dev3.dist-info/RECORD,,
+itkdb_gtk-0.19.1.dist-info/METADATA,sha256=Y3R3kRM0UR1YvyruQk1CyF3Li2Y-kNg53tohVK7LMb0,3149
+itkdb_gtk-0.19.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+itkdb_gtk-0.19.1.dist-info/entry_points.txt,sha256=vN0_mqIT6NwsnHirFsf3JHu-wq8CSHXE1IlhZzB5sbU,481
+itkdb_gtk-0.19.1.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
+itkdb_gtk-0.19.1.dist-info/RECORD,,