itkdb-gtk 0.18.0.dev3__tar.gz → 0.19.1__tar.gz

{itkdb_gtk-0.18.0.dev3 → itkdb_gtk-0.19.1}/PKG-INFO

@@ -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 → itkdb_gtk-0.19.1}/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-0.18.0.dev3 → itkdb_gtk-0.19.1}/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 → itkdb_gtk-0.19.1}/itkdb_gtk.egg-info/PKG-INFO

@@ -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 → itkdb_gtk-0.19.1}/pyproject.toml

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