Plotdata.set_colors add option for colors=tuple with (color, opacity)

atomicateam · RomeshA · Oct 11, 2021 · Oct 12, 2021 · Nov 5, 2021 · Nov 5, 2021
commit 5e42910a3cfeafcf8a5f538f98af4d560c04ebac
diff --git a/atomica/plotting.py b/atomica/plotting.py
@@ -977,7 +977,9 @@ def set_colors(self, colors=None, results="all", pops="all", outputs="all", over
         elif isinstance(colors, list):
             assert len(colors) == len(targets), "Number of colors must either be a string, or a list with as many elements as colors to set"
             colors = colors
-        elif colors.startswith("#") or colors not in [m for m in plt.cm.datad if not m.endswith("_r")]:
+        elif isinstance(colors, tuple) and colors[0].startswith("#"): # tuple with (color, opacity)
+            colors = [colors for _ in range(len(targets))]  # Apply color to all requested outputs
+        elif isinstance(colors, str) and (colors.startswith("#") or colors not in [m for m in plt.cm.datad if not m.endswith("_r")]):
             colors = [colors for _ in range(len(targets))]  # Apply color to all requested outputs
         else:
             color_norm = matplotlib_colors.Normalize(vmin=-1, vmax=len(targets))

diff --git a/atomica/demos.py b/atomica/demos.py
 """
 Defines some defaults for Atomica projects

 Version: 2018sep24
diff --git a/atomica/excel.py b/atomica/excel.py
 # -*- coding: utf-8 -*-
 """
 Miscellaneous utility functions for Excel files

diff --git a/atomica/framework.py b/atomica/framework.py
 """
 Implements Framework functionality

 A Framework contains all of the information defining a model that can be
diff --git a/atomica/model.py b/atomica/model.py
 """
 Implements the Atomica computational graph

 Fundamentally, models in Atomica can be represented as a graph, with
	"""
Check failure on line 1 in atomica/demos.py Azure Pipelines / atomicateam.atomica atomica/demos.py `F821 undefined name 'demos'` Raw output `52:82 F821 undefined name 'demos'`
	Defines some defaults for Atomica projects

	Version: 2018sep24
	# -- coding: utf-8 --
Check failure on line 1 in atomica/excel.py Azure Pipelines / atomicateam.atomica atomica/excel.py `E226 missing whitespace around arithmetic operator` Raw output `1202:186 E226 missing whitespace around arithmetic operator`
	"""
	Miscellaneous utility functions for Excel files
	"""
Check failure on line 1 in atomica/framework.py Azure Pipelines / atomicateam.atomica atomica/framework.py `E231 missing whitespace after ','` Raw output `1092:64 E231 missing whitespace after ','`
	Implements Framework functionality

	A Framework contains all of the information defining a model that can be
	"""
Check failure on line 1 in atomica/model.py Azure Pipelines / atomicateam.atomica atomica/model.py `E712 comparison to False should be 'if cond is False:' or 'if not cond:'` Raw output `903:33 E712 comparison to False should be 'if cond is False:' or 'if not cond:'`
	Implements the Atomica computational graph

	Fundamentally, models in Atomica can be represented as a graph, with