eplot
eplot copied to clipboard
Added option to suppress default title and fixed some tabbing
@cjfman If you're still out there, I'd like to rebase your commits for you against the current master and then start a new pull request to get this merged in.
Is that OK with you?
Hello,
Yes please, pull it in.
On Wed, Aug 5, 2020 at 9:51 PM Kevin Ernst [email protected] wrote:
@cjfman https://github.com/cjfman If you're still out there, I'd like to rebase your commits for you against the current master and then start a new pull request to get this merged in.
Is that OK with you?
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/chriswolfvision/eplot/pull/4#issuecomment-669635554, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAYSBHYIZ4YS5Q2D2KIMTFDR7IEBBANCNFSM4EOSY63A .
Ok, @ernstki, I've finished the rebase. Ready to merge.
Super, thanks. I didn't expect that!
I'm having a look to see if I can make the --notitle
option work with the -m
/ --mulfrmul
(multiple curves from multiple files). I feel strongly about "truth in advertising," so --notitle
should do what it says, for single and multiple plots.
Is that something you would be willing to integrate into your PR if I do most of the legwork for you (e.g., provide a patch)?
Yeah, that's fine. Teamwork!
~Charles
On Fri, Aug 7, 2020 at 12:44 PM Kevin Ernst [email protected] wrote:
Super, thanks. I didn't expect that!
I'm having a look to see if I can make the --notitle option work with the -m / --mulfrmul (multiple curves from multiple files). I feel strongly about "truth in advertising," so --notitle should do what it says, for single and multiple plots.
Is that something you would be willing to integrate into your PR if I do most of the legwork for you (e.g., provide a patch)?
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/chriswolfvision/eplot/pull/4#issuecomment-670607337, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAYSBH6OTGFHZ3VSMSRYKWLR7QVNLANCNFSM4EOSY63A .
Just to clarify, yes please provide the patch.
@cjfman Here ya go!
If you've never dealt with a patch file (likely you have, but I don't want to assume), this should work:
cd /place/where/you/cloned/eplot
curl https://github.com/cjfman/eplot/compare/master...ernstki:add-notitle-option.diff \
| patch -p1
I only added one line of code to get --notitle
to work with -m
/ --mulfrmul
, and updated the changelog, so I don't need any credit for the commit.
I thought a PR for a PR would be way overengineering it, but if that's actually easier for you somehow, I can.
@ernstki, Thanks for the quick patch command. I've used patches before, but they trip me up every time. Everything should be ready to go.
@cjfman You have to actually look at the first line of the patch file to figure out what number to give to -p
, in order to strip off the right number of leading subdirectories from the patch to get it to match up with your actual filesystem. Once I realized that it was a huge epiphany.
So in this example, if I wanted to apply the patch file below to an eplot
that is in my current working directory, I need to strip one path element (-p1
) from the patch file, because there is no such directory ./a
or ./b
on my local filesystem.
diff --git a/eplot b/eplot
index 9337375..c93d678 100755
--- a/eplot
+++ b/eplot
In the confines of GitHub, you can add .diff
to the end of any URL that shows differences and it generates the patch file for you, and you always apply those to with patch -p1 <patchfile
. Patches you get from humans could be -p0
or really anything, though, and you'd have look inside the patch file itself to be sure. :)
You can make your own patch file in the same "unified" format with diff -u untouched-clone my-clone-with-updates
, and usually you see the "untouched" copy of the code renamed to be projectname.orig
. It should always be the first argument to diff -u
, or the "left" file if you think about it in those terms like I do.
Hope that helps!
@chriswolfvision Does this look OK to merge in? I have tests in another branch in my personal fork, if you want some assurances that it works as advertised.
@chriswolfvision looks good to me!