Skip to content

Coloring labels by a continuous variable fixed - #344

Merged
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
Sep 4, 2024
Merged

Coloring labels by a continuous variable fixed#344
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors

Conversation

@timtreis

@timtreistimtreis commented Sep 3, 2024

Copy link
Copy Markdown
Member

As reported by @clwgg, there was a bug with the color of continuous annotations which resulted in them having incorrect colors. This is now fixed and the tests have been updated. Furthermore, within this fix I noticed our testing threshold was way too high and let a bunch of bugs pass. So I also lowered that and fixed the bugs this revealed.

@codecov-commenter

codecov-commenter commented Sep 3, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 84.32%. Comparing base (ffd4a1f) to head (a9c7609).

Files with missing linesPatch %Lines
src/spatialdata_plot/pl/utils.py91.66%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #344 +/- ##
==========================================
+ Coverage 84.27% 84.32% +0.05% 
==========================================
Files 8 8 Lines 1558 1557 -1 ==========================================
Hits 1313 1313 + Misses 245 244 -1 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/utils.py77.37% <91.66%> (+0.08%)⬆️

@timtreis

timtreis commented Sep 3, 2024

Copy link
Copy Markdown
MemberAuthor

The two failing tests can probably be traced back to #324 and #303

timtreisand others added 9 commits September 3, 2024 19:14
…ears-to-be-broken-labels-associated-with-wrong-colors' of github.com:scverse/spatialdata-plot into bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
if np.any(color_source_vector.isna()):
cell_id[color_source_vector.isna()] = 0
val_im: ArrayLike = map_array(seg, cell_id, color_vector.codes + 1)
val_im: ArrayLike = map_array(seg.copy(), cell_id, color_vector.codes + 1)

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.

hmm is the copy really required here? I thought that map array returns an array with same shape as the original array, but it would not have the same pointer

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah, I remember. Don't ask me why, but if I don't copy(), one of the tests fails with:

ValueError: buffer source array is read-only

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had the same issue with the current main: whenever I tried to color labels by a column in table.obs, I'd get ValueError: buffer source array is read-only, and putting in those .copy() calls fixed it. This happened regardless of whether the SpatialData object was buffered to disk or not.

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.

I see, this is probably a bug in skimage actually. For now we could keep it as it is, but please add a comment with the issue so we remove this when we can.

@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.

preapproving for the vmin vmax fix, but please if you can open an issue in skimage regarding the buffer error. I have seen similar errors in pandas at some point, I believe it had to do with some cython code not allowing for read only buffer, but this could be fixed I think and then prevents a copy.

@timtreis
timtreis merged commit 6cef5df into mainSep 4, 2024
@timtreis
timtreis deleted the bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors branch September 4, 2024 20:16
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@melonora@clwgg
, '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" + '
Coloring labels by a continuous variable fixed by timtreis · Pull Request #344 · scverse/spatialdata-plot · GitHub
Skip to content

Coloring labels by a continuous variable fixed - #344

Merged
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
Sep 4, 2024
Merged

Coloring labels by a continuous variable fixed#344
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors

Conversation

@timtreis

@timtreistimtreis commented Sep 3, 2024

Copy link
Copy Markdown
Member

As reported by @clwgg, there was a bug with the color of continuous annotations which resulted in them having incorrect colors. This is now fixed and the tests have been updated. Furthermore, within this fix I noticed our testing threshold was way too high and let a bunch of bugs pass. So I also lowered that and fixed the bugs this revealed.

@codecov-commenter

codecov-commenter commented Sep 3, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 84.32%. Comparing base (ffd4a1f) to head (a9c7609).

Files with missing linesPatch %Lines
src/spatialdata_plot/pl/utils.py91.66%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #344 +/- ##
==========================================
+ Coverage 84.27% 84.32% +0.05% 
==========================================
Files 8 8 Lines 1558 1557 -1 ==========================================
Hits 1313 1313 + Misses 245 244 -1 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/utils.py77.37% <91.66%> (+0.08%)⬆️

@timtreis

timtreis commented Sep 3, 2024

Copy link
Copy Markdown
MemberAuthor

The two failing tests can probably be traced back to #324 and #303

timtreisand others added 9 commits September 3, 2024 19:14
…ears-to-be-broken-labels-associated-with-wrong-colors' of github.com:scverse/spatialdata-plot into bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
if np.any(color_source_vector.isna()):
cell_id[color_source_vector.isna()] = 0
val_im: ArrayLike = map_array(seg, cell_id, color_vector.codes + 1)
val_im: ArrayLike = map_array(seg.copy(), cell_id, color_vector.codes + 1)

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.

hmm is the copy really required here? I thought that map array returns an array with same shape as the original array, but it would not have the same pointer

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah, I remember. Don't ask me why, but if I don't copy(), one of the tests fails with:

ValueError: buffer source array is read-only

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had the same issue with the current main: whenever I tried to color labels by a column in table.obs, I'd get ValueError: buffer source array is read-only, and putting in those .copy() calls fixed it. This happened regardless of whether the SpatialData object was buffered to disk or not.

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.

I see, this is probably a bug in skimage actually. For now we could keep it as it is, but please add a comment with the issue so we remove this when we can.

@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.

preapproving for the vmin vmax fix, but please if you can open an issue in skimage regarding the buffer error. I have seen similar errors in pandas at some point, I believe it had to do with some cython code not allowing for read only buffer, but this could be fixed I think and then prevents a copy.

@timtreis
timtreis merged commit 6cef5df into mainSep 4, 2024
@timtreis
timtreis deleted the bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors branch September 4, 2024 20:16
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@melonora@clwgg
, '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('^' + ".*" + ' Coloring labels by a continuous variable fixed by timtreis · Pull Request #344 · scverse/spatialdata-plot · GitHub
Skip to content

Coloring labels by a continuous variable fixed - #344

Merged
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
Sep 4, 2024
Merged

Coloring labels by a continuous variable fixed#344
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors

Conversation

@timtreis

@timtreistimtreis commented Sep 3, 2024

Copy link
Copy Markdown
Member

As reported by @clwgg, there was a bug with the color of continuous annotations which resulted in them having incorrect colors. This is now fixed and the tests have been updated. Furthermore, within this fix I noticed our testing threshold was way too high and let a bunch of bugs pass. So I also lowered that and fixed the bugs this revealed.

@codecov-commenter

codecov-commenter commented Sep 3, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 84.32%. Comparing base (ffd4a1f) to head (a9c7609).

Files with missing linesPatch %Lines
src/spatialdata_plot/pl/utils.py91.66%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #344 +/- ##
==========================================
+ Coverage 84.27% 84.32% +0.05% 
==========================================
Files 8 8 Lines 1558 1557 -1 ==========================================
Hits 1313 1313 + Misses 245 244 -1 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/utils.py77.37% <91.66%> (+0.08%)⬆️

@timtreis

timtreis commented Sep 3, 2024

Copy link
Copy Markdown
MemberAuthor

The two failing tests can probably be traced back to #324 and #303

timtreisand others added 9 commits September 3, 2024 19:14
…ears-to-be-broken-labels-associated-with-wrong-colors' of github.com:scverse/spatialdata-plot into bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
if np.any(color_source_vector.isna()):
cell_id[color_source_vector.isna()] = 0
val_im: ArrayLike = map_array(seg, cell_id, color_vector.codes + 1)
val_im: ArrayLike = map_array(seg.copy(), cell_id, color_vector.codes + 1)

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.

hmm is the copy really required here? I thought that map array returns an array with same shape as the original array, but it would not have the same pointer

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah, I remember. Don't ask me why, but if I don't copy(), one of the tests fails with:

ValueError: buffer source array is read-only

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had the same issue with the current main: whenever I tried to color labels by a column in table.obs, I'd get ValueError: buffer source array is read-only, and putting in those .copy() calls fixed it. This happened regardless of whether the SpatialData object was buffered to disk or not.

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.

I see, this is probably a bug in skimage actually. For now we could keep it as it is, but please add a comment with the issue so we remove this when we can.

@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.

preapproving for the vmin vmax fix, but please if you can open an issue in skimage regarding the buffer error. I have seen similar errors in pandas at some point, I believe it had to do with some cython code not allowing for read only buffer, but this could be fixed I think and then prevents a copy.

@timtreis
timtreis merged commit 6cef5df into mainSep 4, 2024
@timtreis
timtreis deleted the bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors branch September 4, 2024 20:16
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@melonora@clwgg
, '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('^' + ".*" + ' Coloring labels by a continuous variable fixed by timtreis · Pull Request #344 · scverse/spatialdata-plot · GitHub
Skip to content

Coloring labels by a continuous variable fixed - #344

Merged
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
Sep 4, 2024
Merged

Coloring labels by a continuous variable fixed#344
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors

Conversation

@timtreis

@timtreistimtreis commented Sep 3, 2024

Copy link
Copy Markdown
Member

As reported by @clwgg, there was a bug with the color of continuous annotations which resulted in them having incorrect colors. This is now fixed and the tests have been updated. Furthermore, within this fix I noticed our testing threshold was way too high and let a bunch of bugs pass. So I also lowered that and fixed the bugs this revealed.

@codecov-commenter

codecov-commenter commented Sep 3, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 84.32%. Comparing base (ffd4a1f) to head (a9c7609).

Files with missing linesPatch %Lines
src/spatialdata_plot/pl/utils.py91.66%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #344 +/- ##
==========================================
+ Coverage 84.27% 84.32% +0.05% 
==========================================
Files 8 8 Lines 1558 1557 -1 ==========================================
Hits 1313 1313 + Misses 245 244 -1 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/utils.py77.37% <91.66%> (+0.08%)⬆️

@timtreis

timtreis commented Sep 3, 2024

Copy link
Copy Markdown
MemberAuthor

The two failing tests can probably be traced back to #324 and #303

timtreisand others added 9 commits September 3, 2024 19:14
…ears-to-be-broken-labels-associated-with-wrong-colors' of github.com:scverse/spatialdata-plot into bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
if np.any(color_source_vector.isna()):
cell_id[color_source_vector.isna()] = 0
val_im: ArrayLike = map_array(seg, cell_id, color_vector.codes + 1)
val_im: ArrayLike = map_array(seg.copy(), cell_id, color_vector.codes + 1)

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.

hmm is the copy really required here? I thought that map array returns an array with same shape as the original array, but it would not have the same pointer

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah, I remember. Don't ask me why, but if I don't copy(), one of the tests fails with:

ValueError: buffer source array is read-only

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had the same issue with the current main: whenever I tried to color labels by a column in table.obs, I'd get ValueError: buffer source array is read-only, and putting in those .copy() calls fixed it. This happened regardless of whether the SpatialData object was buffered to disk or not.

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.

I see, this is probably a bug in skimage actually. For now we could keep it as it is, but please add a comment with the issue so we remove this when we can.

@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.

preapproving for the vmin vmax fix, but please if you can open an issue in skimage regarding the buffer error. I have seen similar errors in pandas at some point, I believe it had to do with some cython code not allowing for read only buffer, but this could be fixed I think and then prevents a copy.

@timtreis
timtreis merged commit 6cef5df into mainSep 4, 2024
@timtreis
timtreis deleted the bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors branch September 4, 2024 20:16
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@melonora@clwgg
, '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" + ' Coloring labels by a continuous variable fixed by timtreis · Pull Request #344 · scverse/spatialdata-plot · GitHub
Skip to content

Coloring labels by a continuous variable fixed - #344

Merged
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
Sep 4, 2024
Merged

Coloring labels by a continuous variable fixed#344
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors

Conversation

@timtreis

@timtreistimtreis commented Sep 3, 2024

Copy link
Copy Markdown
Member

As reported by @clwgg, there was a bug with the color of continuous annotations which resulted in them having incorrect colors. This is now fixed and the tests have been updated. Furthermore, within this fix I noticed our testing threshold was way too high and let a bunch of bugs pass. So I also lowered that and fixed the bugs this revealed.

@codecov-commenter

codecov-commenter commented Sep 3, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 84.32%. Comparing base (ffd4a1f) to head (a9c7609).

Files with missing linesPatch %Lines
src/spatialdata_plot/pl/utils.py91.66%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #344 +/- ##
==========================================
+ Coverage 84.27% 84.32% +0.05% 
==========================================
Files 8 8 Lines 1558 1557 -1 ==========================================
Hits 1313 1313 + Misses 245 244 -1 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/utils.py77.37% <91.66%> (+0.08%)⬆️

@timtreis

timtreis commented Sep 3, 2024

Copy link
Copy Markdown
MemberAuthor

The two failing tests can probably be traced back to #324 and #303

timtreisand others added 9 commits September 3, 2024 19:14
…ears-to-be-broken-labels-associated-with-wrong-colors' of github.com:scverse/spatialdata-plot into bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
if np.any(color_source_vector.isna()):
cell_id[color_source_vector.isna()] = 0
val_im: ArrayLike = map_array(seg, cell_id, color_vector.codes + 1)
val_im: ArrayLike = map_array(seg.copy(), cell_id, color_vector.codes + 1)

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.

hmm is the copy really required here? I thought that map array returns an array with same shape as the original array, but it would not have the same pointer

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah, I remember. Don't ask me why, but if I don't copy(), one of the tests fails with:

ValueError: buffer source array is read-only

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had the same issue with the current main: whenever I tried to color labels by a column in table.obs, I'd get ValueError: buffer source array is read-only, and putting in those .copy() calls fixed it. This happened regardless of whether the SpatialData object was buffered to disk or not.

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.

I see, this is probably a bug in skimage actually. For now we could keep it as it is, but please add a comment with the issue so we remove this when we can.

@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.

preapproving for the vmin vmax fix, but please if you can open an issue in skimage regarding the buffer error. I have seen similar errors in pandas at some point, I believe it had to do with some cython code not allowing for read only buffer, but this could be fixed I think and then prevents a copy.

@timtreis
timtreis merged commit 6cef5df into mainSep 4, 2024
@timtreis
timtreis deleted the bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors branch September 4, 2024 20:16
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@melonora@clwgg
, '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('^' + ".*" + ' Coloring labels by a continuous variable fixed by timtreis · Pull Request #344 · scverse/spatialdata-plot · GitHub
Skip to content

Coloring labels by a continuous variable fixed - #344

Merged
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
Sep 4, 2024
Merged

Coloring labels by a continuous variable fixed#344
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors

Conversation

@timtreis

@timtreistimtreis commented Sep 3, 2024

Copy link
Copy Markdown
Member

As reported by @clwgg, there was a bug with the color of continuous annotations which resulted in them having incorrect colors. This is now fixed and the tests have been updated. Furthermore, within this fix I noticed our testing threshold was way too high and let a bunch of bugs pass. So I also lowered that and fixed the bugs this revealed.

@codecov-commenter

codecov-commenter commented Sep 3, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 84.32%. Comparing base (ffd4a1f) to head (a9c7609).

Files with missing linesPatch %Lines
src/spatialdata_plot/pl/utils.py91.66%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #344 +/- ##
==========================================
+ Coverage 84.27% 84.32% +0.05% 
==========================================
Files 8 8 Lines 1558 1557 -1 ==========================================
Hits 1313 1313 + Misses 245 244 -1 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/utils.py77.37% <91.66%> (+0.08%)⬆️

@timtreis

timtreis commented Sep 3, 2024

Copy link
Copy Markdown
MemberAuthor

The two failing tests can probably be traced back to #324 and #303

timtreisand others added 9 commits September 3, 2024 19:14
…ears-to-be-broken-labels-associated-with-wrong-colors' of github.com:scverse/spatialdata-plot into bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
if np.any(color_source_vector.isna()):
cell_id[color_source_vector.isna()] = 0
val_im: ArrayLike = map_array(seg, cell_id, color_vector.codes + 1)
val_im: ArrayLike = map_array(seg.copy(), cell_id, color_vector.codes + 1)

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.

hmm is the copy really required here? I thought that map array returns an array with same shape as the original array, but it would not have the same pointer

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah, I remember. Don't ask me why, but if I don't copy(), one of the tests fails with:

ValueError: buffer source array is read-only

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had the same issue with the current main: whenever I tried to color labels by a column in table.obs, I'd get ValueError: buffer source array is read-only, and putting in those .copy() calls fixed it. This happened regardless of whether the SpatialData object was buffered to disk or not.

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.

I see, this is probably a bug in skimage actually. For now we could keep it as it is, but please add a comment with the issue so we remove this when we can.

@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.

preapproving for the vmin vmax fix, but please if you can open an issue in skimage regarding the buffer error. I have seen similar errors in pandas at some point, I believe it had to do with some cython code not allowing for read only buffer, but this could be fixed I think and then prevents a copy.

@timtreis
timtreis merged commit 6cef5df into mainSep 4, 2024
@timtreis
timtreis deleted the bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors branch September 4, 2024 20:16
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@melonora@clwgg
, '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('^' + ".*" + ' Coloring labels by a continuous variable fixed by timtreis · Pull Request #344 · scverse/spatialdata-plot · GitHub
Skip to content

Coloring labels by a continuous variable fixed - #344

Merged
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
Sep 4, 2024
Merged

Coloring labels by a continuous variable fixed#344
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors

Conversation

@timtreis

@timtreistimtreis commented Sep 3, 2024

Copy link
Copy Markdown
Member

As reported by @clwgg, there was a bug with the color of continuous annotations which resulted in them having incorrect colors. This is now fixed and the tests have been updated. Furthermore, within this fix I noticed our testing threshold was way too high and let a bunch of bugs pass. So I also lowered that and fixed the bugs this revealed.

@codecov-commenter

codecov-commenter commented Sep 3, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 84.32%. Comparing base (ffd4a1f) to head (a9c7609).

Files with missing linesPatch %Lines
src/spatialdata_plot/pl/utils.py91.66%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #344 +/- ##
==========================================
+ Coverage 84.27% 84.32% +0.05% 
==========================================
Files 8 8 Lines 1558 1557 -1 ==========================================
Hits 1313 1313 + Misses 245 244 -1 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/utils.py77.37% <91.66%> (+0.08%)⬆️

@timtreis

timtreis commented Sep 3, 2024

Copy link
Copy Markdown
MemberAuthor

The two failing tests can probably be traced back to #324 and #303

timtreisand others added 9 commits September 3, 2024 19:14
…ears-to-be-broken-labels-associated-with-wrong-colors' of github.com:scverse/spatialdata-plot into bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
if np.any(color_source_vector.isna()):
cell_id[color_source_vector.isna()] = 0
val_im: ArrayLike = map_array(seg, cell_id, color_vector.codes + 1)
val_im: ArrayLike = map_array(seg.copy(), cell_id, color_vector.codes + 1)

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.

hmm is the copy really required here? I thought that map array returns an array with same shape as the original array, but it would not have the same pointer

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah, I remember. Don't ask me why, but if I don't copy(), one of the tests fails with:

ValueError: buffer source array is read-only

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had the same issue with the current main: whenever I tried to color labels by a column in table.obs, I'd get ValueError: buffer source array is read-only, and putting in those .copy() calls fixed it. This happened regardless of whether the SpatialData object was buffered to disk or not.

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.

I see, this is probably a bug in skimage actually. For now we could keep it as it is, but please add a comment with the issue so we remove this when we can.

@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.

preapproving for the vmin vmax fix, but please if you can open an issue in skimage regarding the buffer error. I have seen similar errors in pandas at some point, I believe it had to do with some cython code not allowing for read only buffer, but this could be fixed I think and then prevents a copy.

@timtreis
timtreis merged commit 6cef5df into mainSep 4, 2024
@timtreis
timtreis deleted the bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors branch September 4, 2024 20:16
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@melonora@clwgg
, '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); } })(); })(); Coloring labels by a continuous variable fixed by timtreis · Pull Request #344 · scverse/spatialdata-plot · GitHub
Skip to content

Coloring labels by a continuous variable fixed - #344

Merged
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
Sep 4, 2024
Merged

Coloring labels by a continuous variable fixed#344
timtreis merged 25 commits into
mainfrom
bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors

Conversation

@timtreis

@timtreistimtreis commented Sep 3, 2024

Copy link
Copy Markdown
Member

As reported by @clwgg, there was a bug with the color of continuous annotations which resulted in them having incorrect colors. This is now fixed and the tests have been updated. Furthermore, within this fix I noticed our testing threshold was way too high and let a bunch of bugs pass. So I also lowered that and fixed the bugs this revealed.

@codecov-commenter

codecov-commenter commented Sep 3, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 84.32%. Comparing base (ffd4a1f) to head (a9c7609).

Files with missing linesPatch %Lines
src/spatialdata_plot/pl/utils.py91.66%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #344 +/- ##
==========================================
+ Coverage 84.27% 84.32% +0.05% 
==========================================
Files 8 8 Lines 1558 1557 -1 ==========================================
Hits 1313 1313 + Misses 245 244 -1 
Files with missing linesCoverage Δ
src/spatialdata_plot/pl/utils.py77.37% <91.66%> (+0.08%)⬆️

@timtreis

timtreis commented Sep 3, 2024

Copy link
Copy Markdown
MemberAuthor

The two failing tests can probably be traced back to #324 and #303

timtreisand others added 9 commits September 3, 2024 19:14
…ears-to-be-broken-labels-associated-with-wrong-colors' of github.com:scverse/spatialdata-plot into bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors
if np.any(color_source_vector.isna()):
cell_id[color_source_vector.isna()] = 0
val_im: ArrayLike = map_array(seg, cell_id, color_vector.codes + 1)
val_im: ArrayLike = map_array(seg.copy(), cell_id, color_vector.codes + 1)

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.

hmm is the copy really required here? I thought that map array returns an array with same shape as the original array, but it would not have the same pointer

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah, I remember. Don't ask me why, but if I don't copy(), one of the tests fails with:

ValueError: buffer source array is read-only

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had the same issue with the current main: whenever I tried to color labels by a column in table.obs, I'd get ValueError: buffer source array is read-only, and putting in those .copy() calls fixed it. This happened regardless of whether the SpatialData object was buffered to disk or not.

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.

I see, this is probably a bug in skimage actually. For now we could keep it as it is, but please add a comment with the issue so we remove this when we can.

@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.

preapproving for the vmin vmax fix, but please if you can open an issue in skimage regarding the buffer error. I have seen similar errors in pandas at some point, I believe it had to do with some cython code not allowing for read only buffer, but this could be fixed I think and then prevents a copy.

@timtreis
timtreis merged commit 6cef5df into mainSep 4, 2024
@timtreis
timtreis deleted the bugfix/342-coloring-labels-by-a-continuous-variable-appears-to-be-broken-labels-associated-with-wrong-colors branch September 4, 2024 20:16
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@melonora@clwgg