dashio 3.3.7__tar.gz → 3.3.9__tar.gz

{dashio-3.3.7 → dashio-3.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dashio
-Version: 3.3.7
+Version: 3.3.9
 Summary: DashIO interface library
 Home-page: https://dashio.io
 Download-URL: https://github.com/dashio-connect/python-dashio

{dashio-3.3.7 → dashio-3.3.9}/dashio/iotcontrol/button.py

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 from ..constants import BAD_CHARS
-from .control import Control, ControlPosition, ControlConfig, _get_color, _get_icon, _get_title_position, _get_button_style
+from .control import Control, ControlPosition, ControlConfig, _get_color, _get_icon, _get_title_position, _get_button_style, _get_color_str
 from .enums import ButtonState, Color, Icon, TitlePosition, ButtonStyle
 
 
@@ -46,8 +46,8 @@ class ButtonConfig(ControlConfig):
         self.cfg["iconName"] = icon_name.value
         self.cfg["buttonEnabled"] = button_enabled
         self.cfg["style"] = str(style.value)
-        self.cfg["onColor"] = str(on_color.value)
-        self.cfg["offColor"] = str(off_color.value)
+        self.cfg["onColor"] = _get_color_str(on_color)
+        self.cfg["offColor"] = _get_color_str(off_color)
 
     @classmethod
     def from_dict(cls, cfg_dict: dict):

{dashio-3.3.7 → dashio-3.3.9}/dashio/iotcontrol/control.py

@@ -35,7 +35,15 @@ def _get_icon(icon_str: str) -> Icon:
     return Icon[icon_name]
 
 
+def _get_color_str(color) -> str:
+    if isinstance(color, str):
+        if color[0] == '#':
+            return color
+    return str(color.value)
+
 def _get_color(color_str: str) -> Color:
+    if color_str[0] == '#':
+        return color_str
     color_name = color_str.upper().replace(" ", "_")
     return Color[color_name]
 

{dashio-3.3.7 → dashio-3.3.9}/dashio/iotcontrol/device_view.py

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
-from .control import Control, ControlConfig, _get_color, _get_icon, _get_device_view_style
+from .control import Control, ControlConfig, _get_color, _get_icon, _get_device_view_style, _get_color_str
 from .enums import Color, Icon, DeviceViewStyle
 
 
@@ -50,20 +50,20 @@ class DeviceViewConfig(ControlConfig):
         super().__init__(control_id, title, control_position=None, title_position=None)
         self.cfg["iconName"] = icon_name.value
         self.cfg["style"] = str(style.value)
-        self.cfg["color"] = str(color.value)
+        self.cfg["color"] = _get_color_str(color)
         self.cfg["shareColumn"] = share_column
         if 1 <= num_columns <= 10:
             self.cfg["numColumns"] = num_columns
         else:
             raise ValueError("num_columns must be in the range 1 to 10")
-        self.cfg["ctrlTitleBoxColor"] = str(control_title_box_color.value)
+        self.cfg["ctrlTitleBoxColor"] = _get_color_str(control_title_box_color)
         if 0 <= control_title_box_transparency <= 100:
             self.cfg["ctrlTitleBoxTransparency"] = control_title_box_transparency
         else:
             raise ValueError("Value must be in the range 0 to 100")
-        self.cfg["ctrlColor"] = str(control_color.value)
-        self.cfg["ctrlBorderColor"] = str(control_border_color.value)
-        self.cfg["ctrlBkgndColor"] = str(control_background_color.value)
+        self.cfg["ctrlColor"] = _get_color_str(control_color)
+        self.cfg["ctrlBorderColor"] = _get_color_str(control_border_color)
+        self.cfg["ctrlBkgndColor"] = _get_color_str(control_background_color)
         self.cfg["ctrlTitleFontSize"] = control_title_font_size
         self.cfg["ctrlMaxFontSize"] = control_max_font_size
         if 0 <= control_background_transparency <= 100:

{dashio-3.3.7 → dashio-3.3.9}/dashio/iotcontrol/dial.py

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
-from .control import Control, ControlPosition, ControlConfig, _get_color, _get_title_position, _get_dial_number_position, _get_dial_style, _get_precision
+from .control import Control, ControlPosition, ControlConfig, _get_color, _get_title_position, _get_dial_number_position, _get_dial_style, _get_precision, _get_color_str
 from .enums import (Color, DialNumberPosition, DialStyle, Precision,
                     TitlePosition)
 
@@ -49,8 +49,8 @@ class DialConfig(ControlConfig):
         self.cfg["min"] = dial_min
         self.cfg["max"] = dial_max
         self.cfg["redValue"] = red_value
-        self.cfg["dialFillColor"] = str(dial_fill_color.value)
-        self.cfg["pointerColor"] = str(pointer_color.value)
+        self.cfg["dialFillColor"] = _get_color_str(dial_fill_color)
+        self.cfg["pointerColor"] = _get_color_str(pointer_color)
         self.cfg["numberPosition"] = number_position.value
         self.cfg["showMinMax"] = show_min_max
         self.cfg["style"] = style.value

{dashio-3.3.7 → dashio-3.3.9}/dashio/iotcontrol/direction.py

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 from ..constants import BAD_CHARS
-from .control import Control, ControlPosition, ControlConfig, _get_color, _get_title_position, _get_direction_style, _get_precision
+from .control import Control, ControlPosition, ControlConfig, _get_color, _get_title_position, _get_direction_style, _get_precision, _get_color_str
 from .enums import Color, DirectionStyle, Precision, TitlePosition
 
 
@@ -42,7 +42,7 @@ class DirectionConfig(ControlConfig):
     ) -> None:
         super().__init__(control_id, title, control_position, title_position)
         self.cfg["style"] = str(style.value)
-        self.cfg["pointerColor"] = str(pointer_color.value)
+        self.cfg["pointerColor"] = _get_color_str(pointer_color)
         self.cfg["units"] = units
         self.cfg["precision"] = precision.value
         self.cfg["calAngle"] = calibration_angle

{dashio-3.3.7 → dashio-3.3.9}/dashio/iotcontrol/knob.py

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
-from .control import Control, ControlPosition, ControlConfig, _get_color, _get_title_position, _get_knob_style
+from .control import Control, ControlPosition, ControlConfig, _get_color, _get_title_position, _get_knob_style, _get_color_str
 from .enums import Color, KnobStyle, TitlePosition
 
 
@@ -51,8 +51,8 @@ class KnobConfig(ControlConfig):
         self.cfg["showMinMax"] = show_min_max
         self.cfg["sendOnlyOnRelease"] = send_only_on_release
         self.cfg["dialFollowsKnob"] = dial_follows_knob
-        self.cfg["dialColor"] = str(dial_color.value)
-        self.cfg["knobColor"] = str(knob_color.value)
+        self.cfg["dialColor"] = _get_color_str(dial_color)
+        self.cfg["knobColor"] = _get_color_str(knob_color)
 
     @classmethod
     def from_dict(cls, cfg_dict: dict):

{dashio-3.3.7 → dashio-3.3.9}/dashio/iotcontrol/label.py

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
-from .control import Control, ControlPosition, ControlConfig, _get_color, _get_title_position, _get_label_style
+from .control import Control, ControlPosition, ControlConfig, _get_color, _get_title_position, _get_label_style, _get_color_str
 from .enums import Color, LabelStyle, TitlePosition
 
 
@@ -38,7 +38,7 @@ class LabelConfig(ControlConfig):
     ) -> None:
         super().__init__(control_id, title, control_position, title_position)
         self.cfg["style"] = style.value
-        self.cfg["color"] = str(color.value)
+        self.cfg["color"] = _get_color_str(color)
 
     @classmethod
     def from_dict(cls, cfg_dict: dict):

{dashio-3.3.7 → dashio-3.3.9}/dashio/iotcontrol/slider.py

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
-from .control import Control, ControlPosition, ControlConfig, _get_title_position, _get_color, _get_bar_style
+from .control import Control, ControlPosition, ControlConfig, _get_title_position, _get_color, _get_bar_style, _get_color_str
 from .enums import Color, SliderBarStyle, TitlePosition
 
 
@@ -52,8 +52,8 @@ class SliderConfig(ControlConfig):
         self.cfg["sliderEnabled"] = slider_enabled
         self.cfg["sendOnlyOnRelease"] = send_only_on_release
         self.cfg["barFollowsSlider"] = bar_follows_slider
-        self.cfg["barColor"] = str(bar_color.value)
-        self.cfg["knobColor"] = str(knob_color.value)
+        self.cfg["barColor"] = _get_color_str(bar_color)
+        self.cfg["knobColor"] = _get_color_str(knob_color)
         self.cfg["barStyle"] = bar_style.value
 
     @classmethod

{dashio-3.3.7 → dashio-3.3.9}/dashio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dashio
-Version: 3.3.7
+Version: 3.3.9
 Summary: DashIO interface library
 Home-page: https://dashio.io
 Download-URL: https://github.com/dashio-connect/python-dashio

{dashio-3.3.7 → dashio-3.3.9}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dashio",
-    version="3.3.7",
+    version="3.3.9",
     description="DashIO interface library",
     long_description=long_description,
     long_description_content_type="text/markdown",