Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning][].

### Added

- Added utils function for 0-transparent cmaps (#302)

### Changed

-
Expand Down
23 changes: 23 additions & 0 deletions src/spatialdata_plot/pl/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from typing import Any, Literal, Union

import matplotlib
import matplotlib.cm as cm
import matplotlib.patches as mpatches
import matplotlib.patches as mplp
import matplotlib.path as mpath
Expand DownExpand Up@@ -1961,3 +1962,25 @@ def _ax_show_and_transform(
zorder=zorder,
)
im.set_transform(trans_data)


def set_zero_in_cmap_to_transparent(cmap: Colormap | str, steps: int | None = None) -> ListedColormap:
"""
Modify colormap so that 0s are transparent.

Parameters
----------
cmap (Colormap | str): A matplotlib Colormap instance or a colormap name string.
steps (int): The number of steps in the colormap.

Returns
-------
ListedColormap: A new colormap instance with modified alpha values.
"""
if isinstance(cmap, str):
cmap = cm.get_cmap(cmap)

colors = cmap(np.arange(steps or cmap.N))
colors[0, :] = [1.0, 1.0, 1.0, 0.0]

return ListedColormap(colors)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 57 additions & 13 deletions tests/pl/test_utils.py
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,58 @@
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import pytest
from spatialdata.datasets import blobs


@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_set_outline_accepts_str_or_float_or_list_thereof(outline_color):
sdata = blobs()
sdata.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()
import scanpy as sc
import spatialdata_plot
from spatialdata import SpatialData

from tests.conftest import DPI, PlotTester, PlotTesterMeta

RNG = np.random.default_rng(seed=42)
sc.pl.set_rcParams_defaults()
sc.set_figure_params(dpi=DPI, color_map="viridis")
matplotlib.use("agg") # same as GitHub action runner
_ = spatialdata_plot

# WARNING:
# 1. all classes must both subclass PlotTester and use metaclass=PlotTesterMeta
# 2. tests which produce a plot must be prefixed with `test_plot_`
# 3. if the tolerance needs to be changed, don't prefix the function with `test_plot_`, but with something else
# the comp. function can be accessed as `self.compare(<your_filename>, tolerance=<your_tolerance>)`
# ".png" is appended to <your_filename>, no need to set it


class TestUtils(PlotTester, metaclass=PlotTesterMeta):
@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_plot_set_outline_accepts_str_or_float_or_list_thereof(self, sdata_blobs: SpatialData, outline_color):
sdata_blobs.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()

def test_plot_can_set_zero_in_cmap_to_transparent(self, sdata_blobs: SpatialData):
from spatialdata_plot.pl.utils import set_zero_in_cmap_to_transparent

# set up figure and modify the data to add 0s
fig, axs = plt.subplots(ncols=2, figsize=(6, 3))
table = sdata_blobs.table.copy()
x = table.X.todense()
x[:10, 0] = 0
table.X = x
sdata_blobs.tables["modified_table"] = table

# create a new cmap with 0 as transparent
new_cmap = set_zero_in_cmap_to_transparent(cmap="plasma")

# baseline img
sdata_blobs.pl.render_labels("blobs_labels", color="channel_0_sum", cmap="viridis", table="table").pl.show(
ax=axs[0], colorbar=False
)

# image with 0s as transparent, so some labels are "missing"
sdata_blobs.pl.render_labels(
"blobs_labels", color="channel_0_sum", cmap=new_cmap, table="modified_table"
).pl.show(ax=axs[1], colorbar=False)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Added utils function for 0-transparent cmaps by timtreis · Pull Request #302 · scverse/spatialdata-plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning][].

### Added

- Added utils function for 0-transparent cmaps (#302)

### Changed

-
Expand Down
23 changes: 23 additions & 0 deletions src/spatialdata_plot/pl/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from typing import Any, Literal, Union

import matplotlib
import matplotlib.cm as cm
import matplotlib.patches as mpatches
import matplotlib.patches as mplp
import matplotlib.path as mpath
Expand DownExpand Up@@ -1961,3 +1962,25 @@ def _ax_show_and_transform(
zorder=zorder,
)
im.set_transform(trans_data)


def set_zero_in_cmap_to_transparent(cmap: Colormap | str, steps: int | None = None) -> ListedColormap:
"""
Modify colormap so that 0s are transparent.

Parameters
----------
cmap (Colormap | str): A matplotlib Colormap instance or a colormap name string.
steps (int): The number of steps in the colormap.

Returns
-------
ListedColormap: A new colormap instance with modified alpha values.
"""
if isinstance(cmap, str):
cmap = cm.get_cmap(cmap)

colors = cmap(np.arange(steps or cmap.N))
colors[0, :] = [1.0, 1.0, 1.0, 0.0]

return ListedColormap(colors)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 57 additions & 13 deletions tests/pl/test_utils.py
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,58 @@
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import pytest
from spatialdata.datasets import blobs


@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_set_outline_accepts_str_or_float_or_list_thereof(outline_color):
sdata = blobs()
sdata.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()
import scanpy as sc
import spatialdata_plot
from spatialdata import SpatialData

from tests.conftest import DPI, PlotTester, PlotTesterMeta

RNG = np.random.default_rng(seed=42)
sc.pl.set_rcParams_defaults()
sc.set_figure_params(dpi=DPI, color_map="viridis")
matplotlib.use("agg") # same as GitHub action runner
_ = spatialdata_plot

# WARNING:
# 1. all classes must both subclass PlotTester and use metaclass=PlotTesterMeta
# 2. tests which produce a plot must be prefixed with `test_plot_`
# 3. if the tolerance needs to be changed, don't prefix the function with `test_plot_`, but with something else
# the comp. function can be accessed as `self.compare(<your_filename>, tolerance=<your_tolerance>)`
# ".png" is appended to <your_filename>, no need to set it


class TestUtils(PlotTester, metaclass=PlotTesterMeta):
@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_plot_set_outline_accepts_str_or_float_or_list_thereof(self, sdata_blobs: SpatialData, outline_color):
sdata_blobs.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()

def test_plot_can_set_zero_in_cmap_to_transparent(self, sdata_blobs: SpatialData):
from spatialdata_plot.pl.utils import set_zero_in_cmap_to_transparent

# set up figure and modify the data to add 0s
fig, axs = plt.subplots(ncols=2, figsize=(6, 3))
table = sdata_blobs.table.copy()
x = table.X.todense()
x[:10, 0] = 0
table.X = x
sdata_blobs.tables["modified_table"] = table

# create a new cmap with 0 as transparent
new_cmap = set_zero_in_cmap_to_transparent(cmap="plasma")

# baseline img
sdata_blobs.pl.render_labels("blobs_labels", color="channel_0_sum", cmap="viridis", table="table").pl.show(
ax=axs[0], colorbar=False
)

# image with 0s as transparent, so some labels are "missing"
sdata_blobs.pl.render_labels(
"blobs_labels", color="channel_0_sum", cmap=new_cmap, table="modified_table"
).pl.show(ax=axs[1], colorbar=False)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Added utils function for 0-transparent cmaps by timtreis · Pull Request #302 · scverse/spatialdata-plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning][].

### Added

- Added utils function for 0-transparent cmaps (#302)

### Changed

-
Expand Down
23 changes: 23 additions & 0 deletions src/spatialdata_plot/pl/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from typing import Any, Literal, Union

import matplotlib
import matplotlib.cm as cm
import matplotlib.patches as mpatches
import matplotlib.patches as mplp
import matplotlib.path as mpath
Expand DownExpand Up@@ -1961,3 +1962,25 @@ def _ax_show_and_transform(
zorder=zorder,
)
im.set_transform(trans_data)


def set_zero_in_cmap_to_transparent(cmap: Colormap | str, steps: int | None = None) -> ListedColormap:
"""
Modify colormap so that 0s are transparent.

Parameters
----------
cmap (Colormap | str): A matplotlib Colormap instance or a colormap name string.
steps (int): The number of steps in the colormap.

Returns
-------
ListedColormap: A new colormap instance with modified alpha values.
"""
if isinstance(cmap, str):
cmap = cm.get_cmap(cmap)

colors = cmap(np.arange(steps or cmap.N))
colors[0, :] = [1.0, 1.0, 1.0, 0.0]

return ListedColormap(colors)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 57 additions & 13 deletions tests/pl/test_utils.py
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,58 @@
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import pytest
from spatialdata.datasets import blobs


@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_set_outline_accepts_str_or_float_or_list_thereof(outline_color):
sdata = blobs()
sdata.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()
import scanpy as sc
import spatialdata_plot
from spatialdata import SpatialData

from tests.conftest import DPI, PlotTester, PlotTesterMeta

RNG = np.random.default_rng(seed=42)
sc.pl.set_rcParams_defaults()
sc.set_figure_params(dpi=DPI, color_map="viridis")
matplotlib.use("agg") # same as GitHub action runner
_ = spatialdata_plot

# WARNING:
# 1. all classes must both subclass PlotTester and use metaclass=PlotTesterMeta
# 2. tests which produce a plot must be prefixed with `test_plot_`
# 3. if the tolerance needs to be changed, don't prefix the function with `test_plot_`, but with something else
# the comp. function can be accessed as `self.compare(<your_filename>, tolerance=<your_tolerance>)`
# ".png" is appended to <your_filename>, no need to set it


class TestUtils(PlotTester, metaclass=PlotTesterMeta):
@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_plot_set_outline_accepts_str_or_float_or_list_thereof(self, sdata_blobs: SpatialData, outline_color):
sdata_blobs.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()

def test_plot_can_set_zero_in_cmap_to_transparent(self, sdata_blobs: SpatialData):
from spatialdata_plot.pl.utils import set_zero_in_cmap_to_transparent

# set up figure and modify the data to add 0s
fig, axs = plt.subplots(ncols=2, figsize=(6, 3))
table = sdata_blobs.table.copy()
x = table.X.todense()
x[:10, 0] = 0
table.X = x
sdata_blobs.tables["modified_table"] = table

# create a new cmap with 0 as transparent
new_cmap = set_zero_in_cmap_to_transparent(cmap="plasma")

# baseline img
sdata_blobs.pl.render_labels("blobs_labels", color="channel_0_sum", cmap="viridis", table="table").pl.show(
ax=axs[0], colorbar=False
)

# image with 0s as transparent, so some labels are "missing"
sdata_blobs.pl.render_labels(
"blobs_labels", color="channel_0_sum", cmap=new_cmap, table="modified_table"
).pl.show(ax=axs[1], colorbar=False)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Added utils function for 0-transparent cmaps by timtreis · Pull Request #302 · scverse/spatialdata-plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning][].

### Added

- Added utils function for 0-transparent cmaps (#302)

### Changed

-
Expand Down
23 changes: 23 additions & 0 deletions src/spatialdata_plot/pl/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from typing import Any, Literal, Union

import matplotlib
import matplotlib.cm as cm
import matplotlib.patches as mpatches
import matplotlib.patches as mplp
import matplotlib.path as mpath
Expand DownExpand Up@@ -1961,3 +1962,25 @@ def _ax_show_and_transform(
zorder=zorder,
)
im.set_transform(trans_data)


def set_zero_in_cmap_to_transparent(cmap: Colormap | str, steps: int | None = None) -> ListedColormap:
"""
Modify colormap so that 0s are transparent.

Parameters
----------
cmap (Colormap | str): A matplotlib Colormap instance or a colormap name string.
steps (int): The number of steps in the colormap.

Returns
-------
ListedColormap: A new colormap instance with modified alpha values.
"""
if isinstance(cmap, str):
cmap = cm.get_cmap(cmap)

colors = cmap(np.arange(steps or cmap.N))
colors[0, :] = [1.0, 1.0, 1.0, 0.0]

return ListedColormap(colors)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 57 additions & 13 deletions tests/pl/test_utils.py
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,58 @@
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import pytest
from spatialdata.datasets import blobs


@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_set_outline_accepts_str_or_float_or_list_thereof(outline_color):
sdata = blobs()
sdata.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()
import scanpy as sc
import spatialdata_plot
from spatialdata import SpatialData

from tests.conftest import DPI, PlotTester, PlotTesterMeta

RNG = np.random.default_rng(seed=42)
sc.pl.set_rcParams_defaults()
sc.set_figure_params(dpi=DPI, color_map="viridis")
matplotlib.use("agg") # same as GitHub action runner
_ = spatialdata_plot

# WARNING:
# 1. all classes must both subclass PlotTester and use metaclass=PlotTesterMeta
# 2. tests which produce a plot must be prefixed with `test_plot_`
# 3. if the tolerance needs to be changed, don't prefix the function with `test_plot_`, but with something else
# the comp. function can be accessed as `self.compare(<your_filename>, tolerance=<your_tolerance>)`
# ".png" is appended to <your_filename>, no need to set it


class TestUtils(PlotTester, metaclass=PlotTesterMeta):
@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_plot_set_outline_accepts_str_or_float_or_list_thereof(self, sdata_blobs: SpatialData, outline_color):
sdata_blobs.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()

def test_plot_can_set_zero_in_cmap_to_transparent(self, sdata_blobs: SpatialData):
from spatialdata_plot.pl.utils import set_zero_in_cmap_to_transparent

# set up figure and modify the data to add 0s
fig, axs = plt.subplots(ncols=2, figsize=(6, 3))
table = sdata_blobs.table.copy()
x = table.X.todense()
x[:10, 0] = 0
table.X = x
sdata_blobs.tables["modified_table"] = table

# create a new cmap with 0 as transparent
new_cmap = set_zero_in_cmap_to_transparent(cmap="plasma")

# baseline img
sdata_blobs.pl.render_labels("blobs_labels", color="channel_0_sum", cmap="viridis", table="table").pl.show(
ax=axs[0], colorbar=False
)

# image with 0s as transparent, so some labels are "missing"
sdata_blobs.pl.render_labels(
"blobs_labels", color="channel_0_sum", cmap=new_cmap, table="modified_table"
).pl.show(ax=axs[1], colorbar=False)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Added utils function for 0-transparent cmaps by timtreis · Pull Request #302 · scverse/spatialdata-plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning][].

### Added

- Added utils function for 0-transparent cmaps (#302)

### Changed

-
Expand Down
23 changes: 23 additions & 0 deletions src/spatialdata_plot/pl/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from typing import Any, Literal, Union

import matplotlib
import matplotlib.cm as cm
import matplotlib.patches as mpatches
import matplotlib.patches as mplp
import matplotlib.path as mpath
Expand DownExpand Up@@ -1961,3 +1962,25 @@ def _ax_show_and_transform(
zorder=zorder,
)
im.set_transform(trans_data)


def set_zero_in_cmap_to_transparent(cmap: Colormap | str, steps: int | None = None) -> ListedColormap:
"""
Modify colormap so that 0s are transparent.

Parameters
----------
cmap (Colormap | str): A matplotlib Colormap instance or a colormap name string.
steps (int): The number of steps in the colormap.

Returns
-------
ListedColormap: A new colormap instance with modified alpha values.
"""
if isinstance(cmap, str):
cmap = cm.get_cmap(cmap)

colors = cmap(np.arange(steps or cmap.N))
colors[0, :] = [1.0, 1.0, 1.0, 0.0]

return ListedColormap(colors)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 57 additions & 13 deletions tests/pl/test_utils.py
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,58 @@
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import pytest
from spatialdata.datasets import blobs


@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_set_outline_accepts_str_or_float_or_list_thereof(outline_color):
sdata = blobs()
sdata.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()
import scanpy as sc
import spatialdata_plot
from spatialdata import SpatialData

from tests.conftest import DPI, PlotTester, PlotTesterMeta

RNG = np.random.default_rng(seed=42)
sc.pl.set_rcParams_defaults()
sc.set_figure_params(dpi=DPI, color_map="viridis")
matplotlib.use("agg") # same as GitHub action runner
_ = spatialdata_plot

# WARNING:
# 1. all classes must both subclass PlotTester and use metaclass=PlotTesterMeta
# 2. tests which produce a plot must be prefixed with `test_plot_`
# 3. if the tolerance needs to be changed, don't prefix the function with `test_plot_`, but with something else
# the comp. function can be accessed as `self.compare(<your_filename>, tolerance=<your_tolerance>)`
# ".png" is appended to <your_filename>, no need to set it


class TestUtils(PlotTester, metaclass=PlotTesterMeta):
@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_plot_set_outline_accepts_str_or_float_or_list_thereof(self, sdata_blobs: SpatialData, outline_color):
sdata_blobs.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()

def test_plot_can_set_zero_in_cmap_to_transparent(self, sdata_blobs: SpatialData):
from spatialdata_plot.pl.utils import set_zero_in_cmap_to_transparent

# set up figure and modify the data to add 0s
fig, axs = plt.subplots(ncols=2, figsize=(6, 3))
table = sdata_blobs.table.copy()
x = table.X.todense()
x[:10, 0] = 0
table.X = x
sdata_blobs.tables["modified_table"] = table

# create a new cmap with 0 as transparent
new_cmap = set_zero_in_cmap_to_transparent(cmap="plasma")

# baseline img
sdata_blobs.pl.render_labels("blobs_labels", color="channel_0_sum", cmap="viridis", table="table").pl.show(
ax=axs[0], colorbar=False
)

# image with 0s as transparent, so some labels are "missing"
sdata_blobs.pl.render_labels(
"blobs_labels", color="channel_0_sum", cmap=new_cmap, table="modified_table"
).pl.show(ax=axs[1], colorbar=False)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Added utils function for 0-transparent cmaps by timtreis · Pull Request #302 · scverse/spatialdata-plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning][].

### Added

- Added utils function for 0-transparent cmaps (#302)

### Changed

-
Expand Down
23 changes: 23 additions & 0 deletions src/spatialdata_plot/pl/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from typing import Any, Literal, Union

import matplotlib
import matplotlib.cm as cm
import matplotlib.patches as mpatches
import matplotlib.patches as mplp
import matplotlib.path as mpath
Expand DownExpand Up@@ -1961,3 +1962,25 @@ def _ax_show_and_transform(
zorder=zorder,
)
im.set_transform(trans_data)


def set_zero_in_cmap_to_transparent(cmap: Colormap | str, steps: int | None = None) -> ListedColormap:
"""
Modify colormap so that 0s are transparent.

Parameters
----------
cmap (Colormap | str): A matplotlib Colormap instance or a colormap name string.
steps (int): The number of steps in the colormap.

Returns
-------
ListedColormap: A new colormap instance with modified alpha values.
"""
if isinstance(cmap, str):
cmap = cm.get_cmap(cmap)

colors = cmap(np.arange(steps or cmap.N))
colors[0, :] = [1.0, 1.0, 1.0, 0.0]

return ListedColormap(colors)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 57 additions & 13 deletions tests/pl/test_utils.py
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,58 @@
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import pytest
from spatialdata.datasets import blobs


@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_set_outline_accepts_str_or_float_or_list_thereof(outline_color):
sdata = blobs()
sdata.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()
import scanpy as sc
import spatialdata_plot
from spatialdata import SpatialData

from tests.conftest import DPI, PlotTester, PlotTesterMeta

RNG = np.random.default_rng(seed=42)
sc.pl.set_rcParams_defaults()
sc.set_figure_params(dpi=DPI, color_map="viridis")
matplotlib.use("agg") # same as GitHub action runner
_ = spatialdata_plot

# WARNING:
# 1. all classes must both subclass PlotTester and use metaclass=PlotTesterMeta
# 2. tests which produce a plot must be prefixed with `test_plot_`
# 3. if the tolerance needs to be changed, don't prefix the function with `test_plot_`, but with something else
# the comp. function can be accessed as `self.compare(<your_filename>, tolerance=<your_tolerance>)`
# ".png" is appended to <your_filename>, no need to set it


class TestUtils(PlotTester, metaclass=PlotTesterMeta):
@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_plot_set_outline_accepts_str_or_float_or_list_thereof(self, sdata_blobs: SpatialData, outline_color):
sdata_blobs.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()

def test_plot_can_set_zero_in_cmap_to_transparent(self, sdata_blobs: SpatialData):
from spatialdata_plot.pl.utils import set_zero_in_cmap_to_transparent

# set up figure and modify the data to add 0s
fig, axs = plt.subplots(ncols=2, figsize=(6, 3))
table = sdata_blobs.table.copy()
x = table.X.todense()
x[:10, 0] = 0
table.X = x
sdata_blobs.tables["modified_table"] = table

# create a new cmap with 0 as transparent
new_cmap = set_zero_in_cmap_to_transparent(cmap="plasma")

# baseline img
sdata_blobs.pl.render_labels("blobs_labels", color="channel_0_sum", cmap="viridis", table="table").pl.show(
ax=axs[0], colorbar=False
)

# image with 0s as transparent, so some labels are "missing"
sdata_blobs.pl.render_labels(
"blobs_labels", color="channel_0_sum", cmap=new_cmap, table="modified_table"
).pl.show(ax=axs[1], colorbar=False)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Added utils function for 0-transparent cmaps by timtreis · Pull Request #302 · scverse/spatialdata-plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning][].

### Added

- Added utils function for 0-transparent cmaps (#302)

### Changed

-
Expand Down
23 changes: 23 additions & 0 deletions src/spatialdata_plot/pl/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from typing import Any, Literal, Union

import matplotlib
import matplotlib.cm as cm
import matplotlib.patches as mpatches
import matplotlib.patches as mplp
import matplotlib.path as mpath
Expand DownExpand Up@@ -1961,3 +1962,25 @@ def _ax_show_and_transform(
zorder=zorder,
)
im.set_transform(trans_data)


def set_zero_in_cmap_to_transparent(cmap: Colormap | str, steps: int | None = None) -> ListedColormap:
"""
Modify colormap so that 0s are transparent.

Parameters
----------
cmap (Colormap | str): A matplotlib Colormap instance or a colormap name string.
steps (int): The number of steps in the colormap.

Returns
-------
ListedColormap: A new colormap instance with modified alpha values.
"""
if isinstance(cmap, str):
cmap = cm.get_cmap(cmap)

colors = cmap(np.arange(steps or cmap.N))
colors[0, :] = [1.0, 1.0, 1.0, 0.0]

return ListedColormap(colors)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 57 additions & 13 deletions tests/pl/test_utils.py
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,58 @@
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import pytest
from spatialdata.datasets import blobs


@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_set_outline_accepts_str_or_float_or_list_thereof(outline_color):
sdata = blobs()
sdata.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()
import scanpy as sc
import spatialdata_plot
from spatialdata import SpatialData

from tests.conftest import DPI, PlotTester, PlotTesterMeta

RNG = np.random.default_rng(seed=42)
sc.pl.set_rcParams_defaults()
sc.set_figure_params(dpi=DPI, color_map="viridis")
matplotlib.use("agg") # same as GitHub action runner
_ = spatialdata_plot

# WARNING:
# 1. all classes must both subclass PlotTester and use metaclass=PlotTesterMeta
# 2. tests which produce a plot must be prefixed with `test_plot_`
# 3. if the tolerance needs to be changed, don't prefix the function with `test_plot_`, but with something else
# the comp. function can be accessed as `self.compare(<your_filename>, tolerance=<your_tolerance>)`
# ".png" is appended to <your_filename>, no need to set it


class TestUtils(PlotTester, metaclass=PlotTesterMeta):
@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_plot_set_outline_accepts_str_or_float_or_list_thereof(self, sdata_blobs: SpatialData, outline_color):
sdata_blobs.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()

def test_plot_can_set_zero_in_cmap_to_transparent(self, sdata_blobs: SpatialData):
from spatialdata_plot.pl.utils import set_zero_in_cmap_to_transparent

# set up figure and modify the data to add 0s
fig, axs = plt.subplots(ncols=2, figsize=(6, 3))
table = sdata_blobs.table.copy()
x = table.X.todense()
x[:10, 0] = 0
table.X = x
sdata_blobs.tables["modified_table"] = table

# create a new cmap with 0 as transparent
new_cmap = set_zero_in_cmap_to_transparent(cmap="plasma")

# baseline img
sdata_blobs.pl.render_labels("blobs_labels", color="channel_0_sum", cmap="viridis", table="table").pl.show(
ax=axs[0], colorbar=False
)

# image with 0s as transparent, so some labels are "missing"
sdata_blobs.pl.render_labels(
"blobs_labels", color="channel_0_sum", cmap=new_cmap, table="modified_table"
).pl.show(ax=axs[1], colorbar=False)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Added utils function for 0-transparent cmaps by timtreis · Pull Request #302 · scverse/spatialdata-plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning][].

### Added

- Added utils function for 0-transparent cmaps (#302)

### Changed

-
Expand Down
23 changes: 23 additions & 0 deletions src/spatialdata_plot/pl/utils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from typing import Any, Literal, Union

import matplotlib
import matplotlib.cm as cm
import matplotlib.patches as mpatches
import matplotlib.patches as mplp
import matplotlib.path as mpath
Expand DownExpand Up@@ -1961,3 +1962,25 @@ def _ax_show_and_transform(
zorder=zorder,
)
im.set_transform(trans_data)


def set_zero_in_cmap_to_transparent(cmap: Colormap | str, steps: int | None = None) -> ListedColormap:
"""
Modify colormap so that 0s are transparent.

Parameters
----------
cmap (Colormap | str): A matplotlib Colormap instance or a colormap name string.
steps (int): The number of steps in the colormap.

Returns
-------
ListedColormap: A new colormap instance with modified alpha values.
"""
if isinstance(cmap, str):
cmap = cm.get_cmap(cmap)

colors = cmap(np.arange(steps or cmap.N))
colors[0, :] = [1.0, 1.0, 1.0, 0.0]

return ListedColormap(colors)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 57 additions & 13 deletions tests/pl/test_utils.py
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,58 @@
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import pytest
from spatialdata.datasets import blobs


@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_set_outline_accepts_str_or_float_or_list_thereof(outline_color):
sdata = blobs()
sdata.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()
import scanpy as sc
import spatialdata_plot
from spatialdata import SpatialData

from tests.conftest import DPI, PlotTester, PlotTesterMeta

RNG = np.random.default_rng(seed=42)
sc.pl.set_rcParams_defaults()
sc.set_figure_params(dpi=DPI, color_map="viridis")
matplotlib.use("agg") # same as GitHub action runner
_ = spatialdata_plot

# WARNING:
# 1. all classes must both subclass PlotTester and use metaclass=PlotTesterMeta
# 2. tests which produce a plot must be prefixed with `test_plot_`
# 3. if the tolerance needs to be changed, don't prefix the function with `test_plot_`, but with something else
# the comp. function can be accessed as `self.compare(<your_filename>, tolerance=<your_tolerance>)`
# ".png" is appended to <your_filename>, no need to set it


class TestUtils(PlotTester, metaclass=PlotTesterMeta):
@pytest.mark.parametrize(
"outline_color",
[
(0.0, 1.0, 0.0, 1.0),
"#00ff00",
],
)
def test_plot_set_outline_accepts_str_or_float_or_list_thereof(self, sdata_blobs: SpatialData, outline_color):
sdata_blobs.pl.render_shapes(element="blobs_polygons", outline=True, outline_color=outline_color).pl.show()

def test_plot_can_set_zero_in_cmap_to_transparent(self, sdata_blobs: SpatialData):
from spatialdata_plot.pl.utils import set_zero_in_cmap_to_transparent

# set up figure and modify the data to add 0s
fig, axs = plt.subplots(ncols=2, figsize=(6, 3))
table = sdata_blobs.table.copy()
x = table.X.todense()
x[:10, 0] = 0
table.X = x
sdata_blobs.tables["modified_table"] = table

# create a new cmap with 0 as transparent
new_cmap = set_zero_in_cmap_to_transparent(cmap="plasma")

# baseline img
sdata_blobs.pl.render_labels("blobs_labels", color="channel_0_sum", cmap="viridis", table="table").pl.show(
ax=axs[0], colorbar=False
)

# image with 0s as transparent, so some labels are "missing"
sdata_blobs.pl.render_labels(
"blobs_labels", color="channel_0_sum", cmap=new_cmap, table="modified_table"
).pl.show(ax=axs[1], colorbar=False)