-
Notifications
You must be signed in to change notification settings - Fork 181
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge pkg into masters #24
base: main
Are you sure you want to change the base?
Conversation
this makes it easier to differentiate between the join-related and the (coming) tidyr-related functions that have similar goals
-id1, -id2 work, id1:id2 does not (yet)
- Import packages from tidyverse - Set global imports in zzzz-package.R - Import pipe and tidyeval - Update authors - Downgrade version to 0.0.1.9000 - Change license to MIT - TODO: Internal package qualifications still needed, e.g. dplyr::row_numbers()
if printed it will still call animate, but gives the user more flexibility about animation factors (such as times etc)
Uses the algorithm mentioned at https://stackoverflow.com/a/3943023/2022615 based on the luminance of the background color to determine black or white text. The threshold favored black text in a way that didn't look good with our plots, so I increased the threshold from 0.179 to 0.333.
Adds a few additional dplyr functions to the package imports, in particular: slice, data_frame, and row_number.
Currently only used for setting global text and title font sizes, but can be extended to other options that we may wish to set for more than one plot. For fonts, we now provide `set_font_size()` that can be used to set text and title sizes across all subsequent animations. Includes internal getter functions get_{text|title}_size().
Sets figure output to man/figures/tidyexplain- and ensures that all R chunks that output figures are named. This gives a collection of animations and static images with reasonable names ready for download and use.
Changed name of set_text_color() to choose_text_color() to avoid confusion with the global option setter functions, e.g. set_text_size(). Updated tests to reflect modified threshold.
animate_join() now lives in animate_join.R with the other animate_join_ functions. These all use rlang::enquo() to capture their arguments so that animate_join() can print the variable name in the plot title.
And change Long/Wide to lowercase to reflect that they are both variables names and a description of the state of the data.
Adds get_input_text() that can be used to get the literal variable name and make_named_data() that creates a list with the input data frames. This second one is necessary because the inputs may be quosures and we need to get the underlying data frames. Default names are $x and $y.
Add framework for animation options (fixed)
Pkg updates
Somehow I cannot push my local master to the repository. Is it possible that you merge the branches in this PR? |
Can you push your local master under a different name, so that we can sort it out? Some changes from this branch are in conflict with the main master. # Make sure working copy is clean
git checkout -b master-davzim master
git push -u origin HEAD To bring local master in sync with this master, you can then do: # Make sure working copy is clean
git checkout master
git reset --hard origin/master This assumes that the remote that corresponds to this repo is called |
I have tried that but I am not sure if that was correct. The merge has also introduced old files from the master branch. |
The
|
I am a bit unsure how to resolve this exactly. The master-davzim branch is obsolete I think, that is, the pkg branch holds everything we need. |
Then: # Make sure working copy is clean
git checkout pkg
git cherry-pick --no-edit fe4d4b0
git merge master -X ours
git push This will allow merging this PR. |
That looks good! (On a sidenote: Thanks for the help and your time!) |
You're welcome. The technical challenges are resolved, we need approval from Garrick now. |
Sorry all that it's taken me a while to get to this. I had quite a bit going on around our recent holiday and didn't have time to get to this. I should be able to move this forward this week. Personally, I prefer the master/dev branch style (along the lines of this git branching model), where the Before we merge |
theme_env seems to have been retired from ggplot, replaced with theme_void
before the additional arguments such as color_header = "black" would trigger a warning that the argument is not recognised. Now the color arguments passed to add_color_join
before saving, the function animate needs to be called
more in line with set_text_* functions
helpful if there is wide text
No worries, my simulations are running in the background so I have some time to look into this. My conclusion is below. I also tweaked some minor things, added more options (color and sizes of cells), and updated both the Readme and the images The status quo (branch master) allows the following functions:
each function is script based and does not allow for different datasets (i.e., other variable names etc) as parameters are hard coded. This branch (branch pkg) refactors the code and introduces the package layer, while keeping the functionality. I.e., the same functions can be animated with similar results, the differences come from small design choices. Furthermore, we introduce the following features in pkg:
The animations/pictures for the users that do not wish to compile the graphics by themselves is updated to contain the new versions of the operations (in the folder images). My conclusion, the pkg-branch is working good. Some user-facing information could be included in the readme to point the user to the features she can tweak, but our documentation in the package covers everything I found. So far missing is the functionality of named by-arguments in joins, e.g., the following does not work
Whereas the following works as expected
|
What is the current status of this PR, can we merge the branches or are we missing some functionality? |
Just want to ping this PR to see the state. I'd like to potentially scavenge some parts to automatically create figures for data instead of manually constructing figures (c.f. |
Overall, off the top of my head there are four main areas that require further attention:
Overall, I don't have a |
@coatless You're welcome to scavenge here for anything relevant to your projects! |
No description provided.