Improve performance of random color sampling

openmc_plotter/plot_colors.py

@@ -1,12 +1,6 @@
-
 import numpy as np
 
 
-# for consistent, but random, colors
-def reset_seed():
-    np.random.seed(10)
-
-
 def random_rgb():
     return tuple(np.random.choice(range(256), size=3))
 

openmc_plotter/plotmodel.py

@@ -17,7 +17,7 @@
 
 from . import __version__
 from .statepointmodel import StatePointModel
-from .plot_colors import random_rgb, reset_seed
+from .plot_colors import random_rgb
 
 ID, NAME, COLOR, COLORLABEL, MASK, HIGHLIGHT = range(6)
 
@@ -170,9 +170,6 @@ def __init__(self, use_settings_pkl, model_path):
         self.appliedScores = ()
         self.appliedNuclides = ()
 
-        # reset random number seed for consistent
-        # coloring when reloading a model
-        reset_seed()
         self.previousViews = []
         self.subsequentViews = []
 
@@ -999,8 +996,9 @@ def __init__(self, origin=(0, 0, 0), width=10, height=10, restore_view=None,
             self.materials = restore_view.materials
             self.selectedTally = restore_view.selectedTally
         else:
-            self.cells = self.getDomains('cell')
-            self.materials = self.getDomains('material')
+            rng = np.random.RandomState(10)
+            self.cells = self.getDomains('cell', rng)
+            self.materials = self.getDomains('material', rng)
             self.selectedTally = None
 
     def __getattr__(self, name):
@@ -1025,7 +1023,7 @@ def __hash__(self):
         return hash(self.__dict__.__str__() + self.__str__())
 
     @staticmethod
-    def getDomains(domain_type):
+    def getDomains(domain_type, rng):
         """ Return dictionary of domain settings.
 
         Retrieve cell or material ID numbers and names from .xml files
@@ -1054,9 +1052,13 @@ def getDomains(domain_type):
             lib_domain = openmc.lib.materials
             domains = DEFAULT_MATERIAL_DOMAIN_VIEW
 
-        for domain, domain_obj in lib_domain.items():
+        # Sample default colors for each domain
+        num_domain = len(lib_domain)
+        colors = rng.randint(256, size=(num_domain, 3))
+
+        for (domain, domain_obj), color in zip(lib_domain.items(), colors):
             name = domain_obj.name
-            domains[domain] = DomainView(domain, name, random_rgb())
+            domains[domain] = DomainView(domain, name, color)
 
         # always add void to a material domain at the end
         if domain_type == 'material':