Merge pull request #345 from Carifio24/export-size

Serialize settings for size attributes

Author: pkgw

pywwt/layers.py

@@ -131,7 +131,6 @@
 
 # The following are columns that we add dynamically and internally, so we need
 # to make sure they have unique names that won't clash with existing columns
-SIZE_COLUMN_NAME = str(uuid.uuid4())
 CMAP_COLUMN_NAME = str(uuid.uuid4())
 TIME_COLUMN_NAME = str(uuid.uuid4())
 
@@ -1406,7 +1405,11 @@ def _serialize_state(self):
         if self._uniform_size():
             state["settings"]["sizeColumn"] = -1
         else:
-            state["settings"]["sizeColumn"] = SIZE_COLUMN_NAME
+            state["settings"]["sizeColumn"] = self.size_att
+            state["settings"]["normalizeSize"] = True
+            state["settings"]["normalizeSizeMin"] = self.size_vmin
+            state["settings"]["normalizeSizeMax"] = self.size_vmax
+            state["settings"]["normalizeSizeClip"] = True
             state["settings"]["pointScaleType"] = 0
 
         return state

pywwt/tests/test_serialization.py

@@ -1,7 +1,6 @@
 import pytest
 
 from ..core import BaseWWTWidget
-from ..layers import SIZE_COLUMN_NAME
 
 import numpy as np
 import os
@@ -470,7 +469,11 @@ def test_table_setting_serialization():
     layer.size_att = 'dec'
     layer.alt_unit = u.Mpc
 
-    expected_settings['sizeColumn'] = SIZE_COLUMN_NAME
+    expected_settings['sizeColumn'] = 'dec'
+    expected_settings['normalizeSize'] = True
+    expected_settings["normalizeSizeMin"] = layer.size_vmin
+    expected_settings["normalizeSizeMax"] = layer.size_vmax
+    expected_settings["normalizeSizeClip"] = True
     expected_settings['pointScaleType'] = 0
     expected_settings['colorMapColumn'] = layer.cmap_att
     expected_settings['colorMap'] = 3