On Feb 15, 2015, at 10:35 PM, "Alan W. Irwin" <ir...@beluga.phys.uvic.ca> wrote:
> On 2015-02-15 21:15-0500 Jim Dishaw wrote: > >> Did the patch I sent earlier work? > > The last I saw from you was the patch (actually a patch series) you > sent 3 days ago. That got into the integrated series by Phil (which > worked, which I think answers your question). Because that worked, Strange, I must have dreamt that I sent out a patch--I checked my sent mail and it was not there. I followed the steps you mentioned in your email when I created that patch. Regardless, I have made sure my local master is current and have attached a new patch to this email. Actually, I just found the missing email in my outbox--they never got sent. I think I successfully got my master updated and rebased my branch. I have attached a patch that captures my work relative to the current master. I really hope this patch works without conflicts! I was able to generate a plot metafile, read it back in, and replot from within the same program. The replotted metafile is not identical at the file level--I have not dug into why it is not. However, it is identical to the output generated by plrender. I have created two new command line switches, -mfi and -mfo. I think we need to think about the behavior of these two command line switches. Right now all they do is set the filenames that should be used. Some food for thought: mfi behavior 1) mfi only sets the filename and the programmer has to put a plreadmetafile(NULL) in the program to read. 2) mfi sets the filename and a new plot stream will be created to handle to generate the output 3) mfi sets the filename and it will be inserted into the beginning of the output of plot stream 0. mfo behavior 1) mfo only sets the filename and the programmer has to a plwritemetafile(NULL) in the program to render the current page to the metafile (this will force plbuf_write to 1 on all plot streams) 2) moo sets the filename (and forces plbuf_write to 1 on all plot streams) and every page is written to the metafile > Phil pushed that integrated series to master, and I followed up with > the visibility fix for test_plbuf and with a large and intrusive > patch to style all the recent changes. To repeat what I said > before, please make sure you are subscribed to the git feed so you know > all about the latest git activity for our SF repo such as the big push > from Phil and my latest changes as well. > > But for the sake of argument let's say you haven't been paying attention > to that feed. Then to confirm exactly what is in the latest master do the > following: > > # Update your local master to be consistent with the SF version > git checkout master #if not already there > git fetch > git merge --ff-only origin/master > > # Find out list of commits (in reverse chronological order) that are > (now) in your local master branch > > git log --oneline |less > > Your series of commits should be about 60th on that list because Phil's > integrated > patch series had a lot of commits after yours. If you want lots of > details about each of those commits, drop the --oneline option. > > Then create a fresh topic branch from that updated local master > branch, and proceed from there with any changes after the last commit > from you that got into master and any subsequent changes to plbuf that > Phils commit series did or my subsequent commits did. > > Note, a lot of what I say about the appropriate git commands to use > has already been documented in README.developers. So consult that > file first if you have questions about what I said above, but once you > have consulted that file I would be happy to answer further questions > concerning git. > > Alan ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
