Skip to content

fixed!#222

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

Merged
melonora merged 2 commits into from
Mar 19, 2024
Merged

fixed! #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da7c1b3
fixed!
melonora Mar 19, 2024
1ee3d17
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 2024
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
4 changes: 2 additions & 2 deletions src/spatialdata_plot/pl/render.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ def _render_shapes(
value_to_plot=render_params.col_for_color[index],
groups=render_params.groups[index] if render_params.groups[index][0] is not None else None,
palette=render_params.palette[index]
if render_params.palette is not None and render_params.palette[index][0] is not None
else None,
if render_params.palette is not None
else None, # and render_params.palette[index][0] is not None
na_color=render_params.color[index] or render_params.cmap_params.na_color,
cmap_params=render_params.cmap_params,
table_name=table_name,
Expand Down
22 changes: 17 additions & 5 deletions src/spatialdata_plot/pl/utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -618,7 +618,7 @@ def _set_color_source_vec(

# numerical case, return early
if color_source_vector is not None and not isinstance(color_source_vector.dtype, pd.CategoricalDtype):
if palette[element_index][0] is not None:
if palette[0] is not None:
logger.warning(
"Ignoring categorical palette which is given for a continuous variable. "
"Consider using `cmap` to pass a ColorMap."
Expand All@@ -632,7 +632,16 @@ def _set_color_source_vec(
color_source_vector = color_source_vector.remove_categories(categories.difference(groups))
categories = groups

color_map = dict(zip(categories, _get_colors_for_categorical_obs(categories, palette, cmap_params=cmap_params)))
if groups is not None:
palette_input = palette[0] if palette[0] is None else palette
elif palette is not None:
palette_input = palette[0]
else:
palette_input = palette

color_map = dict(
zip(categories, _get_colors_for_categorical_obs(categories, palette_input, cmap_params=cmap_params))
)

if color_map is None:
raise ValueError("Unable to create color palette.")
Expand DownExpand Up@@ -1797,6 +1806,8 @@ def _match_length_elements_groups_palette(
params.groups = [groups[0] for _ in range(len(render_elements))]
if palette is not None:
params.palette = [palette[0] for _ in range(len(render_elements))]
else:
params.palette = [[None] for _ in range(len(render_elements))]
else:
if len(groups) != len(render_elements):
raise ValueError(
Expand DownExpand Up@@ -1835,7 +1846,8 @@ def _update_params(sdata, params, wanted_elements_on_cs, element_type: Literal["
else:
params = _validate_colors_element_table_mapping_points_shapes(sdata, params, wanted_elements_on_cs)

if params.palette is None:
params.palette = [[None] for _ in wanted_elements_on_cs]
# if params.palette is None:
# params.palette = [[None] for _ in wanted_elements_on_cs]
image_flag = element_type == "images"
return _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
params = _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
return params
, '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" + '
fixed! by melonora · Pull Request #222 · scverse/spatialdata-plot · GitHub
Skip to content
fixed!#222

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

 Merged

melonora
merged 2 commits into

from

Mar 19, 2024
 Merged


fixed!
#222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da7c1b3

fixed!


melonora Mar 19, 2024
1ee3d17

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 19, 2024

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


4 changes: 2 additions & 2 deletions
src/spatialdata_plot/pl/render.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ def _render_shapes(
 value_to_plot=render_params.col_for_color[index],
 groups=render_params.groups[index] if render_params.groups[index][0] is not None else None,
 palette=render_params.palette[index]
 if render_params.palette is not None and render_params.palette[index][0] is not None
 else None,
 if render_params.palette is not None
 else None, # and render_params.palette[index][0] is not None
 na_color=render_params.color[index] or render_params.cmap_params.na_color,
 cmap_params=render_params.cmap_params,
 table_name=table_name,
Expand Down

22 changes: 17 additions & 5 deletions
src/spatialdata_plot/pl/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -618,7 +618,7 @@ def _set_color_source_vec(

 # numerical case, return early
 if color_source_vector is not None and not isinstance(color_source_vector.dtype, pd.CategoricalDtype):
 if palette[element_index][0] is not None:
 if palette[0] is not None:
 logger.warning(
 "Ignoring categorical palette which is given for a continuous variable. "
 "Consider using `cmap` to pass a ColorMap."
Expand All@@ -632,7 +632,16 @@ def _set_color_source_vec(
 color_source_vector = color_source_vector.remove_categories(categories.difference(groups))
 categories = groups

 color_map = dict(zip(categories, _get_colors_for_categorical_obs(categories, palette, cmap_params=cmap_params)))
 if groups is not None:
 palette_input = palette[0] if palette[0] is None else palette
 elif palette is not None:
 palette_input = palette[0]
 else:
 palette_input = palette

 color_map = dict(
 zip(categories, _get_colors_for_categorical_obs(categories, palette_input, cmap_params=cmap_params))
 )

 if color_map is None:
 raise ValueError("Unable to create color palette.")
Expand DownExpand Up@@ -1797,6 +1806,8 @@ def _match_length_elements_groups_palette(
 params.groups = [groups[0] for _ in range(len(render_elements))]
 if palette is not None:
 params.palette = [palette[0] for _ in range(len(render_elements))]
 else:
 params.palette = [[None] for _ in range(len(render_elements))]
 else:
 if len(groups) != len(render_elements):
 raise ValueError(
Expand DownExpand Up@@ -1835,7 +1846,8 @@ def _update_params(sdata, params, wanted_elements_on_cs, element_type: Literal["
 else:
 params = _validate_colors_element_table_mapping_points_shapes(sdata, params, wanted_elements_on_cs)

 if params.palette is None:
 params.palette = [[None] for _ in wanted_elements_on_cs]
# if params.palette is None:
#  params.palette = [[None] for _ in wanted_elements_on_cs]
 image_flag = element_type == "images"
 return _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 params = _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 return params

, '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('^' + ".*" + '
fixed! by melonora · Pull Request #222 · scverse/spatialdata-plot · GitHub
Skip to content
fixed!#222

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

 Merged

melonora
merged 2 commits into

from

Mar 19, 2024
 Merged


fixed!
#222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da7c1b3

fixed!


melonora Mar 19, 2024
1ee3d17

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 19, 2024

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


4 changes: 2 additions & 2 deletions
src/spatialdata_plot/pl/render.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ def _render_shapes(
 value_to_plot=render_params.col_for_color[index],
 groups=render_params.groups[index] if render_params.groups[index][0] is not None else None,
 palette=render_params.palette[index]
 if render_params.palette is not None and render_params.palette[index][0] is not None
 else None,
 if render_params.palette is not None
 else None, # and render_params.palette[index][0] is not None
 na_color=render_params.color[index] or render_params.cmap_params.na_color,
 cmap_params=render_params.cmap_params,
 table_name=table_name,
Expand Down

22 changes: 17 additions & 5 deletions
src/spatialdata_plot/pl/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -618,7 +618,7 @@ def _set_color_source_vec(

 # numerical case, return early
 if color_source_vector is not None and not isinstance(color_source_vector.dtype, pd.CategoricalDtype):
 if palette[element_index][0] is not None:
 if palette[0] is not None:
 logger.warning(
 "Ignoring categorical palette which is given for a continuous variable. "
 "Consider using `cmap` to pass a ColorMap."
Expand All@@ -632,7 +632,16 @@ def _set_color_source_vec(
 color_source_vector = color_source_vector.remove_categories(categories.difference(groups))
 categories = groups

 color_map = dict(zip(categories, _get_colors_for_categorical_obs(categories, palette, cmap_params=cmap_params)))
 if groups is not None:
 palette_input = palette[0] if palette[0] is None else palette
 elif palette is not None:
 palette_input = palette[0]
 else:
 palette_input = palette

 color_map = dict(
 zip(categories, _get_colors_for_categorical_obs(categories, palette_input, cmap_params=cmap_params))
 )

 if color_map is None:
 raise ValueError("Unable to create color palette.")
Expand DownExpand Up@@ -1797,6 +1806,8 @@ def _match_length_elements_groups_palette(
 params.groups = [groups[0] for _ in range(len(render_elements))]
 if palette is not None:
 params.palette = [palette[0] for _ in range(len(render_elements))]
 else:
 params.palette = [[None] for _ in range(len(render_elements))]
 else:
 if len(groups) != len(render_elements):
 raise ValueError(
Expand DownExpand Up@@ -1835,7 +1846,8 @@ def _update_params(sdata, params, wanted_elements_on_cs, element_type: Literal["
 else:
 params = _validate_colors_element_table_mapping_points_shapes(sdata, params, wanted_elements_on_cs)

 if params.palette is None:
 params.palette = [[None] for _ in wanted_elements_on_cs]
# if params.palette is None:
#  params.palette = [[None] for _ in wanted_elements_on_cs]
 image_flag = element_type == "images"
 return _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 params = _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 return params

, '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('^' + ".*" + '
fixed! by melonora · Pull Request #222 · scverse/spatialdata-plot · GitHub
Skip to content
fixed!#222

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

 Merged

melonora
merged 2 commits into

from

Mar 19, 2024
 Merged


fixed!
#222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da7c1b3

fixed!


melonora Mar 19, 2024
1ee3d17

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 19, 2024

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


4 changes: 2 additions & 2 deletions
src/spatialdata_plot/pl/render.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ def _render_shapes(
 value_to_plot=render_params.col_for_color[index],
 groups=render_params.groups[index] if render_params.groups[index][0] is not None else None,
 palette=render_params.palette[index]
 if render_params.palette is not None and render_params.palette[index][0] is not None
 else None,
 if render_params.palette is not None
 else None, # and render_params.palette[index][0] is not None
 na_color=render_params.color[index] or render_params.cmap_params.na_color,
 cmap_params=render_params.cmap_params,
 table_name=table_name,
Expand Down

22 changes: 17 additions & 5 deletions
src/spatialdata_plot/pl/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -618,7 +618,7 @@ def _set_color_source_vec(

 # numerical case, return early
 if color_source_vector is not None and not isinstance(color_source_vector.dtype, pd.CategoricalDtype):
 if palette[element_index][0] is not None:
 if palette[0] is not None:
 logger.warning(
 "Ignoring categorical palette which is given for a continuous variable. "
 "Consider using `cmap` to pass a ColorMap."
Expand All@@ -632,7 +632,16 @@ def _set_color_source_vec(
 color_source_vector = color_source_vector.remove_categories(categories.difference(groups))
 categories = groups

 color_map = dict(zip(categories, _get_colors_for_categorical_obs(categories, palette, cmap_params=cmap_params)))
 if groups is not None:
 palette_input = palette[0] if palette[0] is None else palette
 elif palette is not None:
 palette_input = palette[0]
 else:
 palette_input = palette

 color_map = dict(
 zip(categories, _get_colors_for_categorical_obs(categories, palette_input, cmap_params=cmap_params))
 )

 if color_map is None:
 raise ValueError("Unable to create color palette.")
Expand DownExpand Up@@ -1797,6 +1806,8 @@ def _match_length_elements_groups_palette(
 params.groups = [groups[0] for _ in range(len(render_elements))]
 if palette is not None:
 params.palette = [palette[0] for _ in range(len(render_elements))]
 else:
 params.palette = [[None] for _ in range(len(render_elements))]
 else:
 if len(groups) != len(render_elements):
 raise ValueError(
Expand DownExpand Up@@ -1835,7 +1846,8 @@ def _update_params(sdata, params, wanted_elements_on_cs, element_type: Literal["
 else:
 params = _validate_colors_element_table_mapping_points_shapes(sdata, params, wanted_elements_on_cs)

 if params.palette is None:
 params.palette = [[None] for _ in wanted_elements_on_cs]
# if params.palette is None:
#  params.palette = [[None] for _ in wanted_elements_on_cs]
 image_flag = element_type == "images"
 return _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 params = _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 return params

, '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" + '
fixed! by melonora · Pull Request #222 · scverse/spatialdata-plot · GitHub
Skip to content
fixed!#222

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

 Merged

melonora
merged 2 commits into

from

Mar 19, 2024
 Merged


fixed!
#222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da7c1b3

fixed!


melonora Mar 19, 2024
1ee3d17

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 19, 2024

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


4 changes: 2 additions & 2 deletions
src/spatialdata_plot/pl/render.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ def _render_shapes(
 value_to_plot=render_params.col_for_color[index],
 groups=render_params.groups[index] if render_params.groups[index][0] is not None else None,
 palette=render_params.palette[index]
 if render_params.palette is not None and render_params.palette[index][0] is not None
 else None,
 if render_params.palette is not None
 else None, # and render_params.palette[index][0] is not None
 na_color=render_params.color[index] or render_params.cmap_params.na_color,
 cmap_params=render_params.cmap_params,
 table_name=table_name,
Expand Down

22 changes: 17 additions & 5 deletions
src/spatialdata_plot/pl/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -618,7 +618,7 @@ def _set_color_source_vec(

 # numerical case, return early
 if color_source_vector is not None and not isinstance(color_source_vector.dtype, pd.CategoricalDtype):
 if palette[element_index][0] is not None:
 if palette[0] is not None:
 logger.warning(
 "Ignoring categorical palette which is given for a continuous variable. "
 "Consider using `cmap` to pass a ColorMap."
Expand All@@ -632,7 +632,16 @@ def _set_color_source_vec(
 color_source_vector = color_source_vector.remove_categories(categories.difference(groups))
 categories = groups

 color_map = dict(zip(categories, _get_colors_for_categorical_obs(categories, palette, cmap_params=cmap_params)))
 if groups is not None:
 palette_input = palette[0] if palette[0] is None else palette
 elif palette is not None:
 palette_input = palette[0]
 else:
 palette_input = palette

 color_map = dict(
 zip(categories, _get_colors_for_categorical_obs(categories, palette_input, cmap_params=cmap_params))
 )

 if color_map is None:
 raise ValueError("Unable to create color palette.")
Expand DownExpand Up@@ -1797,6 +1806,8 @@ def _match_length_elements_groups_palette(
 params.groups = [groups[0] for _ in range(len(render_elements))]
 if palette is not None:
 params.palette = [palette[0] for _ in range(len(render_elements))]
 else:
 params.palette = [[None] for _ in range(len(render_elements))]
 else:
 if len(groups) != len(render_elements):
 raise ValueError(
Expand DownExpand Up@@ -1835,7 +1846,8 @@ def _update_params(sdata, params, wanted_elements_on_cs, element_type: Literal["
 else:
 params = _validate_colors_element_table_mapping_points_shapes(sdata, params, wanted_elements_on_cs)

 if params.palette is None:
 params.palette = [[None] for _ in wanted_elements_on_cs]
# if params.palette is None:
#  params.palette = [[None] for _ in wanted_elements_on_cs]
 image_flag = element_type == "images"
 return _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 params = _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 return params

, '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('^' + ".*" + '
fixed! by melonora · Pull Request #222 · scverse/spatialdata-plot · GitHub
Skip to content
fixed!#222

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

 Merged

melonora
merged 2 commits into

from

Mar 19, 2024
 Merged


fixed!
#222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da7c1b3

fixed!


melonora Mar 19, 2024
1ee3d17

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 19, 2024

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


4 changes: 2 additions & 2 deletions
src/spatialdata_plot/pl/render.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ def _render_shapes(
 value_to_plot=render_params.col_for_color[index],
 groups=render_params.groups[index] if render_params.groups[index][0] is not None else None,
 palette=render_params.palette[index]
 if render_params.palette is not None and render_params.palette[index][0] is not None
 else None,
 if render_params.palette is not None
 else None, # and render_params.palette[index][0] is not None
 na_color=render_params.color[index] or render_params.cmap_params.na_color,
 cmap_params=render_params.cmap_params,
 table_name=table_name,
Expand Down

22 changes: 17 additions & 5 deletions
src/spatialdata_plot/pl/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -618,7 +618,7 @@ def _set_color_source_vec(

 # numerical case, return early
 if color_source_vector is not None and not isinstance(color_source_vector.dtype, pd.CategoricalDtype):
 if palette[element_index][0] is not None:
 if palette[0] is not None:
 logger.warning(
 "Ignoring categorical palette which is given for a continuous variable. "
 "Consider using `cmap` to pass a ColorMap."
Expand All@@ -632,7 +632,16 @@ def _set_color_source_vec(
 color_source_vector = color_source_vector.remove_categories(categories.difference(groups))
 categories = groups

 color_map = dict(zip(categories, _get_colors_for_categorical_obs(categories, palette, cmap_params=cmap_params)))
 if groups is not None:
 palette_input = palette[0] if palette[0] is None else palette
 elif palette is not None:
 palette_input = palette[0]
 else:
 palette_input = palette

 color_map = dict(
 zip(categories, _get_colors_for_categorical_obs(categories, palette_input, cmap_params=cmap_params))
 )

 if color_map is None:
 raise ValueError("Unable to create color palette.")
Expand DownExpand Up@@ -1797,6 +1806,8 @@ def _match_length_elements_groups_palette(
 params.groups = [groups[0] for _ in range(len(render_elements))]
 if palette is not None:
 params.palette = [palette[0] for _ in range(len(render_elements))]
 else:
 params.palette = [[None] for _ in range(len(render_elements))]
 else:
 if len(groups) != len(render_elements):
 raise ValueError(
Expand DownExpand Up@@ -1835,7 +1846,8 @@ def _update_params(sdata, params, wanted_elements_on_cs, element_type: Literal["
 else:
 params = _validate_colors_element_table_mapping_points_shapes(sdata, params, wanted_elements_on_cs)

 if params.palette is None:
 params.palette = [[None] for _ in wanted_elements_on_cs]
# if params.palette is None:
#  params.palette = [[None] for _ in wanted_elements_on_cs]
 image_flag = element_type == "images"
 return _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 params = _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 return params

, '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); }
})();
})();
fixed! by melonora · Pull Request #222 · scverse/spatialdata-plot · GitHub
Skip to content
fixed!#222

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

 Merged

melonora
merged 2 commits into

from

Mar 19, 2024
 Merged


fixed!
#222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da7c1b3

fixed!


melonora Mar 19, 2024
1ee3d17

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 19, 2024

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


4 changes: 2 additions & 2 deletions
src/spatialdata_plot/pl/render.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ def _render_shapes(
 value_to_plot=render_params.col_for_color[index],
 groups=render_params.groups[index] if render_params.groups[index][0] is not None else None,
 palette=render_params.palette[index]
 if render_params.palette is not None and render_params.palette[index][0] is not None
 else None,
 if render_params.palette is not None
 else None, # and render_params.palette[index][0] is not None
 na_color=render_params.color[index] or render_params.cmap_params.na_color,
 cmap_params=render_params.cmap_params,
 table_name=table_name,
Expand Down

22 changes: 17 additions & 5 deletions
src/spatialdata_plot/pl/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -618,7 +618,7 @@ def _set_color_source_vec(

 # numerical case, return early
 if color_source_vector is not None and not isinstance(color_source_vector.dtype, pd.CategoricalDtype):
 if palette[element_index][0] is not None:
 if palette[0] is not None:
 logger.warning(
 "Ignoring categorical palette which is given for a continuous variable. "
 "Consider using `cmap` to pass a ColorMap."
Expand All@@ -632,7 +632,16 @@ def _set_color_source_vec(
 color_source_vector = color_source_vector.remove_categories(categories.difference(groups))
 categories = groups

 color_map = dict(zip(categories, _get_colors_for_categorical_obs(categories, palette, cmap_params=cmap_params)))
 if groups is not None:
 palette_input = palette[0] if palette[0] is None else palette
 elif palette is not None:
 palette_input = palette[0]
 else:
 palette_input = palette

 color_map = dict(
 zip(categories, _get_colors_for_categorical_obs(categories, palette_input, cmap_params=cmap_params))
 )

 if color_map is None:
 raise ValueError("Unable to create color palette.")
Expand DownExpand Up@@ -1797,6 +1806,8 @@ def _match_length_elements_groups_palette(
 params.groups = [groups[0] for _ in range(len(render_elements))]
 if palette is not None:
 params.palette = [palette[0] for _ in range(len(render_elements))]
 else:
 params.palette = [[None] for _ in range(len(render_elements))]
 else:
 if len(groups) != len(render_elements):
 raise ValueError(
Expand DownExpand Up@@ -1835,7 +1846,8 @@ def _update_params(sdata, params, wanted_elements_on_cs, element_type: Literal["
 else:
 params = _validate_colors_element_table_mapping_points_shapes(sdata, params, wanted_elements_on_cs)

 if params.palette is None:
 params.palette = [[None] for _ in wanted_elements_on_cs]
# if params.palette is None:
#  params.palette = [[None] for _ in wanted_elements_on_cs]
 image_flag = element_type == "images"
 return _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 params = _match_length_elements_groups_palette(params, wanted_elements_on_cs, image=image_flag)
 return params