p3lib 1.1.111__tar.gz → 1.1.113__tar.gz

{p3lib-1.1.111 → p3lib-1.1.113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.111
+Version: 1.1.113
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/test_equipment
 License: MIT

{p3lib-1.1.111 → p3lib-1.1.113}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p3lib"
-version = "1.1.111"
+version = "1.1.113"
 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.111 → p3lib-1.1.113}/src/p3lib/ngt.py

@@ -28,7 +28,8 @@ class TabbedNiceGui(object):
     # than normal.
     DESCRIP_STYLE               = '<span style="font-size:1.2em;">'
     ENABLE_BUTTONS              = "ENABLE_BUTTONS"
-    NOTIFY_DIALOG               = "NOTIFY_DIALOG"
+    NOTIFY_DIALOG_INFO          = "NOTIFY_DIALOG_INFO"
+    NOTIFY_DIALOG_ERROR         = "NOTIFY_DIALOG_ERROR"
     UPDATE_SECONDS              = "UPDATE_SECONDS"
     INFO_MESSAGE                = "INFO:  "
     WARN_MESSAGE                = "WARN:  "
@@ -168,11 +169,23 @@ class TabbedNiceGui(object):
         msgDict = {TabbedNiceGui.ERROR_MESSAGE: str(msg)}
         self.updateGUI(msgDict)
 
-    def infoDialog(self, msg):
+    def infoDialog(self, msg, addToMessageLog=True):
         """@brief Display an info level dialog.
-           @param msg The message dialog."""
-        msgDict = {TabbedNiceGui.NOTIFY_DIALOG: str(msg)}
+           @param msg The message dialog.
+           @param addToMessageLog If True the message will also be added to the message log."""
+        msgDict = {TabbedNiceGui.NOTIFY_DIALOG_INFO: str(msg)}
         self.updateGUI(msgDict)
+        if addToMessageLog:
+            self.info(msg)
+
+    def errorDialog(self, msg, addToMessageLog=True):
+        """@brief Display an error level dialog.
+           @param msg The message dialog.
+           @param addToMessageLog If True the message will also be added to the message log."""
+        msgDict = {TabbedNiceGui.NOTIFY_DIALOG_ERROR: str(msg)}
+        self.updateGUI(msgDict)
+        if addToMessageLog:
+            self.error(msg)
 
     def debug(self, msg):
         """@brief Send a debug message to be displayed in the GUI.
@@ -562,10 +575,14 @@ class TabbedNiceGui(object):
             state = rxDict[TabbedNiceGui.ENABLE_BUTTONS]
             self._enableAllButtons(state)
 
-        elif TabbedNiceGui.NOTIFY_DIALOG in rxDict:
-            message = rxDict[TabbedNiceGui.NOTIFY_DIALOG]
+        elif TabbedNiceGui.NOTIFY_DIALOG_INFO in rxDict:
+            message = rxDict[TabbedNiceGui.NOTIFY_DIALOG_INFO]
             ui.notify(message, close_button='OK', type="positive", position="center")
 
+        elif TabbedNiceGui.NOTIFY_DIALOG_ERROR in rxDict:
+            message = rxDict[TabbedNiceGui.NOTIFY_DIALOG_ERROR]
+            ui.notify(message, close_button='OK', type="negative", position="center")
+
         else:
 
             self._handleGUIUpdate(rxDict)

{p3lib-1.1.111 → p3lib-1.1.113}/src/p3lib/pconfig.py

@@ -775,12 +775,8 @@ class DotConfigManager(ConfigManager):
     KEY_EDIT_ORDER_LIST = None
 
     @staticmethod
-    def GetDefaultConfigFilename(filenameOverride=None):
-        """@brief Get the default name of the config file for this app. This will be the program name
-                  (file that started up initially) without the .py extension. A .cfg extension is added
-                  and it will be found in the ~/.config folder.
-           @param filenameOverride The name for the config file in the .config folder. If left as None then the program name ise used
-                                   as the config filename."""
+    def GetDefaultConfigFolder():
+        """@brief Get the default config folder.."""
         dotConfigFolder = '.config'
         if platform.system() == 'Linux' and os.geteuid() == 0:
             homePath = "/root"
@@ -796,6 +792,25 @@ class DotConfigManager(ConfigManager):
             # Create the ~/.config folder
             os.makedirs(configFolder)
 
+        return configFolder
+
+    @staticmethod
+    def GetDefaultConfigFilename(filenameOverride=None):
+        """@brief Get the default name of the config file for this app. This will be the program name
+                  (file that started up initially) without the .py extension. A .cfg extension is added
+                  and it will be found in the ~/.config folder.
+
+                  This will not work if no python file was started
+
+                  E.G
+                  A command line as shown below
+
+                  python -m poetry run python -c "import python_module.python_file; python_module.python_file.main()
+
+           @param filenameOverride The name for the config file in the .config folder. If left as None then the program name ise used
+                                   as the config filename."""
+        configFolder = DotConfigManager.GetDefaultConfigFolder()
+
         if filenameOverride:
             progName = filenameOverride
         else: