Skip to content

Refactor of colorbar and norm logic - #346

Merged
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data
Sep 4, 2024
Merged

Refactor of colorbar and norm logic#346
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data

Conversation

@timtreis

@timtreistimtreis commented Sep 4, 2024

Copy link
Copy Markdown
Member

Unified norm logic across the 4 functions. Before, the render_images function would take a separate percentiles_for_norm argument (legacy reasons) which would/could interfere with whatever was passed to norm. As a consequence of this, I fixed some of the other resulting images.

@timtreistimtreis linked an issue Sep 4, 2024 that may be closed by this pull request
@codecov-commenter

codecov-commenter commented Sep 4, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.76%. Comparing base (393315b) to head (667c689).
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #346 +/- ##
==========================================
- Coverage 84.27% 83.76% -0.51% 
==========================================
Files 8 8 Lines 1558 1540 -18 ==========================================
- Hits 1313 1290 -23 - Misses 245 250 +5 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/basic.py90.86% <ø> (ø)
src/spatialdata_plot/pl/render.py94.72% <100.00%> (+0.31%)⬆️
src/spatialdata_plot/pl/utils.py76.16% <ø> (-1.13%)⬇️

Comment threadCHANGELOG.md Outdated

@melonoramelonora left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, though please check my comment also in #344 regarding the skimage issue. Also please add a PR description before merging with also the reasoning of getting rid of percentiles_for_norm:)

timtreisand others added 2 commits September 4, 2024 16:13
Co-authored-by: Wouter-Michiel Vierdag <w-mv@hotmail.com>
@timtreis
timtreis merged commit c6d6153 into mainSep 4, 2024
@timtreis
timtreis deleted the 324-unable-to-set-vmin-vmax-when-plotting-vector-data branch September 4, 2024 20:22
@clwgg

clwgg commented Sep 5, 2024

Copy link
Copy Markdown

Apologies for chiming in here again, but I'm curious about the decision to remove percentiles_for_norm, and I think it would be helpful to get some pointers on how its functionality should be replaced once I pull in these changes. I've found its capacity to do per-channel normalization quite helpful when there are extreme differences in the intensities of different markers. For example, using this:

sdata.pl.render_images(
'78_image',
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

I'd get an image like this:

Because of data like that, I've routinely started plotting like this:

sdata.pl.render_images(
'78_image',
percentiles_for_norm=(0, 100),
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

which for this example gives:

How would you achieve something like this using just the norm flag?

@timtreis

timtreis commented Sep 5, 2024

Copy link
Copy Markdown
MemberAuthor

Hm, interesting. Does passing a matplotlib Normalise achieve a different outcome? I've also modified the norm parameter to no longer be a flag but instead sth that you can pass a matplotlib.colors.Normalise object.

@timtreis

Copy link
Copy Markdown
MemberAuthor

One caveat that I see in that, this way, all channels are normalised based on the same vmin/vmax which might not necessarily work if your channels have different value ranges. We have a mostly undocumented transfunc parameter in one of the functions (currently on the go, will check later).

Is the goal to scale all channels to [0,1]? I'd be happy to build out that parameter for this purpose

@clwgg

clwgg commented Sep 6, 2024

Copy link
Copy Markdown

yeah exactly, I think having some control over which channels get which vmin/vmax would be super helpful. Even with percentiles_for_norm I've sometimes wondered how it would look if I could set a list of (pmin, pmax) tuples with the same length as channel, to have some more fine-grained control over which channels to highlight. I suppose something similar could be achieved if it was possible to set a list of Normalize objects with the same length as channel. But achieving the task of percentiles_for_norm(0, 100) (which I think would still be the most common use-case for me) would get a lot more wordy since I'd first have to figure out the per-channel vmin/vmax corresponding to each channels min and max, and instantiate the appropriate Normalize objects to hand off to render_images.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants

@timtreis@codecov-commenter@clwgg@melonora
, '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" + '
Refactor of `colorbar` and `norm` logic by timtreis · Pull Request #346 · scverse/spatialdata-plot · GitHub
Skip to content

Refactor of colorbar and norm logic - #346

Merged
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data
Sep 4, 2024
Merged

Refactor of colorbar and norm logic#346
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data

Conversation

@timtreis

@timtreistimtreis commented Sep 4, 2024

Copy link
Copy Markdown
Member

Unified norm logic across the 4 functions. Before, the render_images function would take a separate percentiles_for_norm argument (legacy reasons) which would/could interfere with whatever was passed to norm. As a consequence of this, I fixed some of the other resulting images.

@timtreistimtreis linked an issue Sep 4, 2024 that may be closed by this pull request
@codecov-commenter

codecov-commenter commented Sep 4, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.76%. Comparing base (393315b) to head (667c689).
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #346 +/- ##
==========================================
- Coverage 84.27% 83.76% -0.51% 
==========================================
Files 8 8 Lines 1558 1540 -18 ==========================================
- Hits 1313 1290 -23 - Misses 245 250 +5 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/basic.py90.86% <ø> (ø)
src/spatialdata_plot/pl/render.py94.72% <100.00%> (+0.31%)⬆️
src/spatialdata_plot/pl/utils.py76.16% <ø> (-1.13%)⬇️

Comment threadCHANGELOG.md Outdated

@melonoramelonora left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, though please check my comment also in #344 regarding the skimage issue. Also please add a PR description before merging with also the reasoning of getting rid of percentiles_for_norm:)

timtreisand others added 2 commits September 4, 2024 16:13
Co-authored-by: Wouter-Michiel Vierdag <w-mv@hotmail.com>
@timtreis
timtreis merged commit c6d6153 into mainSep 4, 2024
@timtreis
timtreis deleted the 324-unable-to-set-vmin-vmax-when-plotting-vector-data branch September 4, 2024 20:22
@clwgg

clwgg commented Sep 5, 2024

Copy link
Copy Markdown

Apologies for chiming in here again, but I'm curious about the decision to remove percentiles_for_norm, and I think it would be helpful to get some pointers on how its functionality should be replaced once I pull in these changes. I've found its capacity to do per-channel normalization quite helpful when there are extreme differences in the intensities of different markers. For example, using this:

sdata.pl.render_images(
'78_image',
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

I'd get an image like this:

Because of data like that, I've routinely started plotting like this:

sdata.pl.render_images(
'78_image',
percentiles_for_norm=(0, 100),
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

which for this example gives:

How would you achieve something like this using just the norm flag?

@timtreis

timtreis commented Sep 5, 2024

Copy link
Copy Markdown
MemberAuthor

Hm, interesting. Does passing a matplotlib Normalise achieve a different outcome? I've also modified the norm parameter to no longer be a flag but instead sth that you can pass a matplotlib.colors.Normalise object.

@timtreis

Copy link
Copy Markdown
MemberAuthor

One caveat that I see in that, this way, all channels are normalised based on the same vmin/vmax which might not necessarily work if your channels have different value ranges. We have a mostly undocumented transfunc parameter in one of the functions (currently on the go, will check later).

Is the goal to scale all channels to [0,1]? I'd be happy to build out that parameter for this purpose

@clwgg

clwgg commented Sep 6, 2024

Copy link
Copy Markdown

yeah exactly, I think having some control over which channels get which vmin/vmax would be super helpful. Even with percentiles_for_norm I've sometimes wondered how it would look if I could set a list of (pmin, pmax) tuples with the same length as channel, to have some more fine-grained control over which channels to highlight. I suppose something similar could be achieved if it was possible to set a list of Normalize objects with the same length as channel. But achieving the task of percentiles_for_norm(0, 100) (which I think would still be the most common use-case for me) would get a lot more wordy since I'd first have to figure out the per-channel vmin/vmax corresponding to each channels min and max, and instantiate the appropriate Normalize objects to hand off to render_images.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants

@timtreis@codecov-commenter@clwgg@melonora
, '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('^' + ".*" + ' Refactor of `colorbar` and `norm` logic by timtreis · Pull Request #346 · scverse/spatialdata-plot · GitHub
Skip to content

Refactor of colorbar and norm logic - #346

Merged
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data
Sep 4, 2024
Merged

Refactor of colorbar and norm logic#346
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data

Conversation

@timtreis

@timtreistimtreis commented Sep 4, 2024

Copy link
Copy Markdown
Member

Unified norm logic across the 4 functions. Before, the render_images function would take a separate percentiles_for_norm argument (legacy reasons) which would/could interfere with whatever was passed to norm. As a consequence of this, I fixed some of the other resulting images.

@timtreistimtreis linked an issue Sep 4, 2024 that may be closed by this pull request
@codecov-commenter

codecov-commenter commented Sep 4, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.76%. Comparing base (393315b) to head (667c689).
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #346 +/- ##
==========================================
- Coverage 84.27% 83.76% -0.51% 
==========================================
Files 8 8 Lines 1558 1540 -18 ==========================================
- Hits 1313 1290 -23 - Misses 245 250 +5 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/basic.py90.86% <ø> (ø)
src/spatialdata_plot/pl/render.py94.72% <100.00%> (+0.31%)⬆️
src/spatialdata_plot/pl/utils.py76.16% <ø> (-1.13%)⬇️

Comment threadCHANGELOG.md Outdated

@melonoramelonora left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, though please check my comment also in #344 regarding the skimage issue. Also please add a PR description before merging with also the reasoning of getting rid of percentiles_for_norm:)

timtreisand others added 2 commits September 4, 2024 16:13
Co-authored-by: Wouter-Michiel Vierdag <w-mv@hotmail.com>
@timtreis
timtreis merged commit c6d6153 into mainSep 4, 2024
@timtreis
timtreis deleted the 324-unable-to-set-vmin-vmax-when-plotting-vector-data branch September 4, 2024 20:22
@clwgg

clwgg commented Sep 5, 2024

Copy link
Copy Markdown

Apologies for chiming in here again, but I'm curious about the decision to remove percentiles_for_norm, and I think it would be helpful to get some pointers on how its functionality should be replaced once I pull in these changes. I've found its capacity to do per-channel normalization quite helpful when there are extreme differences in the intensities of different markers. For example, using this:

sdata.pl.render_images(
'78_image',
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

I'd get an image like this:

Because of data like that, I've routinely started plotting like this:

sdata.pl.render_images(
'78_image',
percentiles_for_norm=(0, 100),
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

which for this example gives:

How would you achieve something like this using just the norm flag?

@timtreis

timtreis commented Sep 5, 2024

Copy link
Copy Markdown
MemberAuthor

Hm, interesting. Does passing a matplotlib Normalise achieve a different outcome? I've also modified the norm parameter to no longer be a flag but instead sth that you can pass a matplotlib.colors.Normalise object.

@timtreis

Copy link
Copy Markdown
MemberAuthor

One caveat that I see in that, this way, all channels are normalised based on the same vmin/vmax which might not necessarily work if your channels have different value ranges. We have a mostly undocumented transfunc parameter in one of the functions (currently on the go, will check later).

Is the goal to scale all channels to [0,1]? I'd be happy to build out that parameter for this purpose

@clwgg

clwgg commented Sep 6, 2024

Copy link
Copy Markdown

yeah exactly, I think having some control over which channels get which vmin/vmax would be super helpful. Even with percentiles_for_norm I've sometimes wondered how it would look if I could set a list of (pmin, pmax) tuples with the same length as channel, to have some more fine-grained control over which channels to highlight. I suppose something similar could be achieved if it was possible to set a list of Normalize objects with the same length as channel. But achieving the task of percentiles_for_norm(0, 100) (which I think would still be the most common use-case for me) would get a lot more wordy since I'd first have to figure out the per-channel vmin/vmax corresponding to each channels min and max, and instantiate the appropriate Normalize objects to hand off to render_images.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants

@timtreis@codecov-commenter@clwgg@melonora
, '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('^' + ".*" + ' Refactor of `colorbar` and `norm` logic by timtreis · Pull Request #346 · scverse/spatialdata-plot · GitHub
Skip to content

Refactor of colorbar and norm logic - #346

Merged
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data
Sep 4, 2024
Merged

Refactor of colorbar and norm logic#346
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data

Conversation

@timtreis

@timtreistimtreis commented Sep 4, 2024

Copy link
Copy Markdown
Member

Unified norm logic across the 4 functions. Before, the render_images function would take a separate percentiles_for_norm argument (legacy reasons) which would/could interfere with whatever was passed to norm. As a consequence of this, I fixed some of the other resulting images.

@timtreistimtreis linked an issue Sep 4, 2024 that may be closed by this pull request
@codecov-commenter

codecov-commenter commented Sep 4, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.76%. Comparing base (393315b) to head (667c689).
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #346 +/- ##
==========================================
- Coverage 84.27% 83.76% -0.51% 
==========================================
Files 8 8 Lines 1558 1540 -18 ==========================================
- Hits 1313 1290 -23 - Misses 245 250 +5 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/basic.py90.86% <ø> (ø)
src/spatialdata_plot/pl/render.py94.72% <100.00%> (+0.31%)⬆️
src/spatialdata_plot/pl/utils.py76.16% <ø> (-1.13%)⬇️

Comment threadCHANGELOG.md Outdated

@melonoramelonora left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, though please check my comment also in #344 regarding the skimage issue. Also please add a PR description before merging with also the reasoning of getting rid of percentiles_for_norm:)

timtreisand others added 2 commits September 4, 2024 16:13
Co-authored-by: Wouter-Michiel Vierdag <w-mv@hotmail.com>
@timtreis
timtreis merged commit c6d6153 into mainSep 4, 2024
@timtreis
timtreis deleted the 324-unable-to-set-vmin-vmax-when-plotting-vector-data branch September 4, 2024 20:22
@clwgg

clwgg commented Sep 5, 2024

Copy link
Copy Markdown

Apologies for chiming in here again, but I'm curious about the decision to remove percentiles_for_norm, and I think it would be helpful to get some pointers on how its functionality should be replaced once I pull in these changes. I've found its capacity to do per-channel normalization quite helpful when there are extreme differences in the intensities of different markers. For example, using this:

sdata.pl.render_images(
'78_image',
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

I'd get an image like this:

Because of data like that, I've routinely started plotting like this:

sdata.pl.render_images(
'78_image',
percentiles_for_norm=(0, 100),
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

which for this example gives:

How would you achieve something like this using just the norm flag?

@timtreis

timtreis commented Sep 5, 2024

Copy link
Copy Markdown
MemberAuthor

Hm, interesting. Does passing a matplotlib Normalise achieve a different outcome? I've also modified the norm parameter to no longer be a flag but instead sth that you can pass a matplotlib.colors.Normalise object.

@timtreis

Copy link
Copy Markdown
MemberAuthor

One caveat that I see in that, this way, all channels are normalised based on the same vmin/vmax which might not necessarily work if your channels have different value ranges. We have a mostly undocumented transfunc parameter in one of the functions (currently on the go, will check later).

Is the goal to scale all channels to [0,1]? I'd be happy to build out that parameter for this purpose

@clwgg

clwgg commented Sep 6, 2024

Copy link
Copy Markdown

yeah exactly, I think having some control over which channels get which vmin/vmax would be super helpful. Even with percentiles_for_norm I've sometimes wondered how it would look if I could set a list of (pmin, pmax) tuples with the same length as channel, to have some more fine-grained control over which channels to highlight. I suppose something similar could be achieved if it was possible to set a list of Normalize objects with the same length as channel. But achieving the task of percentiles_for_norm(0, 100) (which I think would still be the most common use-case for me) would get a lot more wordy since I'd first have to figure out the per-channel vmin/vmax corresponding to each channels min and max, and instantiate the appropriate Normalize objects to hand off to render_images.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants

@timtreis@codecov-commenter@clwgg@melonora
, '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" + ' Refactor of `colorbar` and `norm` logic by timtreis · Pull Request #346 · scverse/spatialdata-plot · GitHub
Skip to content

Refactor of colorbar and norm logic - #346

Merged
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data
Sep 4, 2024
Merged

Refactor of colorbar and norm logic#346
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data

Conversation

@timtreis

@timtreistimtreis commented Sep 4, 2024

Copy link
Copy Markdown
Member

Unified norm logic across the 4 functions. Before, the render_images function would take a separate percentiles_for_norm argument (legacy reasons) which would/could interfere with whatever was passed to norm. As a consequence of this, I fixed some of the other resulting images.

@timtreistimtreis linked an issue Sep 4, 2024 that may be closed by this pull request
@codecov-commenter

codecov-commenter commented Sep 4, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.76%. Comparing base (393315b) to head (667c689).
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #346 +/- ##
==========================================
- Coverage 84.27% 83.76% -0.51% 
==========================================
Files 8 8 Lines 1558 1540 -18 ==========================================
- Hits 1313 1290 -23 - Misses 245 250 +5 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/basic.py90.86% <ø> (ø)
src/spatialdata_plot/pl/render.py94.72% <100.00%> (+0.31%)⬆️
src/spatialdata_plot/pl/utils.py76.16% <ø> (-1.13%)⬇️

Comment threadCHANGELOG.md Outdated

@melonoramelonora left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, though please check my comment also in #344 regarding the skimage issue. Also please add a PR description before merging with also the reasoning of getting rid of percentiles_for_norm:)

timtreisand others added 2 commits September 4, 2024 16:13
Co-authored-by: Wouter-Michiel Vierdag <w-mv@hotmail.com>
@timtreis
timtreis merged commit c6d6153 into mainSep 4, 2024
@timtreis
timtreis deleted the 324-unable-to-set-vmin-vmax-when-plotting-vector-data branch September 4, 2024 20:22
@clwgg

clwgg commented Sep 5, 2024

Copy link
Copy Markdown

Apologies for chiming in here again, but I'm curious about the decision to remove percentiles_for_norm, and I think it would be helpful to get some pointers on how its functionality should be replaced once I pull in these changes. I've found its capacity to do per-channel normalization quite helpful when there are extreme differences in the intensities of different markers. For example, using this:

sdata.pl.render_images(
'78_image',
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

I'd get an image like this:

Because of data like that, I've routinely started plotting like this:

sdata.pl.render_images(
'78_image',
percentiles_for_norm=(0, 100),
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

which for this example gives:

How would you achieve something like this using just the norm flag?

@timtreis

timtreis commented Sep 5, 2024

Copy link
Copy Markdown
MemberAuthor

Hm, interesting. Does passing a matplotlib Normalise achieve a different outcome? I've also modified the norm parameter to no longer be a flag but instead sth that you can pass a matplotlib.colors.Normalise object.

@timtreis

Copy link
Copy Markdown
MemberAuthor

One caveat that I see in that, this way, all channels are normalised based on the same vmin/vmax which might not necessarily work if your channels have different value ranges. We have a mostly undocumented transfunc parameter in one of the functions (currently on the go, will check later).

Is the goal to scale all channels to [0,1]? I'd be happy to build out that parameter for this purpose

@clwgg

clwgg commented Sep 6, 2024

Copy link
Copy Markdown

yeah exactly, I think having some control over which channels get which vmin/vmax would be super helpful. Even with percentiles_for_norm I've sometimes wondered how it would look if I could set a list of (pmin, pmax) tuples with the same length as channel, to have some more fine-grained control over which channels to highlight. I suppose something similar could be achieved if it was possible to set a list of Normalize objects with the same length as channel. But achieving the task of percentiles_for_norm(0, 100) (which I think would still be the most common use-case for me) would get a lot more wordy since I'd first have to figure out the per-channel vmin/vmax corresponding to each channels min and max, and instantiate the appropriate Normalize objects to hand off to render_images.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants

@timtreis@codecov-commenter@clwgg@melonora
, '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('^' + ".*" + ' Refactor of `colorbar` and `norm` logic by timtreis · Pull Request #346 · scverse/spatialdata-plot · GitHub
Skip to content

Refactor of colorbar and norm logic - #346

Merged
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data
Sep 4, 2024
Merged

Refactor of colorbar and norm logic#346
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data

Conversation

@timtreis

@timtreistimtreis commented Sep 4, 2024

Copy link
Copy Markdown
Member

Unified norm logic across the 4 functions. Before, the render_images function would take a separate percentiles_for_norm argument (legacy reasons) which would/could interfere with whatever was passed to norm. As a consequence of this, I fixed some of the other resulting images.

@timtreistimtreis linked an issue Sep 4, 2024 that may be closed by this pull request
@codecov-commenter

codecov-commenter commented Sep 4, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.76%. Comparing base (393315b) to head (667c689).
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #346 +/- ##
==========================================
- Coverage 84.27% 83.76% -0.51% 
==========================================
Files 8 8 Lines 1558 1540 -18 ==========================================
- Hits 1313 1290 -23 - Misses 245 250 +5 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/basic.py90.86% <ø> (ø)
src/spatialdata_plot/pl/render.py94.72% <100.00%> (+0.31%)⬆️
src/spatialdata_plot/pl/utils.py76.16% <ø> (-1.13%)⬇️

Comment threadCHANGELOG.md Outdated

@melonoramelonora left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, though please check my comment also in #344 regarding the skimage issue. Also please add a PR description before merging with also the reasoning of getting rid of percentiles_for_norm:)

timtreisand others added 2 commits September 4, 2024 16:13
Co-authored-by: Wouter-Michiel Vierdag <w-mv@hotmail.com>
@timtreis
timtreis merged commit c6d6153 into mainSep 4, 2024
@timtreis
timtreis deleted the 324-unable-to-set-vmin-vmax-when-plotting-vector-data branch September 4, 2024 20:22
@clwgg

clwgg commented Sep 5, 2024

Copy link
Copy Markdown

Apologies for chiming in here again, but I'm curious about the decision to remove percentiles_for_norm, and I think it would be helpful to get some pointers on how its functionality should be replaced once I pull in these changes. I've found its capacity to do per-channel normalization quite helpful when there are extreme differences in the intensities of different markers. For example, using this:

sdata.pl.render_images(
'78_image',
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

I'd get an image like this:

Because of data like that, I've routinely started plotting like this:

sdata.pl.render_images(
'78_image',
percentiles_for_norm=(0, 100),
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

which for this example gives:

How would you achieve something like this using just the norm flag?

@timtreis

timtreis commented Sep 5, 2024

Copy link
Copy Markdown
MemberAuthor

Hm, interesting. Does passing a matplotlib Normalise achieve a different outcome? I've also modified the norm parameter to no longer be a flag but instead sth that you can pass a matplotlib.colors.Normalise object.

@timtreis

Copy link
Copy Markdown
MemberAuthor

One caveat that I see in that, this way, all channels are normalised based on the same vmin/vmax which might not necessarily work if your channels have different value ranges. We have a mostly undocumented transfunc parameter in one of the functions (currently on the go, will check later).

Is the goal to scale all channels to [0,1]? I'd be happy to build out that parameter for this purpose

@clwgg

clwgg commented Sep 6, 2024

Copy link
Copy Markdown

yeah exactly, I think having some control over which channels get which vmin/vmax would be super helpful. Even with percentiles_for_norm I've sometimes wondered how it would look if I could set a list of (pmin, pmax) tuples with the same length as channel, to have some more fine-grained control over which channels to highlight. I suppose something similar could be achieved if it was possible to set a list of Normalize objects with the same length as channel. But achieving the task of percentiles_for_norm(0, 100) (which I think would still be the most common use-case for me) would get a lot more wordy since I'd first have to figure out the per-channel vmin/vmax corresponding to each channels min and max, and instantiate the appropriate Normalize objects to hand off to render_images.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants

@timtreis@codecov-commenter@clwgg@melonora
, '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('^' + ".*" + ' Refactor of `colorbar` and `norm` logic by timtreis · Pull Request #346 · scverse/spatialdata-plot · GitHub
Skip to content

Refactor of colorbar and norm logic - #346

Merged
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data
Sep 4, 2024
Merged

Refactor of colorbar and norm logic#346
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data

Conversation

@timtreis

@timtreistimtreis commented Sep 4, 2024

Copy link
Copy Markdown
Member

Unified norm logic across the 4 functions. Before, the render_images function would take a separate percentiles_for_norm argument (legacy reasons) which would/could interfere with whatever was passed to norm. As a consequence of this, I fixed some of the other resulting images.

@timtreistimtreis linked an issue Sep 4, 2024 that may be closed by this pull request
@codecov-commenter

codecov-commenter commented Sep 4, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.76%. Comparing base (393315b) to head (667c689).
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #346 +/- ##
==========================================
- Coverage 84.27% 83.76% -0.51% 
==========================================
Files 8 8 Lines 1558 1540 -18 ==========================================
- Hits 1313 1290 -23 - Misses 245 250 +5 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/basic.py90.86% <ø> (ø)
src/spatialdata_plot/pl/render.py94.72% <100.00%> (+0.31%)⬆️
src/spatialdata_plot/pl/utils.py76.16% <ø> (-1.13%)⬇️

Comment threadCHANGELOG.md Outdated

@melonoramelonora left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, though please check my comment also in #344 regarding the skimage issue. Also please add a PR description before merging with also the reasoning of getting rid of percentiles_for_norm:)

timtreisand others added 2 commits September 4, 2024 16:13
Co-authored-by: Wouter-Michiel Vierdag <w-mv@hotmail.com>
@timtreis
timtreis merged commit c6d6153 into mainSep 4, 2024
@timtreis
timtreis deleted the 324-unable-to-set-vmin-vmax-when-plotting-vector-data branch September 4, 2024 20:22
@clwgg

clwgg commented Sep 5, 2024

Copy link
Copy Markdown

Apologies for chiming in here again, but I'm curious about the decision to remove percentiles_for_norm, and I think it would be helpful to get some pointers on how its functionality should be replaced once I pull in these changes. I've found its capacity to do per-channel normalization quite helpful when there are extreme differences in the intensities of different markers. For example, using this:

sdata.pl.render_images(
'78_image',
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

I'd get an image like this:

Because of data like that, I've routinely started plotting like this:

sdata.pl.render_images(
'78_image',
percentiles_for_norm=(0, 100),
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

which for this example gives:

How would you achieve something like this using just the norm flag?

@timtreis

timtreis commented Sep 5, 2024

Copy link
Copy Markdown
MemberAuthor

Hm, interesting. Does passing a matplotlib Normalise achieve a different outcome? I've also modified the norm parameter to no longer be a flag but instead sth that you can pass a matplotlib.colors.Normalise object.

@timtreis

Copy link
Copy Markdown
MemberAuthor

One caveat that I see in that, this way, all channels are normalised based on the same vmin/vmax which might not necessarily work if your channels have different value ranges. We have a mostly undocumented transfunc parameter in one of the functions (currently on the go, will check later).

Is the goal to scale all channels to [0,1]? I'd be happy to build out that parameter for this purpose

@clwgg

clwgg commented Sep 6, 2024

Copy link
Copy Markdown

yeah exactly, I think having some control over which channels get which vmin/vmax would be super helpful. Even with percentiles_for_norm I've sometimes wondered how it would look if I could set a list of (pmin, pmax) tuples with the same length as channel, to have some more fine-grained control over which channels to highlight. I suppose something similar could be achieved if it was possible to set a list of Normalize objects with the same length as channel. But achieving the task of percentiles_for_norm(0, 100) (which I think would still be the most common use-case for me) would get a lot more wordy since I'd first have to figure out the per-channel vmin/vmax corresponding to each channels min and max, and instantiate the appropriate Normalize objects to hand off to render_images.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants

@timtreis@codecov-commenter@clwgg@melonora
, '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); } })(); })(); Refactor of `colorbar` and `norm` logic by timtreis · Pull Request #346 · scverse/spatialdata-plot · GitHub
Skip to content

Refactor of colorbar and norm logic - #346

Merged
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data
Sep 4, 2024
Merged

Refactor of colorbar and norm logic#346
timtreis merged 31 commits into
mainfrom
324-unable-to-set-vmin-vmax-when-plotting-vector-data

Conversation

@timtreis

@timtreistimtreis commented Sep 4, 2024

Copy link
Copy Markdown
Member

Unified norm logic across the 4 functions. Before, the render_images function would take a separate percentiles_for_norm argument (legacy reasons) which would/could interfere with whatever was passed to norm. As a consequence of this, I fixed some of the other resulting images.

@timtreistimtreis linked an issue Sep 4, 2024 that may be closed by this pull request
@codecov-commenter

codecov-commenter commented Sep 4, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.76%. Comparing base (393315b) to head (667c689).
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #346 +/- ##
==========================================
- Coverage 84.27% 83.76% -0.51% 
==========================================
Files 8 8 Lines 1558 1540 -18 ==========================================
- Hits 1313 1290 -23 - Misses 245 250 +5 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/basic.py90.86% <ø> (ø)
src/spatialdata_plot/pl/render.py94.72% <100.00%> (+0.31%)⬆️
src/spatialdata_plot/pl/utils.py76.16% <ø> (-1.13%)⬇️

Comment threadCHANGELOG.md Outdated

@melonoramelonora left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me, though please check my comment also in #344 regarding the skimage issue. Also please add a PR description before merging with also the reasoning of getting rid of percentiles_for_norm:)

timtreisand others added 2 commits September 4, 2024 16:13
Co-authored-by: Wouter-Michiel Vierdag <w-mv@hotmail.com>
@timtreis
timtreis merged commit c6d6153 into mainSep 4, 2024
@timtreis
timtreis deleted the 324-unable-to-set-vmin-vmax-when-plotting-vector-data branch September 4, 2024 20:22
@clwgg

clwgg commented Sep 5, 2024

Copy link
Copy Markdown

Apologies for chiming in here again, but I'm curious about the decision to remove percentiles_for_norm, and I think it would be helpful to get some pointers on how its functionality should be replaced once I pull in these changes. I've found its capacity to do per-channel normalization quite helpful when there are extreme differences in the intensities of different markers. For example, using this:

sdata.pl.render_images(
'78_image',
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

I'd get an image like this:

Because of data like that, I've routinely started plotting like this:

sdata.pl.render_images(
'78_image',
percentiles_for_norm=(0, 100),
channel=["CD45", "PanCK", "DAPI"]
).pl.show(coordinate_systems='78')

which for this example gives:

How would you achieve something like this using just the norm flag?

@timtreis

timtreis commented Sep 5, 2024

Copy link
Copy Markdown
MemberAuthor

Hm, interesting. Does passing a matplotlib Normalise achieve a different outcome? I've also modified the norm parameter to no longer be a flag but instead sth that you can pass a matplotlib.colors.Normalise object.

@timtreis

Copy link
Copy Markdown
MemberAuthor

One caveat that I see in that, this way, all channels are normalised based on the same vmin/vmax which might not necessarily work if your channels have different value ranges. We have a mostly undocumented transfunc parameter in one of the functions (currently on the go, will check later).

Is the goal to scale all channels to [0,1]? I'd be happy to build out that parameter for this purpose

@clwgg

clwgg commented Sep 6, 2024

Copy link
Copy Markdown

yeah exactly, I think having some control over which channels get which vmin/vmax would be super helpful. Even with percentiles_for_norm I've sometimes wondered how it would look if I could set a list of (pmin, pmax) tuples with the same length as channel, to have some more fine-grained control over which channels to highlight. I suppose something similar could be achieved if it was possible to set a list of Normalize objects with the same length as channel. But achieving the task of percentiles_for_norm(0, 100) (which I think would still be the most common use-case for me) would get a lot more wordy since I'd first have to figure out the per-channel vmin/vmax corresponding to each channels min and max, and instantiate the appropriate Normalize objects to hand off to render_images.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants

@timtreis@codecov-commenter@clwgg@melonora