Merge remote-tracking branch 'upstream/master'

qgis · Jun 2, 2014 · 309f5d5 · 309f5d5
2 parents 4cf0486 + 7f21918
commit 309f5d5
Show file tree

Hide file tree

Showing 116 changed files with 18,025 additions and 15,593 deletions.
diff --git a/debian/python-qgis.install.in b/debian/python-qgis.install.in
@@ -4,5 +4,5 @@ usr/lib/python*/*-packages/qgis/core/*
 usr/lib/python*/*-packages/qgis/gui/*
 usr/lib/python*/*-packages/qgis/analysis/*
 usr/lib/python*/*-packages/qgis/networkanalysis/*
-#wheezy saucy#usr/lib/python*/*-packages/pyspatialite/*.py
-#wheezy saucy#usr/lib/python*/*-packages/pyspatialite/*.so
+#wheezy precise quantal raring saucy#usr/lib/python*/*-packages/pyspatialite/*.py
+#wheezy precise quantal raring saucy#usr/lib/python*/*-packages/pyspatialite/*.so
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/doc/index.dox b/doc/index.dox
@@ -39,15 +39,15 @@ website:
 <ul>
 <li>For support we encourage you to join our <a
 href="http://qgis.org/en/site/forusers/support.html#mailing-lists">mailing lists</a> for
-developers.</li> </ul>
+users and developers.</li> </ul>
 
 \section index_bugs Bug Reporting
 If you think you have found a bug, please report it using our <a
 href="http://hub.qgis.org/projects/quantum-gis">bug tracker</a>. When reporting bugs,
 please include some contact information in case we need help with replicating
 your issue.
 
-\section index_maillist Mailing Lists
+\section index_ircchannel IRC channel
 Some QGIS users and developers can also often be found in the 
 <a href="irc://irc.freenode.net/#qgis">\#qgis</a> IRC channel on irc.freenode.net.<p>
 

diff --git a/i18n/qgis_ca.ts b/i18n/qgis_ca.ts
diff --git a/i18n/qgis_da.ts b/i18n/qgis_da.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_en.ts b/i18n/qgis_en.ts
diff --git a/i18n/qgis_es.ts b/i18n/qgis_es.ts
diff --git a/i18n/qgis_eu.ts b/i18n/qgis_eu.ts
diff --git a/i18n/qgis_fa.ts b/i18n/qgis_fa.ts
diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts
diff --git a/i18n/qgis_hr.ts b/i18n/qgis_hr.ts
diff --git a/i18n/qgis_is.ts b/i18n/qgis_is.ts
diff --git a/i18n/qgis_ja.ts b/i18n/qgis_ja.ts
diff --git a/i18n/qgis_nl.ts b/i18n/qgis_nl.ts
diff --git a/i18n/qgis_pl.ts b/i18n/qgis_pl.ts
diff --git a/i18n/qgis_pt_PT.ts b/i18n/qgis_pt_PT.ts
diff --git a/images/icons/qgis_icon_poster.svg b/images/icons/qgis_icon_poster.svg
diff --git a/mac/cmake/1osg.cmake.in b/mac/cmake/1osg.cmake.in
@@ -104,4 +104,13 @@ IF (EXISTS "${TINY}")
     INSTALLNAMETOOL_CHANGE ("${TINY_CHG}" "${TINY_CHG_TO}" "${QPLUGDIR}/libglobeplugin.so")
 ENDIF ()
 
+GET_INSTALL_NAME ("${OSG_PLUGINS_PATH}/osgdb_kml.so" "libminizip" MINI)
+# MESSAGE (STATUS "libminizip path: ${MINI}")
+IF (EXISTS "${MINI}")
+    SET (MINI_CHG "${MINI}")
+    SET (MINI_CHG_TO "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libminizip.dylib")
+    EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${MINI_CHG}" "${QLIBDIR}/libminizip.dylib")
+    INSTALLNAMETOOL_CHANGE ("${MINI_CHG}" "${MINI_CHG_TO}" "${QPLUGDIR}/../osgPlugins/osgdb_kml.so")
+ENDIF ()
+
 ENDIF (@OSGEARTH_FOUND@)
diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip
@@ -179,6 +179,32 @@ class QgsComposerItem : QObject, QGraphicsRectItem
       @param y y-position of mouse cursor (in item coordinates)*/
     virtual void zoomContent( int delta, double x, double y );
 
+    /**Gets the page the item is currently on.
+     * @returns page number for item
+     * @see pagePos
+     * @see updatePagePos
+     * @note this method was added in version 2.4
+    */
+    int page() const;
+
+    /**Returns the item's position relative to its current page.
+     * @returns position relative to the page's top left corner.
+     * @see page
+     * @see updatePagePos
+     * @note this method was added in version 2.4
+    */
+    QPointF pagePos() const;
+
+    /**Moves the item so that it retains its relative position on the page
+     * when the paper size changes.
+     * @param newPageWidth new width of the page in mm
+     * @param newPageHeight new height of the page in mm
+     * @see page
+     * @see pagePos
+     * @note this method was added in version 2.4
+    */
+    void updatePagePos( double newPageWidth, double newPageHeight );
+
     /**Moves the item to a new position (in canvas coordinates)*/
     void setItemPosition( double x, double y, ItemPositionMode itemPoint = UpperLeft );
 

diff --git a/python/core/composer/qgscomposition.sip b/python/core/composer/qgscomposition.sip
@@ -48,7 +48,9 @@ class QgsComposition : QGraphicsScene
 
     ~QgsComposition();
 
-    /**Changes size of paper item*/
+    /**Changes size of paper item. Also moves all items so that they retain
+     * their same relative position to the top left corner of their current page.
+    */
     void setPaperSize( double width, double height );
 
     /**Returns height of paper item*/

diff --git a/python/core/qgsgeometry.sip b/python/core/qgsgeometry.sip
@@ -322,6 +322,9 @@ class QgsGeometry
     * and for point based geometries, the point itself is returned */
     QgsGeometry* centroid() /Factory/;
 
+    /** Returns a point within a geometry */
+    QgsGeometry* pointOnSurface() /Factory/;
+
     /** Returns the smallest convex polygon that contains all the points in the geometry. */
     QgsGeometry* convexHull() /Factory/;
 

diff --git a/python/core/qgsmapsettings.sip b/python/core/qgsmapsettings.sip
@@ -38,14 +38,31 @@ class QgsMapSettings
 
     void setSelectionColor( const QColor& color );
     QColor selectionColor() const;
+
+    /**Sets whether vector selections should be shown in the rendered map
+     * @param showSelection set to true if selections should be shown
+     * @see showSelection
+     * @see setSelectionColor
+     * @note Added in QGIS v2.4
+    */
+    void setShowSelection( const bool showSelection );
+
+    /**Returns true if vector selections should be shown in the rendered map
+     * @returns true if selections should be shown
+     * @see setShowSelection
+     * @see selectionColor
+     * @note Added in QGIS v2.4
+    */
+    bool showSelection() const;   
 
     enum Flag
     {
       Antialiasing       = 0x01,
       DrawEditingInfo    = 0x02,
       ForceVectorOutput  = 0x04,
       UseAdvancedEffects = 0x08,
-      DrawLabeling       = 0x10
+      DrawLabeling       = 0x10,
+      UseRenderingOptimization = 0x20
       // TODO: ignore scale-based visibility (overview)
     };
     typedef QFlags<QgsMapSettings::Flag> Flags;

diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -394,6 +394,7 @@ class QgsPalLayerSettings
     unsigned int placementFlags;
 
     bool centroidWhole; // whether centroid calculated from whole or visible polygon
+    bool centroidInside; // whether centroid-point calculated must be inside polygon
     double dist; // distance from the feature (in mm)
     bool distInMapUnits; //true if distance is in map units (otherwise in mm)
     QgsMapUnitScale distMapUnitScale;

diff --git a/python/core/qgsrendercontext.sip b/python/core/qgsrendercontext.sip
@@ -49,6 +49,14 @@ class QgsRenderContext
 
     //! Added in QGIS v2.0
     QColor selectionColor() const;
+
+    /**Returns true if vector selections should be shown in the rendered map
+     * @returns true if selections should be shown
+     * @see setShowSelection
+     * @see selectionColor
+     * @note Added in QGIS v2.4
+    */
+    bool showSelection() const;
 
     //setters
 
@@ -68,8 +76,20 @@ class QgsRenderContext
     void setLabelingEngine( QgsLabelingEngineInterface* iface );
     //! Added in QGIS v2.0
     void setSelectionColor( const QColor& color );
+
+    /**Sets whether vector selections should be shown in the rendered map
+     * @param showSelection set to true if selections should be shown
+     * @see showSelection
+     * @see setSelectionColor
+     * @note Added in QGIS v2.4
+    */
+    void setShowSelection( const bool showSelection );
 
     /**Returns true if the rendering optimization (geometry simplification) can be executed*/
     bool useRenderingOptimization() const;
     void setUseRenderingOptimization( bool enabled );
+
+    //! Added in QGIS v2.4
+    const QgsVectorSimplifyMethod& vectorSimplifyMethod() const;
+    void setVectorSimplifyMethod( const QgsVectorSimplifyMethod& simplifyMethod );
 };
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -363,15 +363,15 @@ class QgsMapCanvas : QGraphicsView
     //! - additional drawing shall be done directly within the renderer job or independently as a map canvas item
     void renderComplete( QPainter * );
 
+    // ### QGIS 3: renamte to mapRefreshFinished()
     /** Emitted when canvas finished a refresh request.
     \note Added in 2.0 */
-    //! @deprecated since 2.4 - anything related to rendering progress is not visible outside of map canvas
-    void mapCanvasRefreshed() /Deprecated/;
+    void mapCanvasRefreshed();
 
+    // ### QGIS 3: rename to mapRefreshStarted()
     /** Emitted when the canvas is about to be rendered.
       \note Added in 1.5 */
-    //! @deprecated since 2.4 - anything related to rendering progress is not visible outside of map canvas
-    void renderStarting() /Deprecated/;
+    void renderStarting();
 
     //! Emitted when a new set of layers has been received
     void layersChanged();

diff --git a/python/plugins/db_manager/db_plugins/data_model.py b/python/plugins/db_manager/db_plugins/data_model.py
@@ -266,8 +266,9 @@ def _getNewObject(self):
 		return TableConstraint(None)
 
 	def getObject(self, row):
-		val = self.data(self.index(row, 0), Qt.UserRole)
-		constr = val.toPyObject() if val.isValid() else self._getNewObject()
+		constr = self.data(self.index(row, 0), Qt.UserRole)
+		if not constr:
+			constr = self._getNewObject()
 		constr.name = self.data(self.index(row, 0)) or ""
 		constr.type = self.data(self.index(row, 1), Qt.UserRole)
 		constr.columns = self.data(self.index(row, 2), Qt.UserRole)
@@ -297,8 +298,9 @@ def _getNewObject(self):
 		return TableIndex(None)
 
 	def getObject(self, row):
-		val = self.data(self.index(row, 0), Qt.UserRole)
-		idx = val.toPyObject() if val.isValid() else self._getNewObject()
+		idx = self.data(self.index(row, 0), Qt.UserRole)
+		if not idx:
+			idx = self._getNewObject()
 		idx.name = self.data(self.index(row, 0))
 		idx.columns = self.data(self.index(row, 1), Qt.UserRole)
 		return idx
@@ -308,4 +310,3 @@ def getIndexes(self):
 		for idx in self.getObjectIter():
 			idxs.append( idx )
 		return idxs
-
diff --git a/python/plugins/processing/algs/r/scripts/Dotplot.rsx b/python/plugins/processing/algs/r/scripts/Dotplot.rsx
@@ -1,4 +1,5 @@
 ##Vector processing=group
-##Layer = raster
+##Layer = vector
 ##showplots
-hist(as.matrix(Layer),main="Histogram",xlab="Layer")
+##Field=Field Layer
+dotchart(Layer[[Field]],main=paste("Dotplot of",Field),xlab=paste(Field),ylab="Observation number")
diff --git a/python/plugins/processing/algs/r/scripts/Dotplot.rsx.help b/python/plugins/processing/algs/r/scripts/Dotplot.rsx.help
@@ -9,7 +9,7 @@ VA numeric field.
 p4
 sS'ALG_DESC'
 p5
-VThis tool creates a dotplot of the input numeric field using the function dotchart().\u000a
+VThis tool uses dotchart() to create a dotplot using the values from a numeric field.\u000a
 p6
 sS'Layer'
 p7

diff --git a/python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py b/python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py
@@ -29,7 +29,7 @@
 from processing.parameters.ParameterRaster import ParameterRaster
 from processing.outputs.OutputNumber import OutputNumber
 from processing.tools import dataobjects
-
+from processing.outputs.OutputExtent import OutputExtent
 
 class RasterLayerBoundsAlgorithm(GeoAlgorithm):
 
@@ -38,6 +38,7 @@ class RasterLayerBoundsAlgorithm(GeoAlgorithm):
     XMAX = 'XMAX'
     YMIN = 'YMIN'
     YMAX = 'YMAX'
+    EXTENT = 'EXTENT'
 
     def defineCharacteristics(self):
         self.showInModeler = True
@@ -49,11 +50,17 @@ def defineCharacteristics(self):
         self.addOutput(OutputNumber(self.XMAX, 'max X'))
         self.addOutput(OutputNumber(self.YMIN, 'min Y'))
         self.addOutput(OutputNumber(self.YMAX, 'max Y'))
-
+        self.addOutput(OutputExtent(self.EXTENT, 'Extent'))
+
     def processAlgorithm(self, progress):
         uri = self.getParameterValue(self.LAYER)
         layer = dataobjects.getObjectFromUri(uri)
         self.setOutputValue(self.XMIN, layer.extent().xMinimum())
         self.setOutputValue(self.XMAX, layer.extent().xMaximum())
         self.setOutputValue(self.YMIN, layer.extent().yMinimum())
         self.setOutputValue(self.YMAX, layer.extent().yMaximum())
+        self.setOutputValue(self.EXTENT, (layer.extent().xMinimum(),
+                            layer.extent().xMaximum(),
+                            layer.extent().yMinimum(),
+                            layer.extent().yMaximum()))
+
diff --git a/python/plugins/processing/script/ScriptAlgorithm.py b/python/plugins/processing/script/ScriptAlgorithm.py
@@ -247,7 +247,9 @@ def processAlgorithm(self, progress):
         ns = {}
         ns['progress'] = progress
 
+        print self.parameters
         for param in self.parameters:
+            print param.name
             ns[param.name] = param.value
 
         for out in self.outputs: