Fix python implementation of style_classes (#601)

aurora-opensource · Jul 10, 2020 · 0c68dce · 0c68dce
1 parent c001c4b
commit 0c68dce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/python/xviz_avs/builder/metadata.py b/python/xviz_avs/builder/metadata.py
@@ -103,9 +103,9 @@ def style_class(self, name, style):
         if not self._stream_id:
             self._logger.error('A stream must set before adding a style rule.')
             return self
-
-        stream_rule = edict(name=name, style=build_object_style(style))
-        self._temp_stream.style_classes.append(stream_rule)
+        style_class = self._temp_stream.style_classes.add()
+        style_class.name = name
+        style_class.style.MergeFrom(build_object_style(style))
         return self
 
     def log_info(self, data):

diff --git a/python/xviz_avs/builder/primitive.py b/python/xviz_avs/builder/primitive.py
@@ -230,7 +230,7 @@ def _format_primitive(self):
             base.style.MergeFrom(build_object_style(self._style))
         if self._classes:
             have_base = True
-            base.classes = self._classes
+            base.classes.extend(self._classes)
 
         if have_base:
             obj.base.MergeFrom(base)

diff --git a/python/xviz_avs/message.py b/python/xviz_avs/message.py
@@ -108,6 +108,9 @@ def to_object(self, unravel: bool = True) -> Dict:
                 for sdata in dataobj['streams'].values():
                     if 'stream_style' in sdata:
                         _unravel_style_object(sdata['stream_style'])
+                    if 'style_classes' in sdata:
+                        for style_class in sdata['style_classes']:
+                            _unravel_style_object(style_class['style'])
 
             return dataobj