Skip to content
Permalink
Browse files

merge from trunk r11050:11100

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11135 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Jul 21, 2009
1 parent c03425d commit 1e8cd681c275528600a2f42c935c5b5ea0d44352
Showing with 2,172 additions and 1,292 deletions.
  1. +2 −0 DONORS
  2. +189 −152 i18n/qgis_de.ts
  3. +573 −553 i18n/qgis_fr.ts
  4. +194 −32 mac/xcode/Qgis.xcodeproj/project.pbxproj
  5. +3 −0 python/core/qgsvectorlayer.sip
  6. +15 −8 src/app/qgslabeldialog.cpp
  7. +3 −1 src/app/qgslabeldialog.h
  8. +4 −4 src/app/qgsmaptoolidentify.cpp
  9. +3 −3 src/core/qgshttptransaction.cpp
  10. +44 −17 src/plugins/grass/modules-6.3/default.qgc
  11. BIN src/plugins/grass/{modules-common → modules-6.3}/v.out.ogr.postgis.1.png
  12. BIN src/plugins/grass/{modules-common → modules-6.3}/v.out.ogr.postgis.2.png
  13. 0 src/plugins/grass/{modules-common → modules-6.3}/v.out.ogr.postgis.qgm
  14. BIN ...ins/grass/{modules-common/qgis.db.connect-login.pg.1.png → modules-6.4/db.connect-login.pg.1.png}
  15. +2 −2 ...plugins/grass/{modules-common/qgis.db.connect-login.pg.qgm → modules-6.4/db.connect-login.pg.qgm}
  16. BIN src/plugins/grass/modules-6.4/db.out.ogr.1.png
  17. BIN src/plugins/grass/modules-6.4/db.out.ogr.2.png
  18. +9 −0 src/plugins/grass/modules-6.4/db.out.ogr.qgm
  19. +481 −446 src/plugins/grass/modules-6.4/default.qgc
  20. BIN src/plugins/grass/modules-6.4/r.bilinear.1.png
  21. BIN src/plugins/grass/modules-6.4/r.bilinear.idw.2.png
  22. +7 −0 src/plugins/grass/modules-6.4/r.bilinear.qgm
  23. BIN src/plugins/grass/modules-6.4/r.colors.stddev.1.png
  24. BIN src/plugins/grass/modules-6.4/r.colors.stddev.2.png
  25. +8 −0 src/plugins/grass/modules-6.4/r.colors.stddev.qgm
  26. BIN src/plugins/grass/modules-6.4/{qgis.r.external.all.1.png → r.external.all.1.png}
  27. +1 −1 src/plugins/grass/modules-6.4/{qgis.r.external.all.qgm → r.external.all.qgm}
  28. +1 −1 src/plugins/grass/modules-6.4/r.external.qgm
  29. BIN src/plugins/grass/modules-6.4/r.grow.distance.1.png
  30. BIN src/plugins/grass/modules-6.4/r.grow.distance.2.png
  31. +9 −0 src/plugins/grass/modules-6.4/r.grow.distance.qgm
  32. +8 −0 src/plugins/grass/modules-6.4/v.in.geonames.1.svg
  33. BIN src/plugins/grass/{modules-common/qgis.v.out.ogr.pg.1.png → modules-6.4/v.in.geonames.2.png}
  34. +7 −0 src/plugins/grass/modules-6.4/v.in.geonames.qgm
  35. +8 −0 src/plugins/grass/modules-6.4/v.in.gns.1.svg
  36. BIN src/plugins/grass/modules-6.4/v.in.gns.2.png
  37. +7 −0 src/plugins/grass/modules-6.4/v.in.gns.qgm
  38. BIN src/plugins/grass/modules-6.4/v.out.ogr.pg.1.png
  39. BIN src/plugins/grass/{modules-common/qgis.v.out.ogr.pg.2.png → modules-6.4/v.out.ogr.pg.2.png}
  40. +2 −2 src/plugins/grass/{modules-common/qgis.v.out.ogr.pg.qgm → modules-6.4/v.out.ogr.pg.qgm}
  41. +1 −0 src/plugins/grass/modules-common/db.connect.qgm
  42. +2 −2 src/plugins/grass/modules-common/db.connect.schema.qgm
  43. BIN src/plugins/grass/modules-common/db.copy.1.png
  44. BIN src/plugins/grass/modules-common/db.copy.2.png
  45. +11 −0 src/plugins/grass/modules-common/db.copy.qgm
  46. BIN src/plugins/grass/modules-common/r.circle.png
  47. +10 −0 src/plugins/grass/modules-common/r.circle.qgm
  48. +1 −1 src/plugins/grass/modules-common/r.cost.qgm
  49. BIN src/plugins/grass/modules-common/r.in.bin.1.png
  50. BIN src/plugins/grass/modules-common/r.in.bin.2.png
  51. +13 −0 src/plugins/grass/modules-common/r.in.bin.qgm
  52. +1 −1 src/plugins/grass/modules-common/r.in.poly.qgm
  53. BIN src/plugins/grass/modules-common/r.in.wms.1.png
  54. BIN src/plugins/grass/modules-common/r.in.wms.2.png
  55. +19 −0 src/plugins/grass/modules-common/r.in.wms.qgm
  56. BIN src/plugins/grass/modules-common/r.in.xyz.1.png
  57. BIN src/plugins/grass/modules-common/r.in.xyz.2.png
  58. +13 −0 src/plugins/grass/modules-common/r.in.xyz.qgm
  59. +1 −1 src/plugins/grass/modules-common/r.mapcalc.qgm
  60. BIN src/plugins/grass/modules-common/r.out.ascii.1.png
  61. BIN src/plugins/grass/modules-common/r.out.ascii.2.png
  62. +13 −0 src/plugins/grass/modules-common/r.out.ascii.qgm
  63. BIN src/plugins/grass/modules-common/r.out.gdal.1.png
  64. BIN src/plugins/grass/modules-common/r.out.gdal.2.png
  65. +9 −0 src/plugins/grass/modules-common/r.out.gdal.qgm
  66. BIN src/plugins/grass/modules-common/r.out.mpeg.1.png
  67. BIN src/plugins/grass/modules-common/r.out.mpeg.2.png
  68. +9 −0 src/plugins/grass/modules-common/r.out.mpeg.qgm
  69. BIN src/plugins/grass/modules-common/r.out.vtk.1.png
  70. BIN src/plugins/grass/modules-common/r.out.vtk.2.png
  71. +13 −0 src/plugins/grass/modules-common/r.out.vtk.qgm
  72. BIN src/plugins/grass/modules-common/r.out.xyz.1.png
  73. BIN src/plugins/grass/modules-common/r.out.xyz.2.png
  74. +1 −1 src/plugins/grass/modules-common/r.out.xyz.qgm
  75. BIN src/plugins/grass/modules-common/r.plane.1.png
  76. +11 −0 src/plugins/grass/modules-common/r.plane.qgm
  77. +1 −1 src/plugins/grass/modules-common/r.reclass.area.greater.qgm
  78. +1 −1 src/plugins/grass/modules-common/r.reclass.area.lesser.qgm
  79. +0 −1 src/plugins/grass/modules-common/r.regression.line.qgm
  80. BIN src/plugins/grass/modules-common/r.sunmask.date.time.1.png
  81. BIN src/plugins/grass/modules-common/r.sunmask.date.time.2.png
  82. BIN src/plugins/grass/modules-common/r.sunmask.date.time.3.png
  83. +14 −0 src/plugins/grass/modules-common/r.sunmask.date.time.qgm
  84. BIN src/plugins/grass/modules-common/r.sunmask.position.1.png
  85. BIN src/plugins/grass/modules-common/r.sunmask.position.2.png
  86. BIN src/plugins/grass/modules-common/r.sunmask.position.3.png
  87. +10 −0 src/plugins/grass/modules-common/r.sunmask.position.qgm
  88. +1 −1 src/plugins/grass/modules-common/r.surf.contour.qgm
  89. +35 −0 src/plugins/grass/modules-common/v.net.1.svg
  90. +57 −0 src/plugins/grass/modules-common/v.net.2.svg
  91. +35 −0 src/plugins/grass/modules-common/v.net.path.1.svg
  92. +57 −0 src/plugins/grass/modules-common/v.net.path.2.svg
  93. +16 −0 src/plugins/grass/modules-common/v.net.path.qgm
  94. +13 −0 src/plugins/grass/modules-common/v.net.qgm
  95. +35 −0 src/plugins/grass/modules-common/v.net.visibility.1.svg
  96. +57 −0 src/plugins/grass/modules-common/v.net.visibility.2.svg
  97. +9 −0 src/plugins/grass/modules-common/v.net.visibility.qgm
  98. BIN src/plugins/grass/modules-common/v.out.pov.1.png
  99. +8 −0 src/plugins/grass/modules-common/v.out.pov.2.svg
  100. +8 −0 src/plugins/grass/modules-common/v.out.pov.qgm
  101. BIN src/plugins/grass/modules-common/v.out.svg.1.png
  102. +8 −0 src/plugins/grass/modules-common/v.out.svg.2.svg
  103. +9 −0 src/plugins/grass/modules-common/v.out.svg.qgm
  104. BIN src/plugins/grass/modules-common/v.out.vtk.1.png
  105. +8 −0 src/plugins/grass/modules-common/v.out.vtk.2.svg
  106. +8 −0 src/plugins/grass/modules-common/v.out.vtk.qgm
  107. BIN src/plugins/grass/modules-common/v.perturb.1.png
  108. +11 −0 src/plugins/grass/modules-common/v.perturb.qgm
  109. BIN src/plugins/grass/modules-common/v.split.1.png
  110. BIN src/plugins/grass/modules-common/v.split.2.png
  111. +9 −0 src/plugins/grass/modules-common/v.split.qgm
  112. +2 −2 src/plugins/grass/qgsgrassmapcalc.cpp
  113. +9 −4 src/plugins/grass/qgsgrassmodule.cpp
  114. +37 −36 src/plugins/grass/qgsgrasstoolsbase.ui
  115. 0 src/plugins/grass/scripts/{qgis.db.connect-login.pg.py → db.connect-login.pg.py}
  116. 0 src/plugins/grass/scripts/{qgis.r.external.all.py → r.external.all.py}
  117. 0 src/plugins/grass/scripts/{qgis.v.out.ogr.pg.py → v.out.ogr.pg.py}
  118. +6 −18 src/ui/qgslabeldialogbase.ui
2 DONORS
@@ -18,6 +18,7 @@ Albin Blaschka|http://www.albinblaschka.info/
Alessandro Pasotti|http://www.itopen.it/
Alessandro Sarretta
Alexandre Leroux
Andreas Neumann
Associazione Monte Porzio Cultura
Carl Nelson
D R Arbib
@@ -32,6 +33,7 @@ James Crone
Jaroslaw Kowalczyk
Jason Jorgenson
John C. Tull
John Dean
Kanton Solothurn SOGIS
Kevin Shook
Laura Burnette

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -13,6 +13,9 @@ public:
Classification,
EditRange,
SliderRange
FileName,
Enumeration,
Immutable
};

struct RangeData {
@@ -152,7 +152,7 @@ void QgsLabelDialog::init( )
mFont.setFamily( myLabelAttributes->family() );
if ( myLabelAttributes->sizeIsSet() )
{
mFont.setPointSize( static_cast<int>( myLabelAttributes->size() ) );
mFont.setPointSizeF( myLabelAttributes->size() );

int myTypeInt = myLabelAttributes->sizeType();
if ( myTypeInt == QgsLabelAttributes::PointUnits )
@@ -166,10 +166,12 @@ void QgsLabelDialog::init( )
}
else //defaults for when no size has been set
{
mFont.setPointSize( static_cast<int>( myLabelAttributes->size() ) );
mFont.setPointSizeF( myLabelAttributes->size() );
radioFontSizeUnitsPoints->setChecked( true );
}

spinFontSize->setValue( myLabelAttributes->size() );

if ( myLabelAttributes->boldIsSet() )
{
mFont.setBold( myLabelAttributes->bold() );
@@ -200,8 +202,8 @@ void QgsLabelDialog::init( )
{
radioOffsetUnitsMap->setChecked( true );
}
spinXOffset->setValue( static_cast<int>( myLabelAttributes->xOffset() ) );
spinYOffset->setValue( static_cast<int>( myLabelAttributes->yOffset() ) );
spinXOffset->setValue( myLabelAttributes->xOffset() );
spinYOffset->setValue( myLabelAttributes->yOffset() );
}
else //defaults for when no offset is defined
{
@@ -247,7 +249,7 @@ void QgsLabelDialog::init( )
{
radioBufferUnitsMap->setChecked( true );
}
spinBufferSize->setValue( static_cast<int>( myLabelAttributes->bufferSize() ) );
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
}
else //defaults for when no offset is defined
{
@@ -259,7 +261,7 @@ void QgsLabelDialog::init( )
chkUseBuffer->setChecked( myLabelAttributes->bufferEnabled() );

//NOTE: do we need this line too? TS
spinBufferSize->setValue( static_cast<int>( myLabelAttributes->bufferSize() ) );
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
//TODO - transparency attributes for buffers

listWidget->setItemSelected( listWidget->item( 0 ), true );
@@ -271,11 +273,16 @@ void QgsLabelDialog::changeFont( void )
{
QgsDebugMsg( "entering." );

qreal fontSize = mFont.pointSizeF();
bool resultFlag;
mFont = QFontDialog::getFont( &resultFlag, mFont, this );
if ( resultFlag )
{
// font is set to the font the user selected
if ( mFont.pointSizeF() != fontSize )
{
// font is set to the font the user selected
spinFontSize->setValue( mFont.pointSizeF() );
}
}
else
{
@@ -341,7 +348,7 @@ void QgsLabelDialog::apply()
{
myTypeInt = QgsLabelAttributes::MapUnits;
}
myLabelAttributes->setSize( mFont.pointSize(), myTypeInt );
myLabelAttributes->setSize( mFont.pointSizeF(), myTypeInt );
myLabelAttributes->setBold( mFont.bold() );
myLabelAttributes->setItalic( mFont.italic() );
myLabelAttributes->setUnderline( mFont.underline() );
@@ -74,8 +74,10 @@ class QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase

void on_cboLabelField_activated( int ) {emit labelSourceSet(); }

void on_spinFontSize_valueChanged( double d ) { mFont.setPointSizeF( d ); lblSample->setFont( mFont ); }

signals:
/* emitted when anitem in label source list is chosen */
/* emitted when an item in label source list is chosen */
void labelSourceSet();

protected:
@@ -352,13 +352,13 @@ void QgsMapToolIdentify::identifyVectorLayer( const QgsPoint& point )
{
// Add the start and end points in as derived attributes
str.setNum( f_it->geometry()->asPolyline().first().x(), 'g', 10 );
mResults->addDerivedAttribute( featureNode, "startX", str );
mResults->addDerivedAttribute( featureNode, tr( "firstX", "attributes get sorted; translation for lastX should be lexically larger than this one" ), str );
str.setNum( f_it->geometry()->asPolyline().first().y(), 'g', 10 );
mResults->addDerivedAttribute( featureNode, "startY", str );
mResults->addDerivedAttribute( featureNode, tr( "firstY" ), str );
str.setNum( f_it->geometry()->asPolyline().last().x(), 'g', 10 );
mResults->addDerivedAttribute( featureNode, "endX", str );
mResults->addDerivedAttribute( featureNode, tr( "lastX", "attributes get sorted; translation for firstX should be lexically smaller than this one" ), str );
str.setNum( f_it->geometry()->asPolyline().last().y(), 'g', 10 );
mResults->addDerivedAttribute( featureNode, "endY", str );
mResults->addDerivedAttribute( featureNode, tr( "lastY" ), str );
}
}
else if ( layer->geometryType() == QGis::Polygon )
@@ -133,9 +133,9 @@ bool QgsHttpTransaction::getSynchronously( QByteArray &respondedContent, int red
// http://www.address.bit:80), so remove that from the url before
// executing an http GET.

QString pathAndQuery = httpurl.remove( 0, httpurl.indexOf( qurl.path() ) );


//Path could be just '/' so we remove the 'http://' first
QString pathAndQuery = httpurl.remove( 0, httpurl.indexOf( qurl.host() ) );
pathAndQuery = httpurl.remove( 0, pathAndQuery.indexOf( qurl.path() ) );
if ( !postData ) //do request with HTTP GET
{
header.setRequest( "GET", pathAndQuery );
@@ -12,51 +12,63 @@
<grass name="r.in.gdal.qgis.loc"/>
<grass name="r.in.gdal"/>
<grass name="r.in.gdal.loc"/>
<grass name="r.in.xyz"/>
<grass name="r.in.ascii"/>
<grass name="r.in.poly"/>
<grass name="r.in.bin"/>
<grass name="r.in.arc"/>
<grass name="r.in.gridatb"/>
<grass name="r.in.mat"/>
<grass name="i.in.spotvgt"/>
<grass name="r.in.srtm"/>
<grass name="r.in.aster"/>
<grass name="r.in.wms"/>
</section>
<section label="Import vector">
<section label="Import vector">
<grass name="v.in.ogr.qgis"/>
<grass name="v.in.ogr"/>
<grass name="v.in.ogr.qgis.loc"/>
<grass name="v.in.ogr.loc"/>
<grass name="v.in.ogr"/>
<grass name="v.in.ogr.loc"/>
<grass name="v.in.ogr.all"/>
<grass name="v.in.ogr.all.loc"/>
<grass name="v.in.dxf"/>
<grass name="v.in.e00"/>
<grass name="v.in.mapgen"/>
<grass name="v.in.db"/>
<grass name="v.in.garmin"/>
<grass name="v.in.gpsbabel"/>
</section>
<grass name="v.in.ogr.all.loc"/>
<grass name="v.in.dxf"/>
<grass name="v.in.e00"/>
<grass name="v.in.mapgen"/>
<grass name="v.in.db"/>
<grass name="v.in.garmin"/>
<grass name="v.in.gpsbabel"/>
</section>
</section>
<section label="Export">
<section label="Export raster">
<grass name="r.out.gdal.gtiff"/>
<grass name="r.out.gdal"/>
<grass name="r.out.ascii"/>
<grass name="r.out.xyz"/>
<grass name="r.out.arc"/>
<grass name="r.out.gridatb"/>
<grass name="r.out.mat"/>
<grass name="r.out.bin"/>
<grass name="r.out.mpeg"/>
<grass name="r.out.png"/>
<grass name="r.out.ppm"/>
<grass name="r.out.ppm3"/>
<grass name="r.out.pov"/>
<grass name="r.out.tiff"/>
<grass name="r.out.vrml"/>
<grass name="r.out.vtk"/>
</section>
<section label="Export vector">
<grass name="v.out.ogr"/>
<grass name="qgis.v.out.ogr.pg"/>
<grass name="v.out.ogr.gml"/>
<grass name="v.out.ogr.mapinfo"/>
<grass name="v.out.ogr.postgis"/>
<grass name="v.out.ascii"/>
<grass name="v.out.dxf"/>
<grass name="v.out.pov"/>
<grass name="v.out.svg"/>
<grass name="v.out.vtk"/>
</section>
</section>
<section label="Map type conversion">
@@ -79,15 +91,15 @@
<grass name="g.region.zoom"/>
<grass name="g.region.multiple.raster"/>
<grass name="g.region.multiple.vector"/>
</section>
</section>
<section label="Projection management">
<section label="Print projection information of the current location">
<grass name="g.proj.print"/>
</section>
<grass name="g.proj.print"/>
</section>
<section label="Print projection information from a georeferenced file">
<grass name="g.proj.geo"/>
<grass name="g.proj.geo"/>
<grass name="g.proj.ascii"/>
<grass name="g.proj.proj"/>
<grass name="g.proj.proj"/>
</section>
<section label="Print projection information from a georeferenced file and create a new location based on it">
<grass name="g.proj.geo.new"/>
@@ -161,6 +173,10 @@
<grass name="r.patch"/>
<grass name="r.statistics"/>
</section>
<section label="Solar and irradiation model">
<grass name="r.sunmask.position"/>
<grass name="r.sunmask.date.time"/>
</section>
<section label="Terrain analysis">
<grass name="r.cost"/>
<grass name="r.drain"/>
@@ -198,6 +214,9 @@
<grass name="r.rescale"/>
</section>
<section label="Surface management">
<section label="Concentric circles">
<grass name="r.circle"/>
</section>
<section label="Create random points">
<grass name="r.random"/>
<grass name="r.random.cells"/>
@@ -206,6 +225,7 @@
<grass name="v.kernel"/>
<grass name="r.surf.fractal"/>
<grass name="r.surf.gauss"/>
<grass name="r.plane"/>
<grass name="r.surf.random"/>
</section>
<section label="Generate vector contour lines">
@@ -272,6 +292,7 @@
<grass name="v.centroids"/>
<grass name="v.build.polylines"/>
<grass name="v.segment"/>
<grass name="v.split"/>
<grass name="v.to.points"/>
<grass name="v.parallel"/>
<grass name="v.dissolve"/>
@@ -308,8 +329,11 @@
<grass name="v.distance"/>
</section>
<section label="Network analysis">
<grass name="v.net.nodes"/>
<grass name="v.net.alloc"/>
<grass name="v.net"/>
<grass name="v.net.nodes"/>
<grass name="v.net.visibility"/>
<grass name="v.net.path"/>
<grass name="v.net.iso"/>
<grass name="v.net.salesman"/>
<grass name="v.net.steiner"/>
@@ -339,7 +363,9 @@
<grass name="v.mkgrid.region"/>
</section>
<section label="Create points">
<grass name="v.in.db"/>
<grass name="v.random"/>
<grass name="v.perturb"/>
</section>
<section label="Manage training dataset">
<grass name="v.kcv"/>
@@ -408,6 +434,7 @@
<grass name="db.in.ogr"/>
</section>
<section label="Tables management">
<grass name="db.copy"/>
<grass name="v.db.addtable"/>
<grass name="v.db.droptable"/>
</section>
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set PostgreSQL DB connection" module="qgis.db.connect-login.pg.py">
<qgisgrassmodule label="Set PostgreSQL DB connection" module="db.connect-login.pg.py" manual="db.connect">
<option key="database" />
<option key="schema" />
<option key="host" />
<option key="port"/>
<option key="port" answer="5432"/>
<option key="user"/>
<option key="password"/>
</qgisgrassmodule>
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
<option key="input" />
<file key="dns" type="new" />
<option key="format" />
<option key="db_table" />
</qgisgrassmodule>

0 comments on commit 1e8cd68

Please sign in to comment.
You can’t perform that action at this time.