Skip to content

Fix importlib.resources calls for colormap data #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xylar wants to merge 1 commit into from
Closed

Fix importlib.resources calls for colormap data #1075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions mpas_analysis/shared/plot/colormap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,9 @@ def register_custom_colormaps():
'grayC', 'hawaii', 'imola', 'lajolla', 'lapaz', 'lisbon',
'nuuk', 'oleron', 'oslo', 'roma', 'romaO', 'tofino',
'tokyo', 'turku', 'vanimo', 'vik', 'vikO']:
filename = f'ScientificColourMaps7/{map_name}/{map_name}_PARAVIEW.xml'
with importlib.resources.path(__package__, filename) as xml_file:
package = f'mpas_analysis.shared.plot.ScientificColourMaps7.{map_name}'
filename = f'{map_name}_PARAVIEW.xml'
with importlib.resources.path(package, filename) as xml_file:
_read_xml_colormap(xml_file, map_name)

# add SciVisColor colormaps from
Expand All @@ -302,17 +303,19 @@ def register_custom_colormaps():
'green-7', 'green-8', 'orange-5', 'orange-6',
'orange-green-blue-gray', 'purple-7', 'purple-8', 'red-1',
'red-3', 'red-4', 'yellow-1', 'yellow-7']:
filename = f'SciVisColorColormaps/{map_name}.xml'
with importlib.resources.path(__package__, filename) as xml_file:
package = 'mpas_analysis.shared.plot.SciVisColorColormaps'
filename = f'{map_name}.xml'
with importlib.resources.path(package, filename) as xml_file:
_read_xml_colormap(xml_file, map_name)

# add SciVisColor colormaps created by hand using
# https://sciviscolor.org/color-moves-app/
for map_name in ['3wave-green-red-purple', '3wave-blue-red-brown',
'div-one-third-blue-two-thirds-red',
'div-one-third-green-two-thirds-red',]:
filename = f'SciVisColorCustom/{map_name}.xml'
with importlib.resources.path(__package__, filename) as xml_file:
package = 'mpas_analysis.shared.plot.SciVisColorCustom'
filename = f'{map_name}.xml'
with importlib.resources.path(package, filename) as xml_file:
_read_xml_colormap(xml_file, map_name)

name = 'white_cmo_deep'
Expand Down
Loading