Merging of branches

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
12 messages Options
Reply | Threaded
Open this post in threaded view
|

Merging of branches

Hugentobler  Marco
Hi,

On January 10th, there is the feature freeze in trunk for the next version
(0.9.2).
There are two branches that are planned to be merged before this date:

- The raster transparency branch with new features for raster symbolisation

- The advanced editing branch with new vector editing tools and a better
snapping mechanism

Tim provided some test build such that also non-developers may test the
branches and fill tickets into the bug tracker.
(http://qgis.org/uploadfiles/testbuilds/)

Please test the branches, fill bugs in the bugtracker or post your opinion on
the developer list.

@Peter: Is it possible for you to merge the raster transparency branch before
10.01.08?

I plan to do the merge for the editing branch, presumably a few days before
10.01.


Merry christmas and a happy new year,
Marco

--
Dr. Marco Hugentobler
Institute of Cartography
ETH Zurich
Technical Advisor QGIS Project Steering Committee
[hidden email]
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: Merging of branches

pcav
Marco Hugentobler ha scritto:

> @Peter: Is it possible for you to merge the raster transparency branch before
> 10.01.08?
>
> I plan to do the merge for the editing branch, presumably a few days before
> 10.01.

To me, the sooner the merge, the better (more time to test).
I could probably provide the debs for lenny soon after the merge, for a
wider testing.
All the best.
pc
--
Paolo Cavallini, see: http://www.faunalia.it/pc
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: Merging of branches

Hugentobler  Marco
Hi Paolo,

The main idea of the development in branches is that qgis main branch (trunk)
is always in a (relatively) stable state. So it is best to test the branches
before the merge.

In practice, there will always be issues in trunk after a merge. But the less
issues the better.

Best regards,
Marco

On Friday 21 December 2007 09:56:51 Paolo Cavallini wrote:

> Marco Hugentobler ha scritto:
> > @Peter: Is it possible for you to merge the raster transparency branch
> > before 10.01.08?
> >
> > I plan to do the merge for the editing branch, presumably a few days
> > before 10.01.
>
> To me, the sooner the merge, the better (more time to test).
> I could probably provide the debs for lenny soon after the merge, for a
> wider testing.
> All the best.
> pc



--
Dr. Marco Hugentobler
Institute of Cartography
ETH Zurich
Technical Advisor QGIS Project Steering Committee
[hidden email]
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: Merging of branches

Peter Ersts
In reply to this post by Hugentobler Marco
Hi Marco,

December has somehow come and almost gone and I have made little
progress. I still have one more big task to do --moving all of the
pseudo color and shading code into a new class -- and a couple of
smaller things that must be addressed.

I will try to put some dedicated time into this over the next week while
I am traveling. I think by the first of the New Year, I can have
something for the project steering committee to look at and see if the
branch is ready to be merged.

Bob Moskovitz has been a real great help testing the raster branch, but
it would be good to hear back from any other users who have also been
testing it.

A merry Christmas as all those who celebrate it and best wishes to
everyone for a safe, prosperous and hopefully peaceful New Year.

-pete


Marco Hugentobler wrote:
> @Peter: Is it possible for you to merge the raster transparency branch before
> 10.01.08?

--
====================================
Peter J. Ersts, Project Specialist
American Museum of Natural History
Center for Biodiversity and Conservation
Central Park West at 79th Street
New York, New York 10024
Tel: Home Office (518)-632-4745 or NYC Office (212)-496-3488
Web: http://biodiversityinformatics.amnh.org
Web: http://cbc.amnh.org

Quantum GIS Raster Development Team. Visit http://www.qgis.org
to learn more about QGIS, a free and open source desktop GIS

Open Source,
...evolving through community cooperation to change the world bit by bit

_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: Merging of branches

Hugentobler  Marco
In reply to this post by Hugentobler Marco
Hi Martin,

I updated today the sip files qgsvectorlayer.sip, qgsgeometry.sip and
qgsrubberband.sip, but I don't know if all the functions are python-correct.

Also, there are the new classes core/QgsSnapper and gui/QgsMapCanvasSnapper
which do not have a python interface.

cheers,
Marco

Am Dienstag 25 Dezember 2007 03:02:46 schrieben Sie:

> Hi Marco,
>
> On Dec 21, 2007 9:51 AM, Marco Hugentobler
>
> <[hidden email]> wrote:
> > Hi,
> >
> > On January 10th, there is the feature freeze in trunk for the next
> > version (0.9.2).
> > There are two branches that are planned to be merged before this date:
> >
> > - The raster transparency branch with new features for raster
> > symbolisation
> >
> > - The advanced editing branch with new vector editing tools and a better
> > snapping mechanism
>
> have you managed to keep python bindings up-to-date with your changes
> in advanced editing branch?
> If not I could give you a hand if needed...
>
> Bye
> MArtin



--
Dr. Marco Hugentobler
Institute of Cartography
ETH Zurich
Technical Advisor QGIS Project Steering Committee
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

merging of advanced editing branch planned for 9.1.

Hugentobler  Marco
Hi qgis devs,

The 10th January and with it the feature freeze for 0.9.2 is approaching fast. If there are no objections I'm going to merge the advanced editing branch tomorrow (9.1.).
@Peter ok for you to merge the raster transparency branch before feature freeze, maybe on 10th of January? If you don't have time those days I may do the merge if you prefer.

Best regards,
Marco



--
Dr. Marco Hugentobler
Institute of Cartography
ETH Zurich
Technical Advisor QGIS Project Steering Committee
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer

_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: merging of advanced editing branch planned for 9.1.

Tim Sutton
Hi All

+1 for digitising branch merge.

And Magnus and I will be merging the renderer branch (which includes
qml support and symbol rotation and scaling support) if there are no
objections.

I have also written a quick print plugin - the idea is that it uses a
predefined template (and in the future a selection of predefined
templates) to quickly produce a pdf of the current map (with legend
and scale bar etc), Does anyone have any objections to me merging this
in to trunk? The plugin is not designed to overlap the more flexible
map composer work of Steven Bell, but rather provide a solution for
the 'click and print' crowd. Its probably not the most awe inspiring
example but you can get an idea here:
http://flickr.com/photos/timlinux/2178029891/



Regards

Tim

2008/1/8, Hugentobler  Marco <[hidden email]>:

> Hi qgis devs,
>
> The 10th January and with it the feature freeze for 0.9.2 is approaching fast. If there are no objections I'm going to merge the advanced editing branch tomorrow (9.1.).
> @Peter ok for you to merge the raster transparency branch before feature freeze, maybe on 10th of January? If you don't have time those days I may do the merge if you prefer.
>
> Best regards,
> Marco
>
>
>
> --
> Dr. Marco Hugentobler
> Institute of Cartography
> ETH Zurich
> Technical Advisor QGIS Project Steering Committee
> _______________________________________________
> Qgis-developer mailing list
> [hidden email]
> http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
>
> _______________________________________________
> Qgis-developer mailing list
> [hidden email]
> http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
>


--
Tim Sutton
QGIS Project Steering Committee Member - Release  Manager
Visit http://qgis.org for a great open source GIS
openModeller Desktop Developer
Visit http://openModeller.sf.net for a great open source ecological
niche modelling tool
Home Page: http://tim.linfiniti.com
Skype: timlinux
Irc: timlinux on #qgis at freenode.net
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: merging of advanced editing branch planned for 9.1.

Peter Ersts
In reply to this post by Hugentobler Marco
Hugentobler Marco wrote:
> @Peter ok for you to merge the raster transparency branch before feature freeze, maybe on 10th of January? If you don't have time those days I may do the merge if you prefer.
>  

I don't have permission to merge into the trunk, so it will have to be
someone else.

If it has not been done already, I would like the steering committee to
review the branch just to make sure everything is on par with the coding
standards and that everything expected as been completed. Looking over
the wiki, I do see one thing that may influence the merge; all of the
raster properties are not yet committed to the project file.


-pete

--
====================================
Peter J. Ersts, Project Specialist
American Museum of Natural History
Center for Biodiversity and Conservation
Central Park West at 79th Street
New York, New York 10024
Tel: Home Office (518)-632-4745 or NYC Office (212)-496-3488
Web: http://biodiversityinformatics.amnh.org
Web: http://cbc.amnh.org

Quantum GIS Raster Development Team. Visit http://www.qgis.org
to learn more about QGIS, a free and open source desktop GIS

Open Source,
...evolving through community cooperation to change the world bit by bit

_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: merging of advanced editing branch planned for 9.1.

Tim Sutton
Hi Peter

I'm happy to help you do the merge. Regarding the properties, will you
have time to address that by the 10th?

Regards

Tim

2008/1/8, Peter Ersts <[hidden email]>:

> Hugentobler Marco wrote:
> > @Peter ok for you to merge the raster transparency branch before feature freeze, maybe on 10th of January? If you don't have time those days I may do the merge if you prefer.
> >
>
> I don't have permission to merge into the trunk, so it will have to be
> someone else.
>
> If it has not been done already, I would like the steering committee to
> review the branch just to make sure everything is on par with the coding
> standards and that everything expected as been completed. Looking over
> the wiki, I do see one thing that may influence the merge; all of the
> raster properties are not yet committed to the project file.
>
>
> -pete
>
> --
> ====================================
> Peter J. Ersts, Project Specialist
> American Museum of Natural History
> Center for Biodiversity and Conservation
> Central Park West at 79th Street
> New York, New York 10024
> Tel: Home Office (518)-632-4745 or NYC Office (212)-496-3488
> Web: http://biodiversityinformatics.amnh.org
> Web: http://cbc.amnh.org
>
> Quantum GIS Raster Development Team. Visit http://www.qgis.org
> to learn more about QGIS, a free and open source desktop GIS
>
> Open Source,
> ...evolving through community cooperation to change the world bit by bit
>
> _______________________________________________
> Qgis-developer mailing list
> [hidden email]
> http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
>


--
Tim Sutton
QGIS Project Steering Committee Member - Release  Manager
Visit http://qgis.org for a great open source GIS
openModeller Desktop Developer
Visit http://openModeller.sf.net for a great open source ecological
niche modelling tool
Home Page: http://tim.linfiniti.com
Skype: timlinux
Irc: timlinux on #qgis at freenode.net
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: merging of advanced editing branch planned for 9.1.

Peter Ersts

Tim,

As we spoke about on irc, if I stick with putting all of the properties
code into the QgsRasterLayer, then I should be able to get that done on
the 9th.  If the devs would rather see each class have their own
read/writeXML function (which they eventually should), I will need
another couple of days, but think I could have that done (properly) by
the end of the weekend.

As for the merge, it should be quite easy as there are no other branches
(that I know of) trying to adjust the various raster classes that I have
been working on.

-pete

Tim Sutton wrote:

> Hi Peter
>
> I'm happy to help you do the merge. Regarding the properties, will you
> have time to address that by the 10th?
>
> Regards
>
> Tim
>
> 2008/1/8, Peter Ersts <[hidden email]>:
>  
>> Hugentobler Marco wrote:
>>    
>>> @Peter ok for you to merge the raster transparency branch before feature freeze, maybe on 10th of January? If you don't have time those days I may do the merge if you prefer.
>>>
>>>      
>> I don't have permission to merge into the trunk, so it will have to be
>> someone else.
>>
>> If it has not been done already, I would like the steering committee to
>> review the branch just to make sure everything is on par with the coding
>> standards and that everything expected as been completed. Looking over
>> the wiki, I do see one thing that may influence the merge; all of the
>> raster properties are not yet committed to the project file.
>>
>>
>> -pete
>>    

--
====================================
Peter J. Ersts, Project Specialist
American Museum of Natural History
Center for Biodiversity and Conservation
Central Park West at 79th Street
New York, New York 10024
Tel: Home Office (518)-632-4745 or NYC Office (212)-496-3488
Web: http://biodiversityinformatics.amnh.org
Web: http://cbc.amnh.org

Quantum GIS Raster Development Team. Visit http://www.qgis.org
to learn more about QGIS, a free and open source desktop GIS

Open Source,
...evolving through community cooperation to change the world bit by bit

_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: merging of advanced editing branch planned for 9.1.

Hugentobler  Marco
In reply to this post by Tim Sutton
Hi Tim,

+1 for merging the renderer branch. I already used the patch for qml support
and it worked perfectly.

I'm looking forward for all the new features in 0.9.2 :-)

cheers,
Marco

Am Dienstag 08 Januar 2008 21:39:47 schrieb Tim Sutton:

> Hi All
>
> +1 for digitising branch merge.
>
> And Magnus and I will be merging the renderer branch (which includes
> qml support and symbol rotation and scaling support) if there are no
> objections.
>
> I have also written a quick print plugin - the idea is that it uses a
> predefined template (and in the future a selection of predefined
> templates) to quickly produce a pdf of the current map (with legend
> and scale bar etc), Does anyone have any objections to me merging this
> in to trunk? The plugin is not designed to overlap the more flexible
> map composer work of Steven Bell, but rather provide a solution for
> the 'click and print' crowd. Its probably not the most awe inspiring
> example but you can get an idea here:
> http://flickr.com/photos/timlinux/2178029891/
>
>
>
> Regards
>
> Tim
>
> 2008/1/8, Hugentobler  Marco <[hidden email]>:
> > Hi qgis devs,
> >
> > The 10th January and with it the feature freeze for 0.9.2 is approaching
> > fast. If there are no objections I'm going to merge the advanced editing
> > branch tomorrow (9.1.). @Peter ok for you to merge the raster
> > transparency branch before feature freeze, maybe on 10th of January? If
> > you don't have time those days I may do the merge if you prefer.
> >
> > Best regards,
> > Marco
> >
> >
> >
> > --
> > Dr. Marco Hugentobler
> > Institute of Cartography
> > ETH Zurich
> > Technical Advisor QGIS Project Steering Committee
> > _______________________________________________
> > Qgis-developer mailing list
> > [hidden email]
> > http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
> >
> > _______________________________________________
> > Qgis-developer mailing list
> > [hidden email]
> > http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer



--
Dr. Marco Hugentobler
Institute of Cartography
ETH Zurich
Technical Advisor QGIS Project Steering Committee
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: merging of advanced editing branch planned for 9.1.

pcav
Marco Hugentobler ha scritto:

> I'm looking forward for all the new features in 0.9.2 :-)

We're all very much looking forward to it!
All the best.
pc
--
Paolo Cavallini, see: http://www.faunalia.it/pc
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer