- Fixes bug where Matplotlib Paramters Device incorrectly labelled in error state.

DaveL17 · DaveL17 · commit 35bd9274e8ee · 2023-03-08T17:34:41.000-06:00
- Fixes bug `PluginAction' object has no attribute 'PROPS'`.
- Fixes bug where Refresh CSV Device Action returned an error when no such devices exist.
diff --git a/_changelog.md b/_changelog.md
@@ -1,3 +1,8 @@
+#### v2022.1.7
+- Fixes bug where `Matplotlib Paramters Device` incorrectly labelled in error state.
+- Fixes bug `PluginAction' object has no attribute 'PROPS'`.
+- Fixes bug where Refresh CSV Device Action returned an error when no such devices exist.
+
 #### v2022.1.6
 - Fixed bug where custom Y axis tick marks and locations were sometimes not plotted properly.
 - Fixed bug where `rcParamsDevice` devices were not skipped when user elects to redraw all charts from the plugin menu.
diff --git a/_to_do_list.md b/_to_do_list.md
@@ -29,3 +29,4 @@
 - Make sure any existing processes have been closed with communicate(), before starting a new one.  (Too many open 
   files error.)
 - Audit style sheet files -- if dev id no longer exists, delete the style sheet.
+- Look to see if there's anything to be gained by using https://github.com/lgienapp/aquarel
diff --git a/matplotlib.indigoPlugin/Contents/Info.plist b/matplotlib.indigoPlugin/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>2022.1.6</string>
+	<string>2022.1.7</string>
 	<key>ServerApiVersion</key>
 	<string>3.0</string>
 	<key>IwsApiVersion</key>
diff --git a/matplotlib.indigoPlugin/Contents/Server Plugin/chart_tools.py b/matplotlib.indigoPlugin/Contents/Server Plugin/chart_tools.py
@@ -470,19 +470,11 @@ def format_axis_y_ticks(p_dict, k_dict, logger):
 
         plt.yticks(marks, labels)
 
-    except (KeyError, ValueError):
+    except (AttributeError, KeyError, ValueError):
         logger['Threaddebug'].append(
-            f"[{payload['props']['name']}] Problem formatting Y axis  ticks: customAxisLabelY = "
+            f"[{payload['props']['name']}] Problem formatting Y axis ticks: customAxisLabelY = "
             f"{p_dict['customAxisLabelY']}"
         )
-        logger['Threaddebug'].append(
-            f"[{payload['props']['name']}] Problem formatting Y1 axis label: k_y_axis_font = "
-            f"{k_dict['k_y_axis_font']}"
-        )
-        logger['Threaddebug'].append(
-            f"[{payload['props']['name']}] Problem formatting Y1 axis label: customTicksY = "
-            f"{p_dict['customTicksY']}"
-        )
 
 
 # =============================================================================
diff --git a/matplotlib.indigoPlugin/Contents/Server Plugin/plugin.py b/matplotlib.indigoPlugin/Contents/Server Plugin/plugin.py
@@ -48,7 +48,7 @@
 
 try:
     import indigo  # noqa
-    import pydevd
+    import pydevd  # noqa
 except ImportError:
     ...
 
@@ -65,7 +65,7 @@
 __license__   = Dave.__license__
 __build__     = Dave.__build__
 __title__     = "Matplotlib Plugin for Indigo"
-__version__   = "2022.1.6"
+__version__   = "2022.1.7"
 
 
 # =============================================================================
@@ -114,16 +114,16 @@ def __init__(self, plugin_id="", plugin_display_name="", plugin_version="", plug
             self.plugin_file_handler.setLevel(10)
 
         # ============================= Remote Debug Hook =============================
-        # try:
-        #     pydevd.settrace(
-        #         'localhost',
-        #         port=5678,
-        #         stdoutToServer=True,
-        #         stderrToServer=True,
-        #         suspend=False
-        #     )
-        # except Exception:
-        #     ...
+        try:
+            pydevd.settrace(
+                'localhost',
+                port=5678,
+                stdoutToServer=True,
+                stderrToServer=True,
+                suspend=False
+            )
+        except Exception:
+            ...
 
         self.pluginIsInitializing = False
 
@@ -614,10 +614,10 @@ def runConcurrentThread(self):  # noqa
 
         while True:
             if not self.pluginIsShuttingDown:
-                self.refresh_the_charts_queue()
-                self.csv_refresh()
-                self.charts_refresh()
-                self.sleep(1)
+                self.refresh_the_charts_queue()  # check to see if anything is in the queue.
+                self.csv_refresh()  # iterate plugin devices to see if any need updating.
+                self.charts_refresh()  # refresh plugin devices that need updating.
+                self.sleep(10)
 
     # =============================================================================
     @staticmethod
@@ -722,7 +722,7 @@ def validatePrefsConfigUi(self, values_dict=None):  # noqa
                 try:
                     if values_dict[key] != self.pluginPrefs[key]:
                         config_changed = True
-                        changed_keys += f"{key}", f"Old: {self.pluginPrefs[key]}", f"New: {values_dict[key]}",
+                        changed_keys += (f"{key}", f"Old: {self.pluginPrefs[key]}", f"New: {values_dict[key]}"),
 
                 # Missing keys will be config dialog format props like labels and separators
                 except KeyError:
@@ -2238,7 +2238,7 @@ def convert_to_native(obj):
                                 path_to_file = 'chart_multiline.py'
 
                             except OSError as err:
-                                if "Argument list too long" in err:
+                                if "Argument list too long" in str(err):
                                     self.logger.critical("Text source too long.")
 
                         # ============================== Polar Charts ==============================
@@ -2924,7 +2924,7 @@ def csv_refresh_device_action(
         :param bool caller_waiting_for_result:
         :return:
         """
-        dev = indigo.devices[int(plugin_action.PROPS['targetDevice'])]
+        dev = indigo.devices[int(plugin_action.props['targetDevice'])]
 
         if dev.enabled:
 
@@ -2956,11 +2956,11 @@ def csv_refresh_source_action(
         :param bool caller_waiting_for_result:
         :return:
         """
-        dev_id = int(plugin_action.PROPS['targetDevice'])
+        dev_id = int(plugin_action.props['targetDevice'])
         dev    = indigo.devices[dev_id]
 
         if dev.enabled:
-            target_source = plugin_action.PROPS['targetSource']
+            target_source = plugin_action.props['targetSource']
             temp_dict     = ast.literal_eval(dev.pluginProps['columnDict'])
             payload       = {target_source: temp_dict[target_source]}
 
@@ -3095,17 +3095,21 @@ def get_csv_source_list(fltr="", values_dict=None, type_id="", target_id=0):  #
         :param int target_id:
         :return:
         """
-        if not values_dict:
-            result = []
+        try:
+            if not values_dict:
+                result = []
 
-        # Once user selects a device ( see get_csv_device_list() ), populate the dropdown menu.
-        else:
-            target_device = int(values_dict['targetDevice'])
-            dev           = indigo.devices[target_device]
-            dev_dict      = ast.literal_eval(dev.pluginProps['columnDict'])
-            result        = [(k, dev_dict[k][0]) for k in dev_dict]
+            # Once user selects a device ( see get_csv_device_list() ), populate the dropdown menu.
+            else:
+                target_device = int(values_dict.get('targetDevice', 0))
+                dev           = indigo.devices[target_device]
+                dev_dict      = ast.literal_eval(dev.pluginProps['columnDict'])
+                result        = [(k, dev_dict[k][0]) for k in dev_dict]
 
-        return result
+            return result
+
+        except KeyError:
+            return []
 
     # =============================================================================
     @staticmethod
@@ -3282,7 +3286,8 @@ def generatorDeviceList(self, fltr="", values_dict=None, type_id="", target_id=0
         return self.Fogbert.deviceList()
 
     # =============================================================================
-    def generatorPrecisionList(self, fltr="", values_dict=None, type_id="", target_id=0):  # noqa
+    @staticmethod
+    def generatorPrecisionList(fltr="", values_dict=None, type_id="", target_id=0):  # noqa
         """
         Returns a list of value precision options for pulldown menus.
 
@@ -3300,7 +3305,8 @@ def generatorPrecisionList(self, fltr="", values_dict=None, type_id="", target_i
         return precision
 
     # =============================================================================
-    def generatorLineStyleDefaultNoneList(self, fltr="", values_dict=None, type_id="", target_id=0):  # noqa
+    @staticmethod
+    def generatorLineStyleDefaultNoneList(fltr="", values_dict=None, type_id="", target_id=0):  # noqa
         """
         Returns a list of Matplotlib line styles for pulldown menus.
 
@@ -3320,8 +3326,8 @@ def generatorLineStyleDefaultNoneList(self, fltr="", values_dict=None, type_id="
         return line_styles
 
     # =============================================================================
-    def generatorLineStyleDefaultSolidList(
-            self, fltr="", values_dict=None, type_id="", target_id=0):  # noqa
+    @staticmethod
+    def generatorLineStyleDefaultSolidList(fltr="", values_dict=None, type_id="", target_id=0):  # noqa
         """
         Returns a list of Matplotlib line styles for pulldown menus.
 
@@ -3341,7 +3347,8 @@ def generatorLineStyleDefaultSolidList(
         return line_styles
 
     # =============================================================================
-    def generatorMarkerList(self, fltr="", values_dict=None, type_id="", target_id=0):  # noqa
+    @staticmethod
+    def generatorMarkerList(fltr="", values_dict=None, type_id="", target_id=0):  # noqa
         """
         Returns a list of Matplotlib Markers for pulldown menus.
 
@@ -3554,7 +3561,8 @@ def getFontList(self, fltr="", values_dict=None, type_id="", target_id=0):  # no
         return sorted(font_menu)
 
     # =============================================================================
-    def getRefreshList(self, fltr="", values_dict=None, type_id="", target_id=0):  # noqa
+    @staticmethod
+    def getRefreshList(fltr="", values_dict=None, type_id="", target_id=0):  # noqa
         """
 
         :param str fltr:
@@ -3638,7 +3646,7 @@ def plotActionApi(self, plugin_action=None, dev=None, caller_waiting_for_result=
         :param indigo.Device dev:
         :param bool caller_waiting_for_result:
         """
-        self.logger.info(f"Scripting payload: {dict(plugin_action.PROPS)}")
+        self.logger.info(f"Scripting payload: {dict(plugin_action.props)}")
 
         # TODO: take a look at broadcast messages and whether this is something else that can be made to work in this
         #       neighborhood.
@@ -3684,11 +3692,11 @@ def plotActionApi(self, plugin_action=None, dev=None, caller_waiting_for_result=
         bk_color     = self.pluginPrefs.get('backgroundColor', '#000000')
 
         # =============================  Unpack Payload  ==============================
-        x_values  = plugin_action.PROPS['x_values']
-        y_values  = plugin_action.PROPS['y_values']
-        kwargs    = plugin_action.PROPS['kwargs']
-        path_name = plugin_action.PROPS['path']
-        file_name = plugin_action.PROPS['filename']
+        x_values  = plugin_action.props['x_values']
+        y_values  = plugin_action.props['y_values']
+        kwargs    = plugin_action.props['kwargs']
+        path_name = plugin_action.props['path']
+        file_name = plugin_action.props['filename']
 
         try:
             fig = plt.figure(1, figsize=(width / dpi, height / dpi))
@@ -3988,7 +3996,7 @@ def themeApplyAction(self, plugin_action=None):  # noqa
         :param indigo.PluginAction plugin_action:
         """
         full_path = f"{indigo.server.getInstallFolderPath()}/Preferences/Plugins/matplotlib plugin themes.json"
-        selected_theme = plugin_action.PROPS['targetTheme']
+        selected_theme = plugin_action.props['targetTheme']
 
         # ==============================  Get the Theme  ==============================
         with open(full_path, 'r', encoding='utf-8') as f:
