Skip to content

Fixes for error bars and ticks - #163

Merged
tdhock merged 50 commits into
masterfrom
toby-fixes
Feb 23, 2015
Merged

Fixes for error bars and ticks#163
tdhock merged 50 commits into
masterfrom
toby-fixes

Conversation

@tdhock

Copy link
Copy Markdown
Contributor

Hey guys, I coded some fixes for geom_errorbar and geom_errorbarh, which is the first problem in #161

I changed the way traces are merged at the end of gg2list, so now it does not matter if the error bars come before or after the other geoms (points, lines).

I also moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R -- this saves me time during development and debugging since I only have to source("ggplotly.R") instead of both code files (in the correct order). I hope this is not a big deal for you guys.

Tests pass on my machine.

@mkcor

mkcor commented Feb 3, 2015

Copy link
Copy Markdown
Contributor

Thanks, @tdhock -- Before I actually review...

moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R

Nooooooooooooooooo!!! We are trying to modularize this code base.

You shouldn't only source("ggplotly.R") as you develop, you need the entire package to test properly that your changes are working. Typically, you should use a Makefile like:

all: build
R --interactive < test_script.R
build:
R CMD build /dir/to/your/repo/plotly
R CMD INSTALL --library=/dir/to/your/wip/lib plotly_version#.tar.gz

where test_script.R contains, say, a new conversion you're working on, so at the end you can make sure that the whole

$ make

runs successfully. As you develop, you probably insert some browser() calls here and there. So then you should

$ make build

Make sure your .Rhistory is never saved. Make sure your WIP version of "plotly" gets installed at the right place (not the default library for R packages). Your test_script.R should typically start with

require(plotly, lib.loc="/dir/to/your/wip/lib")

Then launch R and source("test_script.R"). Finally, to check that the test suite runs well,

$ cd tests
$ R

and, in the R console,

require(plotly, lib.loc="/dir/to/your/wip/lib")
source("testthat.R")

Cool, now this is documented somewhere.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

ok sorry about that, I moved the constants back to the other file.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

I have also included a bunch of tests from https://github.com/chriddyp/ggplot2-plotly-cookbook/blob/master/axes.R#L70-L71 which I will eventually make pass.

@mkcor

mkcor commented Feb 6, 2015

Copy link
Copy Markdown
Contributor

Test-driven development, yes!

Comment threadR/corresp_one_one.R

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.

Remove trailing white line.

@tdhocktdhock changed the title Fixes for error barsFixes for error bars and ticksFeb 9, 2015
@mkcor

Copy link
Copy Markdown
Contributor

I wish this PR was split into 10 PRs... Would make the review process faster and safer.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

The updated test table shows the most recent version of this branch as toby.fixes.reviewed

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/index.html

everything looks fine to me, ready to merge if you guys are.

@mkcor

Copy link
Copy Markdown
Contributor

I'm happy with the changes so far! If I find something 'missing', I'll submit a PR for you to review @tdhock ;)
👍
/cc @chriddyp

@chriddyp

Copy link
Copy Markdown
Member

@tdhock I noticed this ticks-flip was fixed but then not here:
image

@mkcor

Copy link
Copy Markdown
Contributor

@chriddyp Good catch! But I think we can leave this fix for another/different/upcoming PR, since this one is huge already. (@tdhock Do you append '.bug' when running the image test suite on a feature branch, and then '.reviewed' when you re-run it on that same branch once the code has been reviewed?)

@mkcor

Copy link
Copy Markdown
Contributor

I think I'll increment the middle digit in version number, after this PR is merged!
On the contrary, fixing ticks-flip will only increment the last digit.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

@chriddyp turns out my plotly code was correct for that flipped example,

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/ticks-flip.html

but the plotly-test-table code was not. In particular the plotly filename in the JSON kwargs was the same for different versions of the ggplotly code, so actually the non-flipped image that showed up was made using the code from Carson's branch, and the plotly server did not update that image file right away.

But now for the test table I give the the SHA1 in the plotly filename so I hope the plotly server will respond back with a unique plotly every time. Is that a correct interpretation of the filename argument?

https://github.com/ropensci/plotly-test-table/blob/6a034a3a65e43c03e76072a75118390f998933ed/index.R#L179

@mkcor for the test table I assign arbitrary column labels by typing them into

https://github.com/ropensci/plotly-test-table/blob/gh-pages/code_commits.csv

so yes I was using "bug" to indicate a previous version and the "reviewed" to indicate the newer version. Is that OK or would you prefer that I use labels such as "new" and "old" ?

So anyways I corrected the test table and so I guess this branch is ready to merge. Can I please get a +1?

@mkcor

Copy link
Copy Markdown
Contributor

I gave you a 👍 a long time ago because you wouldn't do the changes I would ask for so I thought I'll just do them myself...
Can you please remove files R/print.R, tests/testthat.R, and tests/testthat/test-ggplot-area.R from the changeset? They have nothing to do in this PR!

@tdhock

Copy link
Copy Markdown
ContributorAuthor

Sure I can remove those files, if you tell me how?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

sorry I am a bit confused. should I just make the reverse changes and then commit them? or is there some other git command?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

And I'm sorry if I did not do all the changes you asked for --- I tried to address all of your comments.

@mkcor

Copy link
Copy Markdown
Contributor

Well, I could have been more proactive myself and pulled the branch a while ago. Let me do it now and I'll share my recommendations.

@mkcor

Copy link
Copy Markdown
Contributor

So, I couldn't revert commits, because these dummy changes occurred in the midst of other stuff, i.e., adcc2ba or 4766545 (hence my suspicion against git commit -a).

Actually I had pulled your branch before, but never pushed. So I did:

git checkout toby-fixes
git pull origin toby-fixes
git rm R/print.R git commit -m "Remove funny file"# Looked up id/hash for latest commit on master
git checkout 1d75115f719082 tests/testthat.R
git add tests/testthat.R git commit -m "Revert testthat.R file to latest commit on master"
git checkout 1d75115f719082 tests/testthat/test-ggplot-area.R
git add tests/testthat/test-ggplot-area.R git commit -m "Revert unrelated test file to latest commit on master"
git push origin toby-fixes

Hope you find this inspiring!

@mkcor

Copy link
Copy Markdown
Contributor

+1

tdhock pushed a commit that referenced this pull request Feb 23, 2015
@tdhock
tdhock merged commit faaf4da into masterFeb 23, 2015
@tdhock
tdhock deleted the toby-fixes branch February 23, 2015 23:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tdhock@mkcor@chriddyp
, '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" + '
Fixes for error bars and ticks by tdhock · Pull Request #163 · plotly/plotly.R · GitHub
Skip to content

Fixes for error bars and ticks - #163

Merged
tdhock merged 50 commits into
masterfrom
toby-fixes
Feb 23, 2015
Merged

Fixes for error bars and ticks#163
tdhock merged 50 commits into
masterfrom
toby-fixes

Conversation

@tdhock

Copy link
Copy Markdown
Contributor

Hey guys, I coded some fixes for geom_errorbar and geom_errorbarh, which is the first problem in #161

I changed the way traces are merged at the end of gg2list, so now it does not matter if the error bars come before or after the other geoms (points, lines).

I also moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R -- this saves me time during development and debugging since I only have to source("ggplotly.R") instead of both code files (in the correct order). I hope this is not a big deal for you guys.

Tests pass on my machine.

@mkcor

mkcor commented Feb 3, 2015

Copy link
Copy Markdown
Contributor

Thanks, @tdhock -- Before I actually review...

moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R

Nooooooooooooooooo!!! We are trying to modularize this code base.

You shouldn't only source("ggplotly.R") as you develop, you need the entire package to test properly that your changes are working. Typically, you should use a Makefile like:

all: build
R --interactive < test_script.R
build:
R CMD build /dir/to/your/repo/plotly
R CMD INSTALL --library=/dir/to/your/wip/lib plotly_version#.tar.gz

where test_script.R contains, say, a new conversion you're working on, so at the end you can make sure that the whole

$ make

runs successfully. As you develop, you probably insert some browser() calls here and there. So then you should

$ make build

Make sure your .Rhistory is never saved. Make sure your WIP version of "plotly" gets installed at the right place (not the default library for R packages). Your test_script.R should typically start with

require(plotly, lib.loc="/dir/to/your/wip/lib")

Then launch R and source("test_script.R"). Finally, to check that the test suite runs well,

$ cd tests
$ R

and, in the R console,

require(plotly, lib.loc="/dir/to/your/wip/lib")
source("testthat.R")

Cool, now this is documented somewhere.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

ok sorry about that, I moved the constants back to the other file.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

I have also included a bunch of tests from https://github.com/chriddyp/ggplot2-plotly-cookbook/blob/master/axes.R#L70-L71 which I will eventually make pass.

@mkcor

mkcor commented Feb 6, 2015

Copy link
Copy Markdown
Contributor

Test-driven development, yes!

Comment threadR/corresp_one_one.R

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.

Remove trailing white line.

@tdhocktdhock changed the title Fixes for error barsFixes for error bars and ticksFeb 9, 2015
@mkcor

Copy link
Copy Markdown
Contributor

I wish this PR was split into 10 PRs... Would make the review process faster and safer.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

The updated test table shows the most recent version of this branch as toby.fixes.reviewed

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/index.html

everything looks fine to me, ready to merge if you guys are.

@mkcor

Copy link
Copy Markdown
Contributor

I'm happy with the changes so far! If I find something 'missing', I'll submit a PR for you to review @tdhock ;)
👍
/cc @chriddyp

@chriddyp

Copy link
Copy Markdown
Member

@tdhock I noticed this ticks-flip was fixed but then not here:
image

@mkcor

Copy link
Copy Markdown
Contributor

@chriddyp Good catch! But I think we can leave this fix for another/different/upcoming PR, since this one is huge already. (@tdhock Do you append '.bug' when running the image test suite on a feature branch, and then '.reviewed' when you re-run it on that same branch once the code has been reviewed?)

@mkcor

Copy link
Copy Markdown
Contributor

I think I'll increment the middle digit in version number, after this PR is merged!
On the contrary, fixing ticks-flip will only increment the last digit.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

@chriddyp turns out my plotly code was correct for that flipped example,

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/ticks-flip.html

but the plotly-test-table code was not. In particular the plotly filename in the JSON kwargs was the same for different versions of the ggplotly code, so actually the non-flipped image that showed up was made using the code from Carson's branch, and the plotly server did not update that image file right away.

But now for the test table I give the the SHA1 in the plotly filename so I hope the plotly server will respond back with a unique plotly every time. Is that a correct interpretation of the filename argument?

https://github.com/ropensci/plotly-test-table/blob/6a034a3a65e43c03e76072a75118390f998933ed/index.R#L179

@mkcor for the test table I assign arbitrary column labels by typing them into

https://github.com/ropensci/plotly-test-table/blob/gh-pages/code_commits.csv

so yes I was using "bug" to indicate a previous version and the "reviewed" to indicate the newer version. Is that OK or would you prefer that I use labels such as "new" and "old" ?

So anyways I corrected the test table and so I guess this branch is ready to merge. Can I please get a +1?

@mkcor

Copy link
Copy Markdown
Contributor

I gave you a 👍 a long time ago because you wouldn't do the changes I would ask for so I thought I'll just do them myself...
Can you please remove files R/print.R, tests/testthat.R, and tests/testthat/test-ggplot-area.R from the changeset? They have nothing to do in this PR!

@tdhock

Copy link
Copy Markdown
ContributorAuthor

Sure I can remove those files, if you tell me how?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

sorry I am a bit confused. should I just make the reverse changes and then commit them? or is there some other git command?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

And I'm sorry if I did not do all the changes you asked for --- I tried to address all of your comments.

@mkcor

Copy link
Copy Markdown
Contributor

Well, I could have been more proactive myself and pulled the branch a while ago. Let me do it now and I'll share my recommendations.

@mkcor

Copy link
Copy Markdown
Contributor

So, I couldn't revert commits, because these dummy changes occurred in the midst of other stuff, i.e., adcc2ba or 4766545 (hence my suspicion against git commit -a).

Actually I had pulled your branch before, but never pushed. So I did:

git checkout toby-fixes
git pull origin toby-fixes
git rm R/print.R git commit -m "Remove funny file"# Looked up id/hash for latest commit on master
git checkout 1d75115f719082 tests/testthat.R
git add tests/testthat.R git commit -m "Revert testthat.R file to latest commit on master"
git checkout 1d75115f719082 tests/testthat/test-ggplot-area.R
git add tests/testthat/test-ggplot-area.R git commit -m "Revert unrelated test file to latest commit on master"
git push origin toby-fixes

Hope you find this inspiring!

@mkcor

Copy link
Copy Markdown
Contributor

+1

tdhock pushed a commit that referenced this pull request Feb 23, 2015
@tdhock
tdhock merged commit faaf4da into masterFeb 23, 2015
@tdhock
tdhock deleted the toby-fixes branch February 23, 2015 23:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tdhock@mkcor@chriddyp
, '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('^' + ".*" + ' Fixes for error bars and ticks by tdhock · Pull Request #163 · plotly/plotly.R · GitHub
Skip to content

Fixes for error bars and ticks - #163

Merged
tdhock merged 50 commits into
masterfrom
toby-fixes
Feb 23, 2015
Merged

Fixes for error bars and ticks#163
tdhock merged 50 commits into
masterfrom
toby-fixes

Conversation

@tdhock

Copy link
Copy Markdown
Contributor

Hey guys, I coded some fixes for geom_errorbar and geom_errorbarh, which is the first problem in #161

I changed the way traces are merged at the end of gg2list, so now it does not matter if the error bars come before or after the other geoms (points, lines).

I also moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R -- this saves me time during development and debugging since I only have to source("ggplotly.R") instead of both code files (in the correct order). I hope this is not a big deal for you guys.

Tests pass on my machine.

@mkcor

mkcor commented Feb 3, 2015

Copy link
Copy Markdown
Contributor

Thanks, @tdhock -- Before I actually review...

moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R

Nooooooooooooooooo!!! We are trying to modularize this code base.

You shouldn't only source("ggplotly.R") as you develop, you need the entire package to test properly that your changes are working. Typically, you should use a Makefile like:

all: build
R --interactive < test_script.R
build:
R CMD build /dir/to/your/repo/plotly
R CMD INSTALL --library=/dir/to/your/wip/lib plotly_version#.tar.gz

where test_script.R contains, say, a new conversion you're working on, so at the end you can make sure that the whole

$ make

runs successfully. As you develop, you probably insert some browser() calls here and there. So then you should

$ make build

Make sure your .Rhistory is never saved. Make sure your WIP version of "plotly" gets installed at the right place (not the default library for R packages). Your test_script.R should typically start with

require(plotly, lib.loc="/dir/to/your/wip/lib")

Then launch R and source("test_script.R"). Finally, to check that the test suite runs well,

$ cd tests
$ R

and, in the R console,

require(plotly, lib.loc="/dir/to/your/wip/lib")
source("testthat.R")

Cool, now this is documented somewhere.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

ok sorry about that, I moved the constants back to the other file.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

I have also included a bunch of tests from https://github.com/chriddyp/ggplot2-plotly-cookbook/blob/master/axes.R#L70-L71 which I will eventually make pass.

@mkcor

mkcor commented Feb 6, 2015

Copy link
Copy Markdown
Contributor

Test-driven development, yes!

Comment threadR/corresp_one_one.R

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.

Remove trailing white line.

@tdhocktdhock changed the title Fixes for error barsFixes for error bars and ticksFeb 9, 2015
@mkcor

Copy link
Copy Markdown
Contributor

I wish this PR was split into 10 PRs... Would make the review process faster and safer.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

The updated test table shows the most recent version of this branch as toby.fixes.reviewed

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/index.html

everything looks fine to me, ready to merge if you guys are.

@mkcor

Copy link
Copy Markdown
Contributor

I'm happy with the changes so far! If I find something 'missing', I'll submit a PR for you to review @tdhock ;)
👍
/cc @chriddyp

@chriddyp

Copy link
Copy Markdown
Member

@tdhock I noticed this ticks-flip was fixed but then not here:
image

@mkcor

Copy link
Copy Markdown
Contributor

@chriddyp Good catch! But I think we can leave this fix for another/different/upcoming PR, since this one is huge already. (@tdhock Do you append '.bug' when running the image test suite on a feature branch, and then '.reviewed' when you re-run it on that same branch once the code has been reviewed?)

@mkcor

Copy link
Copy Markdown
Contributor

I think I'll increment the middle digit in version number, after this PR is merged!
On the contrary, fixing ticks-flip will only increment the last digit.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

@chriddyp turns out my plotly code was correct for that flipped example,

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/ticks-flip.html

but the plotly-test-table code was not. In particular the plotly filename in the JSON kwargs was the same for different versions of the ggplotly code, so actually the non-flipped image that showed up was made using the code from Carson's branch, and the plotly server did not update that image file right away.

But now for the test table I give the the SHA1 in the plotly filename so I hope the plotly server will respond back with a unique plotly every time. Is that a correct interpretation of the filename argument?

https://github.com/ropensci/plotly-test-table/blob/6a034a3a65e43c03e76072a75118390f998933ed/index.R#L179

@mkcor for the test table I assign arbitrary column labels by typing them into

https://github.com/ropensci/plotly-test-table/blob/gh-pages/code_commits.csv

so yes I was using "bug" to indicate a previous version and the "reviewed" to indicate the newer version. Is that OK or would you prefer that I use labels such as "new" and "old" ?

So anyways I corrected the test table and so I guess this branch is ready to merge. Can I please get a +1?

@mkcor

Copy link
Copy Markdown
Contributor

I gave you a 👍 a long time ago because you wouldn't do the changes I would ask for so I thought I'll just do them myself...
Can you please remove files R/print.R, tests/testthat.R, and tests/testthat/test-ggplot-area.R from the changeset? They have nothing to do in this PR!

@tdhock

Copy link
Copy Markdown
ContributorAuthor

Sure I can remove those files, if you tell me how?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

sorry I am a bit confused. should I just make the reverse changes and then commit them? or is there some other git command?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

And I'm sorry if I did not do all the changes you asked for --- I tried to address all of your comments.

@mkcor

Copy link
Copy Markdown
Contributor

Well, I could have been more proactive myself and pulled the branch a while ago. Let me do it now and I'll share my recommendations.

@mkcor

Copy link
Copy Markdown
Contributor

So, I couldn't revert commits, because these dummy changes occurred in the midst of other stuff, i.e., adcc2ba or 4766545 (hence my suspicion against git commit -a).

Actually I had pulled your branch before, but never pushed. So I did:

git checkout toby-fixes
git pull origin toby-fixes
git rm R/print.R git commit -m "Remove funny file"# Looked up id/hash for latest commit on master
git checkout 1d75115f719082 tests/testthat.R
git add tests/testthat.R git commit -m "Revert testthat.R file to latest commit on master"
git checkout 1d75115f719082 tests/testthat/test-ggplot-area.R
git add tests/testthat/test-ggplot-area.R git commit -m "Revert unrelated test file to latest commit on master"
git push origin toby-fixes

Hope you find this inspiring!

@mkcor

Copy link
Copy Markdown
Contributor

+1

tdhock pushed a commit that referenced this pull request Feb 23, 2015
@tdhock
tdhock merged commit faaf4da into masterFeb 23, 2015
@tdhock
tdhock deleted the toby-fixes branch February 23, 2015 23:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tdhock@mkcor@chriddyp
, '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('^' + ".*" + ' Fixes for error bars and ticks by tdhock · Pull Request #163 · plotly/plotly.R · GitHub
Skip to content

Fixes for error bars and ticks - #163

Merged
tdhock merged 50 commits into
masterfrom
toby-fixes
Feb 23, 2015
Merged

Fixes for error bars and ticks#163
tdhock merged 50 commits into
masterfrom
toby-fixes

Conversation

@tdhock

Copy link
Copy Markdown
Contributor

Hey guys, I coded some fixes for geom_errorbar and geom_errorbarh, which is the first problem in #161

I changed the way traces are merged at the end of gg2list, so now it does not matter if the error bars come before or after the other geoms (points, lines).

I also moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R -- this saves me time during development and debugging since I only have to source("ggplotly.R") instead of both code files (in the correct order). I hope this is not a big deal for you guys.

Tests pass on my machine.

@mkcor

mkcor commented Feb 3, 2015

Copy link
Copy Markdown
Contributor

Thanks, @tdhock -- Before I actually review...

moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R

Nooooooooooooooooo!!! We are trying to modularize this code base.

You shouldn't only source("ggplotly.R") as you develop, you need the entire package to test properly that your changes are working. Typically, you should use a Makefile like:

all: build
R --interactive < test_script.R
build:
R CMD build /dir/to/your/repo/plotly
R CMD INSTALL --library=/dir/to/your/wip/lib plotly_version#.tar.gz

where test_script.R contains, say, a new conversion you're working on, so at the end you can make sure that the whole

$ make

runs successfully. As you develop, you probably insert some browser() calls here and there. So then you should

$ make build

Make sure your .Rhistory is never saved. Make sure your WIP version of "plotly" gets installed at the right place (not the default library for R packages). Your test_script.R should typically start with

require(plotly, lib.loc="/dir/to/your/wip/lib")

Then launch R and source("test_script.R"). Finally, to check that the test suite runs well,

$ cd tests
$ R

and, in the R console,

require(plotly, lib.loc="/dir/to/your/wip/lib")
source("testthat.R")

Cool, now this is documented somewhere.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

ok sorry about that, I moved the constants back to the other file.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

I have also included a bunch of tests from https://github.com/chriddyp/ggplot2-plotly-cookbook/blob/master/axes.R#L70-L71 which I will eventually make pass.

@mkcor

mkcor commented Feb 6, 2015

Copy link
Copy Markdown
Contributor

Test-driven development, yes!

Comment threadR/corresp_one_one.R

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.

Remove trailing white line.

@tdhocktdhock changed the title Fixes for error barsFixes for error bars and ticksFeb 9, 2015
@mkcor

Copy link
Copy Markdown
Contributor

I wish this PR was split into 10 PRs... Would make the review process faster and safer.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

The updated test table shows the most recent version of this branch as toby.fixes.reviewed

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/index.html

everything looks fine to me, ready to merge if you guys are.

@mkcor

Copy link
Copy Markdown
Contributor

I'm happy with the changes so far! If I find something 'missing', I'll submit a PR for you to review @tdhock ;)
👍
/cc @chriddyp

@chriddyp

Copy link
Copy Markdown
Member

@tdhock I noticed this ticks-flip was fixed but then not here:
image

@mkcor

Copy link
Copy Markdown
Contributor

@chriddyp Good catch! But I think we can leave this fix for another/different/upcoming PR, since this one is huge already. (@tdhock Do you append '.bug' when running the image test suite on a feature branch, and then '.reviewed' when you re-run it on that same branch once the code has been reviewed?)

@mkcor

Copy link
Copy Markdown
Contributor

I think I'll increment the middle digit in version number, after this PR is merged!
On the contrary, fixing ticks-flip will only increment the last digit.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

@chriddyp turns out my plotly code was correct for that flipped example,

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/ticks-flip.html

but the plotly-test-table code was not. In particular the plotly filename in the JSON kwargs was the same for different versions of the ggplotly code, so actually the non-flipped image that showed up was made using the code from Carson's branch, and the plotly server did not update that image file right away.

But now for the test table I give the the SHA1 in the plotly filename so I hope the plotly server will respond back with a unique plotly every time. Is that a correct interpretation of the filename argument?

https://github.com/ropensci/plotly-test-table/blob/6a034a3a65e43c03e76072a75118390f998933ed/index.R#L179

@mkcor for the test table I assign arbitrary column labels by typing them into

https://github.com/ropensci/plotly-test-table/blob/gh-pages/code_commits.csv

so yes I was using "bug" to indicate a previous version and the "reviewed" to indicate the newer version. Is that OK or would you prefer that I use labels such as "new" and "old" ?

So anyways I corrected the test table and so I guess this branch is ready to merge. Can I please get a +1?

@mkcor

Copy link
Copy Markdown
Contributor

I gave you a 👍 a long time ago because you wouldn't do the changes I would ask for so I thought I'll just do them myself...
Can you please remove files R/print.R, tests/testthat.R, and tests/testthat/test-ggplot-area.R from the changeset? They have nothing to do in this PR!

@tdhock

Copy link
Copy Markdown
ContributorAuthor

Sure I can remove those files, if you tell me how?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

sorry I am a bit confused. should I just make the reverse changes and then commit them? or is there some other git command?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

And I'm sorry if I did not do all the changes you asked for --- I tried to address all of your comments.

@mkcor

Copy link
Copy Markdown
Contributor

Well, I could have been more proactive myself and pulled the branch a while ago. Let me do it now and I'll share my recommendations.

@mkcor

Copy link
Copy Markdown
Contributor

So, I couldn't revert commits, because these dummy changes occurred in the midst of other stuff, i.e., adcc2ba or 4766545 (hence my suspicion against git commit -a).

Actually I had pulled your branch before, but never pushed. So I did:

git checkout toby-fixes
git pull origin toby-fixes
git rm R/print.R git commit -m "Remove funny file"# Looked up id/hash for latest commit on master
git checkout 1d75115f719082 tests/testthat.R
git add tests/testthat.R git commit -m "Revert testthat.R file to latest commit on master"
git checkout 1d75115f719082 tests/testthat/test-ggplot-area.R
git add tests/testthat/test-ggplot-area.R git commit -m "Revert unrelated test file to latest commit on master"
git push origin toby-fixes

Hope you find this inspiring!

@mkcor

Copy link
Copy Markdown
Contributor

+1

tdhock pushed a commit that referenced this pull request Feb 23, 2015
@tdhock
tdhock merged commit faaf4da into masterFeb 23, 2015
@tdhock
tdhock deleted the toby-fixes branch February 23, 2015 23:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tdhock@mkcor@chriddyp
, '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" + ' Fixes for error bars and ticks by tdhock · Pull Request #163 · plotly/plotly.R · GitHub
Skip to content

Fixes for error bars and ticks - #163

Merged
tdhock merged 50 commits into
masterfrom
toby-fixes
Feb 23, 2015
Merged

Fixes for error bars and ticks#163
tdhock merged 50 commits into
masterfrom
toby-fixes

Conversation

@tdhock

Copy link
Copy Markdown
Contributor

Hey guys, I coded some fixes for geom_errorbar and geom_errorbarh, which is the first problem in #161

I changed the way traces are merged at the end of gg2list, so now it does not matter if the error bars come before or after the other geoms (points, lines).

I also moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R -- this saves me time during development and debugging since I only have to source("ggplotly.R") instead of both code files (in the correct order). I hope this is not a big deal for you guys.

Tests pass on my machine.

@mkcor

mkcor commented Feb 3, 2015

Copy link
Copy Markdown
Contributor

Thanks, @tdhock -- Before I actually review...

moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R

Nooooooooooooooooo!!! We are trying to modularize this code base.

You shouldn't only source("ggplotly.R") as you develop, you need the entire package to test properly that your changes are working. Typically, you should use a Makefile like:

all: build
R --interactive < test_script.R
build:
R CMD build /dir/to/your/repo/plotly
R CMD INSTALL --library=/dir/to/your/wip/lib plotly_version#.tar.gz

where test_script.R contains, say, a new conversion you're working on, so at the end you can make sure that the whole

$ make

runs successfully. As you develop, you probably insert some browser() calls here and there. So then you should

$ make build

Make sure your .Rhistory is never saved. Make sure your WIP version of "plotly" gets installed at the right place (not the default library for R packages). Your test_script.R should typically start with

require(plotly, lib.loc="/dir/to/your/wip/lib")

Then launch R and source("test_script.R"). Finally, to check that the test suite runs well,

$ cd tests
$ R

and, in the R console,

require(plotly, lib.loc="/dir/to/your/wip/lib")
source("testthat.R")

Cool, now this is documented somewhere.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

ok sorry about that, I moved the constants back to the other file.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

I have also included a bunch of tests from https://github.com/chriddyp/ggplot2-plotly-cookbook/blob/master/axes.R#L70-L71 which I will eventually make pass.

@mkcor

mkcor commented Feb 6, 2015

Copy link
Copy Markdown
Contributor

Test-driven development, yes!

Comment threadR/corresp_one_one.R

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.

Remove trailing white line.

@tdhocktdhock changed the title Fixes for error barsFixes for error bars and ticksFeb 9, 2015
@mkcor

Copy link
Copy Markdown
Contributor

I wish this PR was split into 10 PRs... Would make the review process faster and safer.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

The updated test table shows the most recent version of this branch as toby.fixes.reviewed

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/index.html

everything looks fine to me, ready to merge if you guys are.

@mkcor

Copy link
Copy Markdown
Contributor

I'm happy with the changes so far! If I find something 'missing', I'll submit a PR for you to review @tdhock ;)
👍
/cc @chriddyp

@chriddyp

Copy link
Copy Markdown
Member

@tdhock I noticed this ticks-flip was fixed but then not here:
image

@mkcor

Copy link
Copy Markdown
Contributor

@chriddyp Good catch! But I think we can leave this fix for another/different/upcoming PR, since this one is huge already. (@tdhock Do you append '.bug' when running the image test suite on a feature branch, and then '.reviewed' when you re-run it on that same branch once the code has been reviewed?)

@mkcor

Copy link
Copy Markdown
Contributor

I think I'll increment the middle digit in version number, after this PR is merged!
On the contrary, fixing ticks-flip will only increment the last digit.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

@chriddyp turns out my plotly code was correct for that flipped example,

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/ticks-flip.html

but the plotly-test-table code was not. In particular the plotly filename in the JSON kwargs was the same for different versions of the ggplotly code, so actually the non-flipped image that showed up was made using the code from Carson's branch, and the plotly server did not update that image file right away.

But now for the test table I give the the SHA1 in the plotly filename so I hope the plotly server will respond back with a unique plotly every time. Is that a correct interpretation of the filename argument?

https://github.com/ropensci/plotly-test-table/blob/6a034a3a65e43c03e76072a75118390f998933ed/index.R#L179

@mkcor for the test table I assign arbitrary column labels by typing them into

https://github.com/ropensci/plotly-test-table/blob/gh-pages/code_commits.csv

so yes I was using "bug" to indicate a previous version and the "reviewed" to indicate the newer version. Is that OK or would you prefer that I use labels such as "new" and "old" ?

So anyways I corrected the test table and so I guess this branch is ready to merge. Can I please get a +1?

@mkcor

Copy link
Copy Markdown
Contributor

I gave you a 👍 a long time ago because you wouldn't do the changes I would ask for so I thought I'll just do them myself...
Can you please remove files R/print.R, tests/testthat.R, and tests/testthat/test-ggplot-area.R from the changeset? They have nothing to do in this PR!

@tdhock

Copy link
Copy Markdown
ContributorAuthor

Sure I can remove those files, if you tell me how?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

sorry I am a bit confused. should I just make the reverse changes and then commit them? or is there some other git command?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

And I'm sorry if I did not do all the changes you asked for --- I tried to address all of your comments.

@mkcor

Copy link
Copy Markdown
Contributor

Well, I could have been more proactive myself and pulled the branch a while ago. Let me do it now and I'll share my recommendations.

@mkcor

Copy link
Copy Markdown
Contributor

So, I couldn't revert commits, because these dummy changes occurred in the midst of other stuff, i.e., adcc2ba or 4766545 (hence my suspicion against git commit -a).

Actually I had pulled your branch before, but never pushed. So I did:

git checkout toby-fixes
git pull origin toby-fixes
git rm R/print.R git commit -m "Remove funny file"# Looked up id/hash for latest commit on master
git checkout 1d75115f719082 tests/testthat.R
git add tests/testthat.R git commit -m "Revert testthat.R file to latest commit on master"
git checkout 1d75115f719082 tests/testthat/test-ggplot-area.R
git add tests/testthat/test-ggplot-area.R git commit -m "Revert unrelated test file to latest commit on master"
git push origin toby-fixes

Hope you find this inspiring!

@mkcor

Copy link
Copy Markdown
Contributor

+1

tdhock pushed a commit that referenced this pull request Feb 23, 2015
@tdhock
tdhock merged commit faaf4da into masterFeb 23, 2015
@tdhock
tdhock deleted the toby-fixes branch February 23, 2015 23:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tdhock@mkcor@chriddyp
, '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('^' + ".*" + ' Fixes for error bars and ticks by tdhock · Pull Request #163 · plotly/plotly.R · GitHub
Skip to content

Fixes for error bars and ticks - #163

Merged
tdhock merged 50 commits into
masterfrom
toby-fixes
Feb 23, 2015
Merged

Fixes for error bars and ticks#163
tdhock merged 50 commits into
masterfrom
toby-fixes

Conversation

@tdhock

Copy link
Copy Markdown
Contributor

Hey guys, I coded some fixes for geom_errorbar and geom_errorbarh, which is the first problem in #161

I changed the way traces are merged at the end of gg2list, so now it does not matter if the error bars come before or after the other geoms (points, lines).

I also moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R -- this saves me time during development and debugging since I only have to source("ggplotly.R") instead of both code files (in the correct order). I hope this is not a big deal for you guys.

Tests pass on my machine.

@mkcor

mkcor commented Feb 3, 2015

Copy link
Copy Markdown
Contributor

Thanks, @tdhock -- Before I actually review...

moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R

Nooooooooooooooooo!!! We are trying to modularize this code base.

You shouldn't only source("ggplotly.R") as you develop, you need the entire package to test properly that your changes are working. Typically, you should use a Makefile like:

all: build
R --interactive < test_script.R
build:
R CMD build /dir/to/your/repo/plotly
R CMD INSTALL --library=/dir/to/your/wip/lib plotly_version#.tar.gz

where test_script.R contains, say, a new conversion you're working on, so at the end you can make sure that the whole

$ make

runs successfully. As you develop, you probably insert some browser() calls here and there. So then you should

$ make build

Make sure your .Rhistory is never saved. Make sure your WIP version of "plotly" gets installed at the right place (not the default library for R packages). Your test_script.R should typically start with

require(plotly, lib.loc="/dir/to/your/wip/lib")

Then launch R and source("test_script.R"). Finally, to check that the test suite runs well,

$ cd tests
$ R

and, in the R console,

require(plotly, lib.loc="/dir/to/your/wip/lib")
source("testthat.R")

Cool, now this is documented somewhere.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

ok sorry about that, I moved the constants back to the other file.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

I have also included a bunch of tests from https://github.com/chriddyp/ggplot2-plotly-cookbook/blob/master/axes.R#L70-L71 which I will eventually make pass.

@mkcor

mkcor commented Feb 6, 2015

Copy link
Copy Markdown
Contributor

Test-driven development, yes!

Comment threadR/corresp_one_one.R

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.

Remove trailing white line.

@tdhocktdhock changed the title Fixes for error barsFixes for error bars and ticksFeb 9, 2015
@mkcor

Copy link
Copy Markdown
Contributor

I wish this PR was split into 10 PRs... Would make the review process faster and safer.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

The updated test table shows the most recent version of this branch as toby.fixes.reviewed

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/index.html

everything looks fine to me, ready to merge if you guys are.

@mkcor

Copy link
Copy Markdown
Contributor

I'm happy with the changes so far! If I find something 'missing', I'll submit a PR for you to review @tdhock ;)
👍
/cc @chriddyp

@chriddyp

Copy link
Copy Markdown
Member

@tdhock I noticed this ticks-flip was fixed but then not here:
image

@mkcor

Copy link
Copy Markdown
Contributor

@chriddyp Good catch! But I think we can leave this fix for another/different/upcoming PR, since this one is huge already. (@tdhock Do you append '.bug' when running the image test suite on a feature branch, and then '.reviewed' when you re-run it on that same branch once the code has been reviewed?)

@mkcor

Copy link
Copy Markdown
Contributor

I think I'll increment the middle digit in version number, after this PR is merged!
On the contrary, fixing ticks-flip will only increment the last digit.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

@chriddyp turns out my plotly code was correct for that flipped example,

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/ticks-flip.html

but the plotly-test-table code was not. In particular the plotly filename in the JSON kwargs was the same for different versions of the ggplotly code, so actually the non-flipped image that showed up was made using the code from Carson's branch, and the plotly server did not update that image file right away.

But now for the test table I give the the SHA1 in the plotly filename so I hope the plotly server will respond back with a unique plotly every time. Is that a correct interpretation of the filename argument?

https://github.com/ropensci/plotly-test-table/blob/6a034a3a65e43c03e76072a75118390f998933ed/index.R#L179

@mkcor for the test table I assign arbitrary column labels by typing them into

https://github.com/ropensci/plotly-test-table/blob/gh-pages/code_commits.csv

so yes I was using "bug" to indicate a previous version and the "reviewed" to indicate the newer version. Is that OK or would you prefer that I use labels such as "new" and "old" ?

So anyways I corrected the test table and so I guess this branch is ready to merge. Can I please get a +1?

@mkcor

Copy link
Copy Markdown
Contributor

I gave you a 👍 a long time ago because you wouldn't do the changes I would ask for so I thought I'll just do them myself...
Can you please remove files R/print.R, tests/testthat.R, and tests/testthat/test-ggplot-area.R from the changeset? They have nothing to do in this PR!

@tdhock

Copy link
Copy Markdown
ContributorAuthor

Sure I can remove those files, if you tell me how?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

sorry I am a bit confused. should I just make the reverse changes and then commit them? or is there some other git command?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

And I'm sorry if I did not do all the changes you asked for --- I tried to address all of your comments.

@mkcor

Copy link
Copy Markdown
Contributor

Well, I could have been more proactive myself and pulled the branch a while ago. Let me do it now and I'll share my recommendations.

@mkcor

Copy link
Copy Markdown
Contributor

So, I couldn't revert commits, because these dummy changes occurred in the midst of other stuff, i.e., adcc2ba or 4766545 (hence my suspicion against git commit -a).

Actually I had pulled your branch before, but never pushed. So I did:

git checkout toby-fixes
git pull origin toby-fixes
git rm R/print.R git commit -m "Remove funny file"# Looked up id/hash for latest commit on master
git checkout 1d75115f719082 tests/testthat.R
git add tests/testthat.R git commit -m "Revert testthat.R file to latest commit on master"
git checkout 1d75115f719082 tests/testthat/test-ggplot-area.R
git add tests/testthat/test-ggplot-area.R git commit -m "Revert unrelated test file to latest commit on master"
git push origin toby-fixes

Hope you find this inspiring!

@mkcor

Copy link
Copy Markdown
Contributor

+1

tdhock pushed a commit that referenced this pull request Feb 23, 2015
@tdhock
tdhock merged commit faaf4da into masterFeb 23, 2015
@tdhock
tdhock deleted the toby-fixes branch February 23, 2015 23:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tdhock@mkcor@chriddyp
, '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('^' + ".*" + ' Fixes for error bars and ticks by tdhock · Pull Request #163 · plotly/plotly.R · GitHub
Skip to content

Fixes for error bars and ticks - #163

Merged
tdhock merged 50 commits into
masterfrom
toby-fixes
Feb 23, 2015
Merged

Fixes for error bars and ticks#163
tdhock merged 50 commits into
masterfrom
toby-fixes

Conversation

@tdhock

Copy link
Copy Markdown
Contributor

Hey guys, I coded some fixes for geom_errorbar and geom_errorbarh, which is the first problem in #161

I changed the way traces are merged at the end of gg2list, so now it does not matter if the error bars come before or after the other geoms (points, lines).

I also moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R -- this saves me time during development and debugging since I only have to source("ggplotly.R") instead of both code files (in the correct order). I hope this is not a big deal for you guys.

Tests pass on my machine.

@mkcor

mkcor commented Feb 3, 2015

Copy link
Copy Markdown
Contributor

Thanks, @tdhock -- Before I actually review...

moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R

Nooooooooooooooooo!!! We are trying to modularize this code base.

You shouldn't only source("ggplotly.R") as you develop, you need the entire package to test properly that your changes are working. Typically, you should use a Makefile like:

all: build
R --interactive < test_script.R
build:
R CMD build /dir/to/your/repo/plotly
R CMD INSTALL --library=/dir/to/your/wip/lib plotly_version#.tar.gz

where test_script.R contains, say, a new conversion you're working on, so at the end you can make sure that the whole

$ make

runs successfully. As you develop, you probably insert some browser() calls here and there. So then you should

$ make build

Make sure your .Rhistory is never saved. Make sure your WIP version of "plotly" gets installed at the right place (not the default library for R packages). Your test_script.R should typically start with

require(plotly, lib.loc="/dir/to/your/wip/lib")

Then launch R and source("test_script.R"). Finally, to check that the test suite runs well,

$ cd tests
$ R

and, in the R console,

require(plotly, lib.loc="/dir/to/your/wip/lib")
source("testthat.R")

Cool, now this is documented somewhere.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

ok sorry about that, I moved the constants back to the other file.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

I have also included a bunch of tests from https://github.com/chriddyp/ggplot2-plotly-cookbook/blob/master/axes.R#L70-L71 which I will eventually make pass.

@mkcor

mkcor commented Feb 6, 2015

Copy link
Copy Markdown
Contributor

Test-driven development, yes!

Comment threadR/corresp_one_one.R

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.

Remove trailing white line.

@tdhocktdhock changed the title Fixes for error barsFixes for error bars and ticksFeb 9, 2015
@mkcor

Copy link
Copy Markdown
Contributor

I wish this PR was split into 10 PRs... Would make the review process faster and safer.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

The updated test table shows the most recent version of this branch as toby.fixes.reviewed

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/index.html

everything looks fine to me, ready to merge if you guys are.

@mkcor

Copy link
Copy Markdown
Contributor

I'm happy with the changes so far! If I find something 'missing', I'll submit a PR for you to review @tdhock ;)
👍
/cc @chriddyp

@chriddyp

Copy link
Copy Markdown
Member

@tdhock I noticed this ticks-flip was fixed but then not here:
image

@mkcor

Copy link
Copy Markdown
Contributor

@chriddyp Good catch! But I think we can leave this fix for another/different/upcoming PR, since this one is huge already. (@tdhock Do you append '.bug' when running the image test suite on a feature branch, and then '.reviewed' when you re-run it on that same branch once the code has been reviewed?)

@mkcor

Copy link
Copy Markdown
Contributor

I think I'll increment the middle digit in version number, after this PR is merged!
On the contrary, fixing ticks-flip will only increment the last digit.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

@chriddyp turns out my plotly code was correct for that flipped example,

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/ticks-flip.html

but the plotly-test-table code was not. In particular the plotly filename in the JSON kwargs was the same for different versions of the ggplotly code, so actually the non-flipped image that showed up was made using the code from Carson's branch, and the plotly server did not update that image file right away.

But now for the test table I give the the SHA1 in the plotly filename so I hope the plotly server will respond back with a unique plotly every time. Is that a correct interpretation of the filename argument?

https://github.com/ropensci/plotly-test-table/blob/6a034a3a65e43c03e76072a75118390f998933ed/index.R#L179

@mkcor for the test table I assign arbitrary column labels by typing them into

https://github.com/ropensci/plotly-test-table/blob/gh-pages/code_commits.csv

so yes I was using "bug" to indicate a previous version and the "reviewed" to indicate the newer version. Is that OK or would you prefer that I use labels such as "new" and "old" ?

So anyways I corrected the test table and so I guess this branch is ready to merge. Can I please get a +1?

@mkcor

Copy link
Copy Markdown
Contributor

I gave you a 👍 a long time ago because you wouldn't do the changes I would ask for so I thought I'll just do them myself...
Can you please remove files R/print.R, tests/testthat.R, and tests/testthat/test-ggplot-area.R from the changeset? They have nothing to do in this PR!

@tdhock

Copy link
Copy Markdown
ContributorAuthor

Sure I can remove those files, if you tell me how?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

sorry I am a bit confused. should I just make the reverse changes and then commit them? or is there some other git command?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

And I'm sorry if I did not do all the changes you asked for --- I tried to address all of your comments.

@mkcor

Copy link
Copy Markdown
Contributor

Well, I could have been more proactive myself and pulled the branch a while ago. Let me do it now and I'll share my recommendations.

@mkcor

Copy link
Copy Markdown
Contributor

So, I couldn't revert commits, because these dummy changes occurred in the midst of other stuff, i.e., adcc2ba or 4766545 (hence my suspicion against git commit -a).

Actually I had pulled your branch before, but never pushed. So I did:

git checkout toby-fixes
git pull origin toby-fixes
git rm R/print.R git commit -m "Remove funny file"# Looked up id/hash for latest commit on master
git checkout 1d75115f719082 tests/testthat.R
git add tests/testthat.R git commit -m "Revert testthat.R file to latest commit on master"
git checkout 1d75115f719082 tests/testthat/test-ggplot-area.R
git add tests/testthat/test-ggplot-area.R git commit -m "Revert unrelated test file to latest commit on master"
git push origin toby-fixes

Hope you find this inspiring!

@mkcor

Copy link
Copy Markdown
Contributor

+1

tdhock pushed a commit that referenced this pull request Feb 23, 2015
@tdhock
tdhock merged commit faaf4da into masterFeb 23, 2015
@tdhock
tdhock deleted the toby-fixes branch February 23, 2015 23:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tdhock@mkcor@chriddyp
, '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); } })(); })(); Fixes for error bars and ticks by tdhock · Pull Request #163 · plotly/plotly.R · GitHub
Skip to content

Fixes for error bars and ticks - #163

Merged
tdhock merged 50 commits into
masterfrom
toby-fixes
Feb 23, 2015
Merged

Fixes for error bars and ticks#163
tdhock merged 50 commits into
masterfrom
toby-fixes

Conversation

@tdhock

Copy link
Copy Markdown
Contributor

Hey guys, I coded some fixes for geom_errorbar and geom_errorbarh, which is the first problem in #161

I changed the way traces are merged at the end of gg2list, so now it does not matter if the error bars come before or after the other geoms (points, lines).

I also moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R -- this saves me time during development and debugging since I only have to source("ggplotly.R") instead of both code files (in the correct order). I hope this is not a big deal for you guys.

Tests pass on my machine.

@mkcor

mkcor commented Feb 3, 2015

Copy link
Copy Markdown
Contributor

Thanks, @tdhock -- Before I actually review...

moved the definition of a few constants from corresp_one_one.R to the top of ggplotly.R

Nooooooooooooooooo!!! We are trying to modularize this code base.

You shouldn't only source("ggplotly.R") as you develop, you need the entire package to test properly that your changes are working. Typically, you should use a Makefile like:

all: build
R --interactive < test_script.R
build:
R CMD build /dir/to/your/repo/plotly
R CMD INSTALL --library=/dir/to/your/wip/lib plotly_version#.tar.gz

where test_script.R contains, say, a new conversion you're working on, so at the end you can make sure that the whole

$ make

runs successfully. As you develop, you probably insert some browser() calls here and there. So then you should

$ make build

Make sure your .Rhistory is never saved. Make sure your WIP version of "plotly" gets installed at the right place (not the default library for R packages). Your test_script.R should typically start with

require(plotly, lib.loc="/dir/to/your/wip/lib")

Then launch R and source("test_script.R"). Finally, to check that the test suite runs well,

$ cd tests
$ R

and, in the R console,

require(plotly, lib.loc="/dir/to/your/wip/lib")
source("testthat.R")

Cool, now this is documented somewhere.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

ok sorry about that, I moved the constants back to the other file.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

I have also included a bunch of tests from https://github.com/chriddyp/ggplot2-plotly-cookbook/blob/master/axes.R#L70-L71 which I will eventually make pass.

@mkcor

mkcor commented Feb 6, 2015

Copy link
Copy Markdown
Contributor

Test-driven development, yes!

Comment threadR/corresp_one_one.R

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.

Remove trailing white line.

@tdhocktdhock changed the title Fixes for error barsFixes for error bars and ticksFeb 9, 2015
@mkcor

Copy link
Copy Markdown
Contributor

I wish this PR was split into 10 PRs... Would make the review process faster and safer.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

The updated test table shows the most recent version of this branch as toby.fixes.reviewed

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/index.html

everything looks fine to me, ready to merge if you guys are.

@mkcor

Copy link
Copy Markdown
Contributor

I'm happy with the changes so far! If I find something 'missing', I'll submit a PR for you to review @tdhock ;)
👍
/cc @chriddyp

@chriddyp

Copy link
Copy Markdown
Member

@tdhock I noticed this ticks-flip was fixed but then not here:
image

@mkcor

Copy link
Copy Markdown
Contributor

@chriddyp Good catch! But I think we can leave this fix for another/different/upcoming PR, since this one is huge already. (@tdhock Do you append '.bug' when running the image test suite on a feature branch, and then '.reviewed' when you re-run it on that same branch once the code has been reviewed?)

@mkcor

Copy link
Copy Markdown
Contributor

I think I'll increment the middle digit in version number, after this PR is merged!
On the contrary, fixing ticks-flip will only increment the last digit.

@tdhock

Copy link
Copy Markdown
ContributorAuthor

@chriddyp turns out my plotly code was correct for that flipped example,

http://ropensci.github.io/plotly-test-table/tables/c47b8026a456a0ae382011db8ac4cce074fe5b1d/ticks-flip.html

but the plotly-test-table code was not. In particular the plotly filename in the JSON kwargs was the same for different versions of the ggplotly code, so actually the non-flipped image that showed up was made using the code from Carson's branch, and the plotly server did not update that image file right away.

But now for the test table I give the the SHA1 in the plotly filename so I hope the plotly server will respond back with a unique plotly every time. Is that a correct interpretation of the filename argument?

https://github.com/ropensci/plotly-test-table/blob/6a034a3a65e43c03e76072a75118390f998933ed/index.R#L179

@mkcor for the test table I assign arbitrary column labels by typing them into

https://github.com/ropensci/plotly-test-table/blob/gh-pages/code_commits.csv

so yes I was using "bug" to indicate a previous version and the "reviewed" to indicate the newer version. Is that OK or would you prefer that I use labels such as "new" and "old" ?

So anyways I corrected the test table and so I guess this branch is ready to merge. Can I please get a +1?

@mkcor

Copy link
Copy Markdown
Contributor

I gave you a 👍 a long time ago because you wouldn't do the changes I would ask for so I thought I'll just do them myself...
Can you please remove files R/print.R, tests/testthat.R, and tests/testthat/test-ggplot-area.R from the changeset? They have nothing to do in this PR!

@tdhock

Copy link
Copy Markdown
ContributorAuthor

Sure I can remove those files, if you tell me how?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

sorry I am a bit confused. should I just make the reverse changes and then commit them? or is there some other git command?

@tdhock

Copy link
Copy Markdown
ContributorAuthor

And I'm sorry if I did not do all the changes you asked for --- I tried to address all of your comments.

@mkcor

Copy link
Copy Markdown
Contributor

Well, I could have been more proactive myself and pulled the branch a while ago. Let me do it now and I'll share my recommendations.

@mkcor

Copy link
Copy Markdown
Contributor

So, I couldn't revert commits, because these dummy changes occurred in the midst of other stuff, i.e., adcc2ba or 4766545 (hence my suspicion against git commit -a).

Actually I had pulled your branch before, but never pushed. So I did:

git checkout toby-fixes
git pull origin toby-fixes
git rm R/print.R git commit -m "Remove funny file"# Looked up id/hash for latest commit on master
git checkout 1d75115f719082 tests/testthat.R
git add tests/testthat.R git commit -m "Revert testthat.R file to latest commit on master"
git checkout 1d75115f719082 tests/testthat/test-ggplot-area.R
git add tests/testthat/test-ggplot-area.R git commit -m "Revert unrelated test file to latest commit on master"
git push origin toby-fixes

Hope you find this inspiring!

@mkcor

Copy link
Copy Markdown
Contributor

+1

tdhock pushed a commit that referenced this pull request Feb 23, 2015
@tdhock
tdhock merged commit faaf4da into masterFeb 23, 2015
@tdhock
tdhock deleted the toby-fixes branch February 23, 2015 23:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tdhock@mkcor@chriddyp