p3lib 1.1.121__tar.gz → 1.1.123__tar.gz

{p3lib-1.1.121 → p3lib-1.1.123}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: p3lib
-Version: 1.1.121
+Version: 1.1.123
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 License: MIT
 Author: Paul Austen

{p3lib-1.1.121 → p3lib-1.1.123}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p3lib"
-version = "1.1.121"
+version = "1.1.123"
 description = "A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output."
 authors = ["Paul Austen <pjaos@gmail.com>"]
 license = "MIT License"

{p3lib-1.1.121 → p3lib-1.1.123}/src/p3lib/ngt.py

@@ -314,6 +314,14 @@ class TabbedNiceGui(object):
         self._logMessageCount += 1
         # We've received a log message so update progress bar if required.
         self._updateProgressBar(msg)
+        # Wait a moment for DOM to update, then scroll to the end of the log
+        # so that the message just added is visible.
+        ui.timer(0.05, lambda: ui.run_javascript("""
+            const el = document.querySelector('.my-log');
+            if (el) {
+                el.scrollTop = el.scrollHeight;
+            }
+        """), once=True)
 
     def _infoGT(self, msg):
         """@brief Update an info level message. This must be called from the GUI thread.
@@ -371,7 +379,13 @@ class TabbedNiceGui(object):
             if isinstance(rxMessage, dict):
                 self._processRXDict(rxMessage)
 
-    def initGUI(self, tabNameList, tabMethodInitList, reload=True, address="0.0.0.0", port=DEFAULT_SERVER_PORT, pageTitle="NiceGUI"):
+    def initGUI(self,
+                tabNameList,
+                tabMethodInitList,
+                reload=True,
+                address="0.0.0.0",
+                port=DEFAULT_SERVER_PORT,
+                pageTitle="NiceGUI"):
         """@brief Init the tabbed GUI.
            @param tabNameList A list of the names of each tab to be created.
            @param tabMethodInitList A list of the methods to be called to init each of the above tabs.
@@ -379,47 +393,53 @@ class TabbedNiceGui(object):
            @param reload If reload is set False then changes to python files will not cause the server to be restarted.
            @param address The address to bind the server to.
            @param The TCP port to bind the server to.
-           @param pageTitle The page title that appears in the browser."""
-        # A bit of defensive programming.
-        if len(tabNameList) != len(tabMethodInitList):
-            raise Exception(f"initGUI: BUG: tabNameList ({len(tabNameList)}) and tabMethodInitList ({len(tabMethodInitList)}) are not the same length.")
-        tabObjList = []
-        with ui.row():
-            with ui.tabs().classes('w-full') as tabs:
-                for tabName in tabNameList:
-                    tabObj = ui.tab(tabName)
-                    tabObjList.append(tabObj)
-
-            with ui.tab_panels(tabs, value=tabObjList[0]).classes('w-full'):
-                for tabObj in tabObjList:
-                    with ui.tab_panel(tabObj):
-                        tabIndex = tabObjList.index(tabObj)
-                        tabMethodInitList[tabIndex]()
-
-        guiLogLevel = "warning"
-        if self._debugEnabled:
-            guiLogLevel = "debug"
-
-        ui.label("Message Log")
-        self._progress = ui.slider(min=0,max=TabbedNiceGui.MAX_PROGRESS_VALUE,step=1)
-        self._progress.set_visibility(False)
-        self._progress.min = 0
-        # Don't allow user to adjust progress bar thumb
-        self._progress.disable()
-        self._log = ui.log(max_lines=2000)
-        self._log.set_visibility(True)
+           @param pageTitle The page title that appears in the browser.
+           @param maxLogLines The maximum number of lines to be displayed in the log. Be aware setting this higher will cause the browser to use more memory."""
+        with ui.column().classes('h-screen w-screen p4'):
+            # A bit of defensive programming.
+            if len(tabNameList) != len(tabMethodInitList):
+                raise Exception(f"initGUI: BUG: tabNameList ({len(tabNameList)}) and tabMethodInitList ({len(tabMethodInitList)}) are not the same length.")
+            tabObjList = []
+            with ui.row():
+                with ui.tabs().classes('w-full') as tabs:
+                    for tabName in tabNameList:
+                        tabObj = ui.tab(tabName)
+                        tabObjList.append(tabObj)
+
+                with ui.tab_panels(tabs, value=tabObjList[0]).classes('w-full'):
+                    for tabObj in tabObjList:
+                        with ui.tab_panel(tabObj):
+                            tabIndex = tabObjList.index(tabObj)
+                            tabMethodInitList[tabIndex]()
+
+            guiLogLevel = "warning"
+            if self._debugEnabled:
+                guiLogLevel = "debug"
+
+            ui.label("Message Log")
+            self._progress = ui.slider(min=0,max=TabbedNiceGui.MAX_PROGRESS_VALUE,step=1)
+            self._progress.set_visibility(False)
+            self._progress.min = 0
+            # Don't allow user to adjust progress bar thumb
+            self._progress.disable()
+            # Setup the log area to fill the available space in the page vertically and horizontally
+            # The 32px is to make space for the vertical scrollbar within the page or it will be
+            # shifted out of sight to the right.
+            # Previously used self._log = ui.log(max_lines=2000) but the ui.log() does not currently limit data in the log.
+            self._log = ui.log().classes('my-log grow w-full max-w-[calc(100%-32px)] overflow-auto box-border')
+            self._log.set_visibility(True)
 
-        with ui.row():
-            ui.button('Clear Log', on_click=self._clearLog)
-            ui.button('Log Message Count', on_click=self._showLogMsgCount)
-            ui.button('Quit', on_click=self.close)
+            with ui.row():
+                ui.button('Clear Log', on_click=self._clearLog)
+                ui.button('Log Message Count', on_click=self._showLogMsgCount)
+                ui.button('Quit', on_click=self.close)
 
-        with ui.row():
-            ui.label(f"Software Version: {self._programVersion}")
+            with ui.row():
+                ui.label(f"Software Version: {self._programVersion}")
 
-        ui.timer(interval=TabbedNiceGui.GUI_TIMER_SECONDS, callback=self.guiTimerCallback)
-        ui.timer(interval=TabbedNiceGui.PROGRESS_TIMER_SECONDS, callback=self.progressTimerCallback)
-        ui.run(host=address, port=port, title=pageTitle, dark=True, uvicorn_logging_level=guiLogLevel, reload=reload)
+            ui.timer(interval=TabbedNiceGui.GUI_TIMER_SECONDS, callback=self.guiTimerCallback)
+            ui.timer(interval=TabbedNiceGui.PROGRESS_TIMER_SECONDS, callback=self.progressTimerCallback)
+            ui.run(host=address, port=port, title=pageTitle, dark=True, uvicorn_logging_level=guiLogLevel, reload=reload)
 
     def progressTimerCallback(self):
         """@brief Time to update the progress bar. We run the timer all the time because there appears to be a
@@ -939,4 +959,4 @@ class local_file_picker(ui.dialog):
                     selected=selected[1:]
                     selected = self.drives_toggle.value + selected
 
-            self.submit([selected])
+            self.submit([selected])