Skip to content
Permalink
Browse files

Merge branch 'master' of git://github.com/qgis/Quantum-GIS

  • Loading branch information
Jean-Roc committed May 25, 2012
2 parents c4db2e0 + afcd5b6 commit 0cda3255fff886ee7a0d0179e16fa9b2406c3360
Showing with 5,572 additions and 3,167 deletions.
  1. +1 −1 debian/rules
  2. +47 −47 doc/TRANSLATORS
  3. +1 −1 doc/index.dox
  4. +1,965 −2,009 i18n/qgis_de.ts
  5. +1 −1 python/gui/qgsmapcanvas.sip
  6. +5 −5 python/plugins/db_manager/db_manager.py
  7. +3 −3 python/plugins/db_manager/db_plugins/connector.py
  8. +9 −2 python/plugins/db_manager/table_viewer.py
  9. +2 −2 python/plugins/fTools/tools/doGeometry.py
  10. +96 −43 python/plugins/fTools/tools/doGeoprocessing.py
  11. +7 −6 python/plugins/fTools/tools/doRandPoints.py
  12. +49 −27 python/plugins/fTools/tools/doValidate.py
  13. +4 −6 python/plugins/fTools/tools/doVectorGrid.py
  14. +68 −77 python/plugins/fTools/tools/frmSpatialJoin.ui
  15. +66 −65 python/plugins/fTools/tools/frmVectorSplit.ui
  16. +10 −0 python/plugins/fTools/tools/ftools_utils.py
  17. +634 −327 resources/customization.xml
  18. +65 −0 scripts/addcopyright.sh
  19. +119 −95 scripts/tsstat.pl
  20. +5 −0 scripts/update_ts_files.sh
  21. +14 −0 src/analysis/interpolation/HalfEdge.cc
  22. +14 −0 src/analysis/interpolation/TriangleInterpolator.cc
  23. +14 −0 src/analysis/interpolation/Triangulation.cc
  24. +14 −0 src/analysis/raster/qgsrastercalcnode.cpp
  25. +6 −6 src/app/composer/qgscomposerlegendlayersdialog.cpp
  26. +6 −6 src/app/composer/qgscomposerlegendlayersdialog.h
  27. +6 −11 src/app/legend/qgslegendgroup.cpp
  28. +6 −11 src/app/legend/qgslegendgroup.h
  29. +6 −11 src/app/legend/qgslegenditem.cpp
  30. +6 −11 src/app/legend/qgslegenditem.h
  31. +6 −12 src/app/legend/qgslegendlayer.cpp
  32. +6 −11 src/app/legend/qgslegendlayer.h
  33. +6 −11 src/app/legend/qgslegendpropertygroup.cpp
  34. +6 −11 src/app/legend/qgslegendpropertygroup.h
  35. +6 −11 src/app/legend/qgslegendpropertyitem.cpp
  36. +6 −11 src/app/legend/qgslegendpropertyitem.h
  37. +6 −11 src/app/legend/qgslegendsymbologygroup.cpp
  38. +6 −11 src/app/legend/qgslegendsymbologygroup.h
  39. +6 −12 src/app/legend/qgslegendsymbologyitem.cpp
  40. +6 −11 src/app/legend/qgslegendsymbologyitem.h
  41. +0 −1 src/app/main.cpp
  42. +6 −4 src/app/qgisapp.cpp
  43. +14 −0 src/app/qgsbrowserdockwidget.cpp
  44. +14 −0 src/app/qgsbrowserdockwidget.h
  45. +9 −9 src/app/qgscustomprojectiondialog.cpp
  46. +14 −0 src/app/qgsembedlayerdialog.cpp
  47. +14 −0 src/app/qgsembedlayerdialog.h
  48. +14 −0 src/app/qgsformannotationdialog.cpp
  49. +14 −0 src/app/qgsformannotationdialog.h
  50. +14 −0 src/app/qgslabelengineconfigdialog.cpp
  51. +14 −0 src/app/qgslabelengineconfigdialog.h
  52. +14 −0 src/app/qgslabelpreview.cpp
  53. +14 −0 src/app/qgslabelpreview.h
  54. +3 −3 src/app/qgsoptions.cpp
  55. +6 −12 src/app/qgstip.h
  56. +6 −12 src/app/qgstipfactory.cpp
  57. +6 −11 src/app/qgstipfactory.h
  58. +14 −0 src/app/qgsundowidget.cpp
  59. +14 −0 src/app/qgsundowidget.h
  60. +14 −0 src/core/pal/costcalculator.cpp
  61. +14 −0 src/core/pal/costcalculator.h
  62. +3 −1 src/core/qgsapplication.cpp
  63. +14 −0 src/core/qgsbrowsermodel.cpp
  64. +14 −0 src/core/qgsbrowsermodel.h
  65. +35 −23 src/core/qgscoordinatereferencesystem.cpp
  66. +36 −21 src/core/qgsdataitem.cpp
  67. +14 −0 src/core/qgsdiagram.cpp
  68. +14 −0 src/core/qgsdiagram.h
  69. +14 −0 src/core/qgsdiagramrendererv2.cpp
  70. +14 −0 src/core/qgsdiagramrendererv2.h
  71. +1 −1 src/core/qgsdistancearea.cpp
  72. +32 −31 src/core/qgsgeometry.cpp
  73. +36 −27 src/core/qgsgeometryvalidator.cpp
  74. +14 −0 src/core/qgslabelsearchtree.cpp
  75. +1 −1 src/core/qgsmaplayer.cpp
  76. +10 −12 src/core/qgsmaprenderer.cpp
  77. +10 −7 src/core/qgsmessageoutput.cpp
  78. +1 −0 src/core/qgsmessageoutput.h
  79. +14 −0 src/core/qgsmimedatautils.cpp
  80. +14 −0 src/core/qgsmimedatautils.h
  81. +14 −0 src/core/qgspluginlayer.cpp
  82. +14 −0 src/core/qgspluginlayer.h
  83. +14 −0 src/core/qgspythonrunner.cpp
  84. +14 −0 src/core/qgspythonrunner.h
  85. +17 −1 src/core/qgsvectorlayer.cpp
  86. +14 −0 src/core/qgsvectorlayerundocommand.cpp
  87. +14 −0 src/core/qgsvectorlayerundocommand.h
  88. +14 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  89. +14 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  90. +14 −0 src/core/symbology-ng/qgscolorbrewerpalette.h
  91. +14 −0 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  92. +14 −0 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  93. +14 −0 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  94. +14 −0 src/core/symbology-ng/qgsfillsymbollayerv2.h
  95. +13 −12 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  96. +14 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  97. +14 −0 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  98. +14 −0 src/core/symbology-ng/qgslinesymbollayerv2.h
  99. +14 −0 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  100. +14 −0 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  101. +14 −0 src/core/symbology-ng/qgsrendererv2.cpp
  102. +14 −0 src/core/symbology-ng/qgsrendererv2.h
  103. +14 −0 src/core/symbology-ng/qgsrendererv2registry.cpp
  104. +14 −0 src/core/symbology-ng/qgsrendererv2registry.h
  105. +14 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  106. +14 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  107. +14 −0 src/core/symbology-ng/qgsstylev2.cpp
  108. +14 −0 src/core/symbology-ng/qgsstylev2.h
  109. +14 −0 src/core/symbology-ng/qgssymbollayerv2.cpp
  110. +14 −0 src/core/symbology-ng/qgssymbollayerv2.h
  111. +14 −0 src/core/symbology-ng/qgssymbollayerv2registry.cpp
  112. +14 −0 src/core/symbology-ng/qgssymbollayerv2registry.h
  113. +14 −0 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  114. +14 −0 src/core/symbology-ng/qgssymbollayerv2utils.h
  115. +14 −0 src/core/symbology-ng/qgssymbologyv2conversion.cpp
  116. +14 −0 src/core/symbology-ng/qgssymbologyv2conversion.h
  117. +14 −0 src/core/symbology-ng/qgssymbolv2.cpp
  118. +14 −0 src/core/symbology-ng/qgssymbolv2.h
  119. +14 −0 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  120. +14 −0 src/core/symbology-ng/qgsvectorcolorrampv2.h
  121. +42 −63 src/gui/qgsmaptip.cpp
  122. +6 −0 src/gui/qgsmessagelogviewer.cpp
  123. +1 −0 src/gui/qgsmessagelogviewer.h
  124. +15 −0 src/gui/qgsprojectbadlayerguihandler.cpp
  125. +14 −0 src/gui/qgsprojectbadlayerguihandler.h
  126. +7 −7 src/gui/qgsprojectionselector.cpp
  127. +14 −0 src/gui/symbology-ng/qgsbrushstylecombobox.cpp
  128. +14 −0 src/gui/symbology-ng/qgsbrushstylecombobox.h
  129. +14 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  130. +14 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  131. +14 −0 src/gui/symbology-ng/qgscolorrampcombobox.cpp
  132. +14 −0 src/gui/symbology-ng/qgscolorrampcombobox.h
  133. +14 −0 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
  134. +14 −0 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
  135. +14 −0 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  136. +15 −0 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  137. +14 −0 src/gui/symbology-ng/qgspenstylecombobox.cpp
  138. +14 −0 src/gui/symbology-ng/qgspenstylecombobox.h
  139. +14 −1 src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
  140. +15 −0 src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
  141. +14 −0 src/gui/symbology-ng/qgsrendererv2widget.cpp
  142. +14 −0 src/gui/symbology-ng/qgsrendererv2widget.h
  143. +14 −0 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  144. +14 −0 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
  145. +14 −0 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  146. +14 −0 src/gui/symbology-ng/qgsstylev2managerdialog.h
  147. +15 −0 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  148. +15 −0 src/gui/symbology-ng/qgssymbollayerv2widget.h
  149. +24 −4 src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
  150. +14 −0 src/gui/symbology-ng/qgssymbollevelsv2dialog.h
  151. +14 −0 src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
  152. +14 −0 src/gui/symbology-ng/qgssymbolv2propertiesdialog.h
  153. +14 −0 src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
  154. +14 −0 src/gui/symbology-ng/qgssymbolv2selectordialog.h
  155. +14 −0 src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
  156. +14 −0 src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h
  157. +14 −0 src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
  158. +14 −0 src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
  159. +14 −0 src/gui/symbology-ng/qgsvectorfieldwidget.h
  160. +14 −0 src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
  161. +14 −0 src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h
  162. +14 −0 src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
  163. +14 −0 src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.h
  164. +1 −1 src/helpviewer/qgshelpviewer.cpp
  165. +14 −0 src/mapserver/qgsgetrequesthandler.cpp
  166. +14 −0 src/mapserver/qgslogicalfilter.cpp
  167. +14 −0 src/mapserver/qgsmsutils.cpp
  168. +14 −0 src/mapserver/qgsmsutils.h
  169. +62 −3 src/mapserver/qgswfsserver.cpp
  170. +16 −0 src/mapserver/qgswfsserver.h
  171. +10 −1 src/mapserver/qgswmsserver.cpp
  172. +14 −0 src/plugins/diagram_overlay/qgsdiagramrenderer.cpp
  173. +14 −0 src/plugins/globe/qgsosgearthtilesource.cpp
  174. +14 −0 src/plugins/globe/qgsosgearthtilesource.h
  175. +1 −1 src/plugins/grass/locations.gml
  176. +14 −0 src/plugins/grass/qgis.g.browser.cpp
  177. +8 −0 src/plugins/grass/qgsgrassnewmapset.cpp
  178. +14 −0 src/plugins/interpolation/qgsidwinterpolatordialog.cpp
  179. +14 −0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp
  180. +14 −0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.h
  181. +14 −0 src/providers/gdal/qgsgdaldataitems.cpp
  182. +14 −0 src/providers/gdal/qgsgdaldataitems.h
  183. +14 −0 src/providers/grass/qgis.d.rast.c
  184. +14 −0 src/providers/grass/qgis.g.info.c
  185. +1 −1 src/providers/mssql/qgsmssqlprovider.cpp
  186. +14 −0 src/providers/postgres/qgspostgresdataitems.cpp
  187. +14 −0 src/providers/postgres/qgspostgresdataitems.h
  188. +25 −6 src/providers/postgres/qgspostgresprovider.cpp
  189. +14 −0 src/providers/spatialite/qgsspatialiteconnection.cpp
  190. +14 −0 src/providers/spatialite/qgsspatialiteconnection.h
  191. +14 −0 src/providers/spatialite/qgsspatialitedataitems.cpp
  192. +14 −0 src/providers/spatialite/qgsspatialitedataitems.h
  193. +14 −0 src/providers/wfs/qgswfsconnection.cpp
  194. +14 −0 src/providers/wfs/qgswfsconnection.h
  195. +14 −0 src/providers/wfs/qgswfsdataitems.cpp
  196. +14 −0 src/providers/wfs/qgswfsdataitems.h
  197. +14 −0 src/providers/wfs/qgswfsutils.cpp
  198. +14 −0 src/providers/wfs/qgswfsutils.h
  199. +14 −0 src/providers/wms/qgswmsdataitems.cpp
  200. +14 −0 src/providers/wms/qgswmsdataitems.h
  201. +12 −4 src/python/qgspythonutilsimpl.cpp
  202. +1 −1 src/ui/qgsprojectionselectorbase.ui
  203. +18 −0 tests/src/core/testziplayer.cpp
  204. BIN tests/testdata/control_images/expected_continuous/windows_continuous_anomaly.png
  205. BIN tests/testdata/control_images/expected_graduated/windows_graduated_anomaly.png
  206. BIN tests/testdata/control_images/expected_landsat_875/windows_landsat875_anomaly.png
  207. BIN tests/testdata/control_images/expected_rgbwcmyk01_YeGeo.jp2/windows_rgbwcmyk01_YeGeo_anomaly.png
  208. BIN tests/testdata/control_images/expected_single/windows_single_anomaly.png
  209. BIN tests/testdata/control_images/expected_uniquevalue/windows_anomaly.png
  210. BIN tests/testdata/testzip.zip
@@ -144,7 +144,7 @@ install: build
$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp

# remove unwanted files
rm debian/tmp/usr/share/qgis/doc/api/installdox
! [ -f debian/tmp/usr/share/qgis/doc/api/installdox ] || rm debian/tmp/usr/share/qgis/doc/api/installdox
! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || rm debian/tmp/usr/share/qgis/doc/api/jquery.js

# Install menu pixmap

Large diffs are not rendered by default.

@@ -5,7 +5,7 @@
/*! \mainpage Quantum GIS

\section index_intro Introduction
\htmlonly<img src="http://download.qgis.org/qgis-icon-60x60.png" alt="QGIS"
\htmlonly<img src="http://hub.qgis.org/projects/quantum-gis/repository/revisions/master/entry/images/icons/qgis-icon-60x60.png" alt="QGIS"
align="left"><a href="http://qgis.org">Quantum GIS</a>\endhtmlonly\latexonly
Quantum GIS \endlatexonly (QGIS) is a user friendly Open Source Geographic
Information System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS

Large diffs are not rendered by default.

@@ -62,7 +62,7 @@ class QgsMapCanvas : QGraphicsView

QgsMapCanvasMap* map();

QgsMapRenderer* mapRenderer();
QgsMapRenderer* mapRenderer() /Transfer/;

//! Accessor for the canvas pixmap
// @deprecated use canvasPaintDevice()
@@ -223,7 +223,7 @@ def registerAction(self, action, menuName, callback=None):
# get the placeholder's position to insert before it
pos = 0
for pos in range(len(menuActions)):
if menuActions[pos].isSeparator() and menuActions[pos].text() == "placeholder":
if menuActions[pos].isSeparator() and menuActions[pos].objectName().endsWith("_placeholder"):
menuActions[pos].setVisible(True)
break

@@ -301,7 +301,7 @@ def unregisterAction(self, action, menuName):
# hide the placeholder if there're no other registered actions
if len(self._registeredDbActions[menuName]) <= 0:
for i in range(len(menuActions)):
if menuActions[i].isSeparator() and menuActions[i].text() == "placeholder":
if menuActions[i].isSeparator() and menuActions[i].objectName().endsWith("_placeholder"):
menuActions[i].setVisible(False)
break

@@ -369,18 +369,18 @@ def setupUi(self):
# create menus' actions

# menu DATABASE
sep = self.menuDb.addAction("placeholder"); sep.setSeparator(True); sep.setVisible(False)
sep = self.menuDb.addSeparator(); sep.setObjectName("DB_Manager_DbMenu_placeholder"); sep.setVisible(False)
self.actionRefresh = self.menuDb.addAction( QIcon(":/db_manager/actions/refresh"), "&Refresh", self.refreshActionSlot, QKeySequence("F5") )
self.actionSqlWindow = self.menuDb.addAction( QIcon(":/db_manager/actions/sql_window"), "&SQL window", self.runSqlWindow, QKeySequence("F2") )
self.menuDb.addSeparator()
self.actionClose = self.menuDb.addAction( QIcon(), "&Exit", self.close, QKeySequence("CTRL+Q") )

# menu SCHEMA
sep = self.menuSchema.addAction("placeholder"); sep.setSeparator(True); sep.setVisible(False)
sep = self.menuSchema.addSeparator(); sep.setObjectName("DB_Manager_SchemaMenu_placeholder"); sep.setVisible(False)
actionMenuSchema.setVisible(False)

# menu TABLE
sep = self.menuTable.addAction("placeholder"); sep.setSeparator(True); sep.setVisible(False)
sep = self.menuTable.addSeparator(); sep.setObjectName("DB_Manager_TableMenu_placeholder"); sep.setVisible(False)
actionMenuTable.setVisible(False)
self.actionShowSystemTables = self.menuTable.addAction("Show system tables/views", self.showSystemTables)
self.actionShowSystemTables.setCheckable(True)
@@ -60,13 +60,13 @@ def hasTableColumnEditingSupport(self):
return False


def execution_error_types():
def execution_error_types(self):
raise Exception("DBConnector.execution_error_types() is an abstract method")

def connection_error_types():
def connection_error_types(self):
raise Exception("DBConnector.connection_error_types() is an abstract method")

def error_types():
def error_types(self):
return self.connection_error_types() + self.execution_error_types()

def _execute(self, cursor, sql):
@@ -67,7 +67,12 @@ def setDirty(self, val=True):

def _clear(self):
if self.item is not None:
self.disconnect(self.item, SIGNAL('aboutToChange'), self.setDirty)
try:
self.disconnect(self.item, SIGNAL('aboutToChange'), self.setDirty)
except:
# do not raise any error if self.item was deleted
pass

self.item = None
self.dirty = False

@@ -83,11 +88,13 @@ def _loadTableData(self, table):
self.setModel( table.tableDataModel(self) )

except DbError, e:
QApplication.restoreOverrideCursor()
DlgDbError.showError(e, self)
return

else:
self.update()

finally:
QApplication.restoreOverrideCursor()


@@ -620,11 +620,11 @@ def polygon_centroids( self ):
self.emit( SIGNAL( "runStatus( PyQt_PyObject )" ), nElement )
inGeom = inFeat.geometry()
atMap = inFeat.attributeMap()
outGeom = QgsGeometry( inGeom.centroid() )
outGeom = inGeom.centroid()
if outGeom is None:
return "math_error"
outFeat.setAttributeMap( atMap )
outFeat.setGeometry( outGeom )
outFeat.setGeometry( QgsGeometry( outGeom ) )
writer.addFeature( outFeat )
del writer
return True

0 comments on commit 0cda325

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