Phil, please send me a patch relative to the current master and I will apply to
my branch. I will issue a new patch of my branch.
> On Feb 13, 2015, at 3:01 PM, Alan W. Irwin <ir...@beluga.phys.uvic.ca> wrote:
>
>> On 2015-02-13 17:19-0000 Phil Rosenberg wrote:
>>
>> Just to prove Alan right that Jim and I are close to tied in terms of
>> getting our changes made I have attached a patch containing the new
>> wxWidgets driver.
>> I have done quick tests only on Windows Centos and Ubuntu, although I
>> made a few changes since I last tested on Ubuntu. As far as I can tell
>> all the wxWidgets related stuff is done, up to the point where we have
>> a good interactive driver including the ability to embed plots in a
>> user's own wxWidgets application. I still have to implement using
>> wxWidgets as a file driver, but that should be relatively
>> straightforward now everything else is in place.
>>
>> Because this driver relies on replotting the buffer, there may still
>> be rendering issues related to problems with the buffer. To me these
>> are somewhat separate and shouldn't necessarily hold up deploying the
>> driver, but they still all need to be spotted and fixed.
>>
>> It is perhaps worth noting that in the end this driver isn't reliant
>> on plmetafiles at the moment. However my plan is that this will change
>> in the future.
>>
>> All feedback (good and bad) gratefully received.
>
> Hi Phil:
>
> I cannot apply your patch series on top of Jim's patch series (from
> yesterday). "git am" failed with the following message:
>
> [...]
> Applying: Put correct direction slash in #include<wx/frame> in wxplframe.h to
> allow compilation on inux. Added wxT macro to allow compatibil
> ity with wxWidgets 2.8 in wxPlFrame constructor in wxplviewer.cpp.
> Applying: Removed SetIcon call in wxplviewer.cpp and wrapped argv[2] in a\
> wxString( ) construction to allow it to compile on wxWidgets 2.8 intel system
> Applying: Corrected capitalisation of #include "wxplframe.h" in wxplviewer.cpp
> Applying: Rewrote the whole scaling part of the wxWidgets driver. Also edited
> the buffer code so that character scale can be added during a call to
> plP_subpInit and made that call. This ensures the initial text size ends up
> in the buffer.
> /home/software/plplot/HEAD/plplot.git/.git/rebase-apply/patch:20: trailing
> whitespace.
> m_stream.Create( NULL, WXWINDOW::GetClientSize().GetWidth(),
> WXWINDOW::GetClientSize().GetHeight(),
> /home/software/plplot/HEAD/plplot.git/.git/rebase-apply/patch:116: trailing
> whitespace.
> //As far as plplot is concerned the size of the window is SHRT_MAX by
> /home/software/plplot/HEAD/plplot.git/.git/rebase-apply/patch:172: trailing
> whitespace.
>
> /home/software/plplot/HEAD/plplot.git/.git/rebase-apply/patch:183: trailing
> whitespace.
>
> /home/software/plplot/HEAD/plplot.git/.git/rebase-apply/patch:302: trailing
> whitespace.
> wxPlFrame* frame = new wxPlFrame( NULL, wxID_ANY, wxT("wxPlViewer"),
> file, error: patch failed: src/plbuf.c:1235
> error: src/plbuf.c: patch does not apply
> Patch failed at 0022 Rewrote the whole scaling part of the wxWidgets driver.
> Also edited the buffer code so that character scale can be added during a
> call to plP_subpInit and made that call. This ensures the initial text size
> ends up in the buffer.
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
>
> The "error: patch failed: src/plbuf.c:1235" message simply means that
> Jim's latest series of patches to plbuf conflicts with what you are
> assuming. Also, your series of patches obviously contains changes a
> number of different changes to Jim's version of plbuf to get it to
> work for you. I strongly suggest you split all those plbuf changes
> out into one initial patch to be applied on top of Jim's latest
> series. Then that will give Jim a chance to evaluate exactly the
> extra changes that you desire, and allow others like me to apply Jim's
> series, your additional plbuf changes patch, and then the rest of your
> patch series that does not touch any part of Jim's work.
>
> Alan
> __________________________
> Alan W. Irwin
>
> Astronomical research affiliation with Department of Physics and Astronomy,
> University of Victoria (astrowww.phys.uvic.ca).
>
> Programming affiliations with the FreeEOS equation-of-state
> implementation for stellar interiors (freeeos.sf.net); the Time
> Ephemerides project (timeephem.sf.net); PLplot scientific plotting
> software package (plplot.sf.net); the libLASi project
> (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net);
> and the Linux Brochure Project (lbproject.sf.net).
> __________________________
>
> Linux-powered Science
> __________________________
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Plplot-devel mailing list
Plplot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/plplot-devel
