Hi Matt, Thank you for willing to bring your contributions to Nebula! I knew that your changes were based on a very early version of SWT XYGraph, so there is no way to make automatic merge. I think Wim's suggestion is the best way: one feature at a time. Firstly, file a bug on bugzilla for each feature you want to bring in, after it is approved, manually apply your changes for that feature to current Nebula Visualization head, submit it to gerrit for review. Finally, merge it to Nebula.
What do you think? BTW, I will go to the EclipseCon in March too. Look forward to seeing you there! Cheers, Xihui On Fri, Feb 7, 2014 at 7:45 AM, Wim Jongman <[email protected]> wrote: > Hi Matt, > > That sounds absolutely smashing! It would be great to integrate the two > streams. I guess the best way to work is to first analyze which changes you > want to incorporate and then file a bug for every major change. Xihui, > what do you think? > > Matt, are there other things from the Dawn project that could come to > Eclipse in some way? > > Cheers, > > Wim > > PS > Maybe we have met at Diamond where I have done some Eclipse training? > > > On Fri, Feb 7, 2014 at 3:03 PM, Matthew Gerring <[email protected] > > wrote: > >> Hi Wim, >> >> >> >> Thanks for helping me do my first commit to visualization. I do not think >> we have met before - maybe at eclipse con? Not sure. I will be at the US >> eclipse con in March. >> >> >> >> You wrote that you hope the change will be the first of many. Well we >> have made scores to hundreds of improvements to an old fork of xygraph >> (from its css days). Today I renamed the plugins/packages in our fork to >> nebula paths. This means that I can swap our nebula.visualization for your >> master one. I do not really know where to start with the merging (see our >> versions at: >> >> >> >> >> https://github.com/DawnScience/swt-xy-graph/tree/master/PureJava/org.eclipse.nebula.visualization.widgets >> >> >> https://github.com/DawnScience/swt-xy-graph/tree/master/PureJava/org.eclipse.nebula.visualization.xygraph >> >> >> >> ) >> >> >> >> I suppose I should make a bugzilla ticket for each change? The changes we >> made broadly fall into: >> >> >> >> 1. 1. A swappable tick mark generator with an alternative >> implementation (which we use by default). >> 2. Ability to make toolbar a SWT one as well as a draw2d one. >> 3. Change to many classes to allow inheritance. (We have a number >> of figures ~20, with which we interact by selecting data from the plotting.) >> 4. OSGI change: adding activator. >> 5. Creation of NoRepeatsPointsList a class used to help make large >> XY graphs more efficient. >> 6. Addition of IAnnotationLabelProvider to provide alternative >> annotation labels. >> 7. Addition of setAxisAutoscaleTight(...) method to Axis to change >> autoscale padding. >> >> >> >> In the future we would like to add some small improvements too. >> >> So my question basically is that since we have a lot of changes and >> differences - how can I approach merging the two? >> >> >> >> Matt >> >> >> >> _______________________________________________ >> nebula-dev mailing list >> [email protected] >> https://dev.eclipse.org/mailman/listinfo/nebula-dev >> >> > > _______________________________________________ > nebula-dev mailing list > [email protected] > https://dev.eclipse.org/mailman/listinfo/nebula-dev > >
_______________________________________________ nebula-dev mailing list [email protected] https://dev.eclipse.org/mailman/listinfo/nebula-dev
