Merge pull request #4198 from nyalldawson/canvas_api

Remove support for disabling OTF reprojection
qgis · Mar 1, 2017 · 1f7635a · 1f7635a
2 parents aeaa5fc + 081cf96
commit 1f7635a
Show file tree

Hide file tree

Showing 98 changed files with 887 additions and 1,239 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -936,7 +936,7 @@ QgsDxfExport        {#qgis_api_break_3_0_QgsDxfExport}
 - writeSolid() was removed. Use writePolygon() instead.
 - The signature for writeLine() has changed.
 - writePoint(), writeFilledCircle(), writeCircle(), writeText() and writeMText() now take QgsPointV2 arguments
-
+- setMapUnits() was removed. The map units are dictated by the units for the destination CRS.
 
 
 QgsEditFormConfig        {#qgis_api_break_3_0_QgsEditFormConfig}
@@ -1257,6 +1257,12 @@ QgsLayerTreeNode        {#qgis_api_break_3_0_QgsLayerTreeNode}
 - readXml() does not resolve layers from the layer IDs anymore. Call resolveReferences() or use readXml() override with QgsProject as the second argument.
 
 
+QgsLayerTreeMapCanvasBridge        {#qgis_api_break_3_0_QgsLayerTreeMapCanvasBridge}
+-----------------
+
+- setAutoEnableCrsTransform() and autoEnableCrsTransform() were removed. CRS transformation is now always enabled.
+
+
 QgsLayerTreeModel        {#qgis_api_break_3_0_QgsLayerTreeMode}
 -----------------
 
@@ -1315,6 +1321,9 @@ QgsMapCanvas        {#qgis_api_break_3_0_QgsMapCanvas}
 - setProgress() signal has been removed. It was not emitted since 2.0.
 - enableOverviewMode() and updateOverview() have been removed. Map canvas does not keep pointer to overview canvas anymore. Use QgsLayerTreeMapCanvasBridge::setOverviewCanvas() to set up updates of overview canvas together with main canvas.
 - the duplicate mapToolSet signal with a single QgsMapTool argument has been removed. Use the signal with arguments for new and old map tool instead.
+- setCrsTransformEnabled(), hasCrsTransformEnabled(), hasCrsTransformEnabledChanged() were removed. CRS transformation is now always enabled.
+- setMapUnits() was removed. The map units are dictated by the units for the destination CRS.
+- The mapUnitsChanged() signal was removed. Listen for the destinationCrsChanged() signal instead, as the destination CRS dictates the map units.
 
 QgsMapCanvasItem        {#qgis_api_break_3_0_QgsMapCanvasItem}
 ----------------
@@ -1354,6 +1363,7 @@ QgsMapOverviewCanvas        {#qgis_api_break_3_0_QgsMapOverviewCanvas}
 
 - layerSet() and setLayerSet() have been replaced by layers() and setLayers() which work with list of layers instead of layer IDs
 - destinationSrsChanged() was renamed to destinationCrsChanged()
+- hasCrsTransformEnabled() was removed. CRS transformation is now always enabled.
 
 
 QgsMapRenderer        {#qgis_api_break_3_0_QgsMapRenderer}
@@ -1421,6 +1431,8 @@ QgsMapSettings        {#qgis_api_break_3_0_QgsMapSettings}
 be returned instead of a null pointer if no transformation is required.
 - destinationCrs() now returns a copy instead of a reference to the CRS. This has no effect on PyQGIS code, but c++
 plugins calling this method will need to be updated.
+- setCrsTransformEnabled() and hasCrsTransformEnabled() were removed. CRS transformation is now always enabled.
+- setMapUnits() was removed. The map units are dictated by the units for the destination CRS.
 
 
 QgsMarkerSymbolLayer        {#qgis_api_break_3_0_QgsMarkerSymbolLayer}
@@ -1896,6 +1908,12 @@ QgsTolerance        {#qgis_api_break_3_0_QgsTolerance}
 - The MapUnits UnitType was removed. Use LayerUnits or ProjectUnits instead.
 
 
+QgsTracer        {#qgis_api_break_3_0_QgsTracer}
+---------
+
+- hasCrsTransformEnabled() and setCrsTransformEnabled() were removed. CRS transformation is now always enabled when required.
+
+
 QgsTreeWidgetItem        {#qgis_api_break_3_0_QgsTreeWidgetItem}
 -----------------
 

diff --git a/python/core/dxf/qgsdxfexport.sip b/python/core/dxf/qgsdxfexport.sip
@@ -65,17 +65,6 @@ class QgsDxfExport
      */
     double symbologyScaleDenominator() const;
 
-    /**
-     * Set map units
-     * @param u unit
-     */
-    void setMapUnits( QgsUnitTypes::DistanceUnit u );
-
-    /**
-     * Retrieve map units
-     * @returns unit
-     * @see setMapUnits
-     */
     QgsUnitTypes::DistanceUnit mapUnits() const;
 
     /**

diff --git a/python/core/qgsmapsettings.sip b/python/core/qgsmapsettings.sip
@@ -83,20 +83,13 @@ class QgsMapSettings
      */
     void setCustomRenderFlags( const QString& customRenderFlags );
 
-    //! sets whether to use projections for this layer set
-    void setCrsTransformEnabled( bool enabled );
-    //! returns true if projections are enabled for this layer set
-    bool hasCrsTransformEnabled() const;
-
     //! sets destination coordinate reference system
     void setDestinationCrs( const QgsCoordinateReferenceSystem& crs );
     //! returns CRS of destination coordinate reference system
     QgsCoordinateReferenceSystem destinationCrs() const;
 
     //! Get units of map's geographical coordinates - used for scale calculation
     QgsUnitTypes::DistanceUnit mapUnits() const;
-    //! Set units of map's geographical coordinates - used for scale calculation
-    void setMapUnits( QgsUnitTypes::DistanceUnit u );
 
     //! Set the background color of the map
     void setBackgroundColor( const QColor& color );

diff --git a/python/core/qgstracer.sip b/python/core/qgstracer.sip
@@ -20,11 +20,6 @@ class QgsTracer : QObject
     //! Set layers used for tracing
     void setLayers( const QList<QgsVectorLayer*>& layers );
 
-    //! Return true if reprojection to destination CRS is enabled
-    bool hasCrsTransformEnabled() const;
-    //! Set whether to do reprojection to destination CRS
-    void setCrsTransformEnabled( bool enabled );
-
     //! Get CRS used for tracing
     QgsCoordinateReferenceSystem destinationCrs() const;
     //! Set CRS used for tracing

diff --git a/python/gui/layertree/qgslayertreemapcanvasbridge.sip b/python/gui/layertree/qgslayertreemapcanvasbridge.sip
@@ -45,11 +45,6 @@ class QgsLayerTreeMapCanvasBridge : QObject
     void setAutoSetupOnFirstLayer( bool enabled );
     bool autoSetupOnFirstLayer() const;
 
-    //! if enabled, will automatically turn on on-the-fly reprojection of layers if a layer
-    //! with different source CRS is added
-    void setAutoEnableCrsTransform( bool enabled );
-    bool autoEnableCrsTransform() const;
-
   public slots:
     void setHasCustomLayerOrder( bool state );
     void setCustomLayerOrder( const QStringList& order );

diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -36,10 +36,6 @@ class QgsMapCanvas : QGraphicsView
     //! @note added in 2.4
     const QgsMapSettings& mapSettings() const /KeepReference/;
 
-    //! sets whether to use projections for this layer set
-    //! @note added in 2.4
-    void setCrsTransformEnabled( bool enabled );
-
     //! sets destination coordinate reference system
     //! @note added in 2.4
     void setDestinationCrs( const QgsCoordinateReferenceSystem& crs );
@@ -174,26 +170,9 @@ class QgsMapCanvas : QGraphicsView
 
     //! return list of layers within map canvas.
     QList<QgsMapLayer*> layers() const;
-
-    /**
-     * Freeze/thaw the map canvas. This is used to prevent the canvas from
-     * responding to events while layers are being added/removed etc.
-     * @param frz Boolean specifying if the canvas should be frozen (true) or
-     * thawed (false). Default is true.
-     *
-     * TODO remove in QGIS 3
-     */
-    void freeze( bool frz = true );
-
-    /**
-     * Accessor for frozen status of canvas
-     *
-     * TODO remove in QGIS 3
-     */
-    bool isFrozen();
-
-    //! Set map units (needed by project properties dialog)
-    void setMapUnits( QgsUnitTypes::DistanceUnit mapUnits );
+    void freeze( bool frozen = true );
+    bool isFrozen() const;
+    bool renderFlag() const;
 
     //! Get the current canvas map units
     QgsUnitTypes::DistanceUnit mapUnits() const;
@@ -354,14 +333,7 @@ class QgsMapCanvas : QGraphicsView
 
     //! This slot is connected to the layer's CRS change
     void layerCrsChange();
-
-    //! Whether to suppress rendering or not
     void setRenderFlag( bool flag );
-    //! State of render suppression flag
-    bool renderFlag();
-
-    //! A simple helper method to find out if on the fly projections are enabled or not
-    bool hasCrsTransformEnabled();
 
     //! stop rendering (if there is any right now)
     //! @note added in 2.4
@@ -454,18 +426,10 @@ class QgsMapCanvas : QGraphicsView
     //! Emitted when zoom next status changed
     void zoomNextStatusChanged( bool );
 
-    //! Emitted when on-the-fly projection has been turned on/off
-    //! @note added in 2.4
-    void hasCrsTransformEnabledChanged( bool flag );
-
     //! Emitted when map CRS has changed
     //! @note added in 2.4
     void destinationCrsChanged();
 
-    //! Emitted when map units are changed
-    //! @note added in 2.4
-    void mapUnitsChanged();
-
     //! Emitted when the current layer is changed
     //! @note added in 2.8
     void currentLayerChanged( QgsMapLayer* layer );

diff --git a/python/gui/qgsmapoverviewcanvas.sip b/python/gui/qgsmapoverviewcanvas.sip
@@ -32,9 +32,6 @@ class QgsMapOverviewCanvas : QWidget
     //! used for overview canvas to reflect changed extent in main map canvas
     void drawExtentRect();
 
-    // ### QGIS 3: rename so it does not look like getter, make protected
-    void hasCrsTransformEnabled( bool flag );
-
     // ### QGIS 3: make protected
     //! Should be called when the canvas destination CRS is changed
     void destinationCrsChanged();

diff --git a/python/gui/qgsprojectionselectiondialog.sip b/python/gui/qgsprojectionselectiondialog.sip
@@ -18,6 +18,10 @@ class QgsProjectionSelectionDialog : QDialog //, private Ui::QgsGenericProjectio
 
     void setMessage( const QString& message );
 
+    void setShowNoProjection( bool show );
+
+    bool showNoProjection() const;
+
   public slots:
 
 

diff --git a/python/gui/qgsprojectionselectiontreewidget.sip b/python/gui/qgsprojectionselectiontreewidget.sip
@@ -5,12 +5,18 @@ class QgsProjectionSelectionTreeWidget : QWidget
 %End
 
   public:
-    QgsProjectionSelectionTreeWidget( QWidget* parent /TransferThis/ );
+    QgsProjectionSelectionTreeWidget( QWidget* parent /TransferThis/ = 0 );
 
     ~QgsProjectionSelectionTreeWidget();
 
     QgsCoordinateReferenceSystem crs() const;
 
+    void setShowNoProjection( bool show );
+
+    bool showNoProjection() const;
+
+    bool hasValidSelection() const;
+
   public slots:
 
     void setCrs( const QgsCoordinateReferenceSystem& crs );

diff --git a/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py b/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
@@ -99,8 +99,8 @@ def run(item, action, mainwindow):
     template_dir = os.path.join(current_path, 'templates')
 
     # do not refresh the canvas until all the layers are added
-    prevRenderFlagState = iface.mapCanvas().renderFlag()
-    iface.mapCanvas().setRenderFlag(False)
+    wasFrozen = iface.mapCanvas().isFrozen()
+    iface.mapCanvas().freeze()
     try:
         provider = db.dbplugin().providerName()
         uri = db.uri()
@@ -264,6 +264,7 @@ def run(item, action, mainwindow):
             canvas.setExtent(ext)
 
         # restore canvas render flag
-        iface.mapCanvas().setRenderFlag(prevRenderFlagState)
+        if not wasFrozen:
+            iface.mapCanvas().freeze(False)
 
     return True
diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
@@ -91,7 +91,7 @@ def _clear(self):
     def _loadTablePreview(self, table, limit=False):
         """ if has geometry column load to map canvas """
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
-        self.setRenderFlag(False)
+        self.freeze()
         vl = None
 
         if table and table.geomType:
@@ -130,5 +130,5 @@ def _loadTablePreview(self, table, limit=False):
 
         self.currentLayer = vl
 
-        self.setRenderFlag(True)
+        self.freeze(False)
         QApplication.restoreOverrideCursor()
diff --git a/python/plugins/processing/algs/qgis/FieldsCalculator.py b/python/plugins/processing/algs/qgis/FieldsCalculator.py
@@ -100,8 +100,7 @@ def processAlgorithm(self, feedback):
 
         da = QgsDistanceArea()
         da.setSourceCrs(layer.crs())
-        da.setEllipsoidalMode(
-            iface.mapCanvas().mapSettings().hasCrsTransformEnabled())
+        da.setEllipsoidalMode(True)
         da.setEllipsoid(QgsProject.instance().readEntry(
             'Measure', '/Ellipsoid', GEO_NONE)[0])
         exp.setGeomCalculator(da)

diff --git a/python/plugins/processing/algs/qgis/FieldsMapper.py b/python/plugins/processing/algs/qgis/FieldsMapper.py
@@ -104,8 +104,7 @@ def processAlgorithm(self, feedback):
 
         da = QgsDistanceArea()
         da.setSourceCrs(layer.crs())
-        da.setEllipsoidalMode(
-            iface.mapCanvas().mapSettings().hasCrsTransformEnabled())
+        da.setEllipsoidalMode(True)
         da.setEllipsoid(QgsProject.instance().readEntry(
             'Measure', '/Ellipsoid', GEO_NONE)[0])
 

diff --git a/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py b/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py
@@ -209,7 +209,7 @@ def processAlgorithm(self, feedback):
 
         director.addStrategy(strategy)
         builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
-                                  iface.mapCanvas().hasCrsTransformEnabled(),
+                                  True,
                                   tolerance)
 
         feedback.pushInfo(self.tr('Loading start points...'))

diff --git a/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py b/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py
@@ -192,7 +192,7 @@ def processAlgorithm(self, feedback):
 
         director.addStrategy(strategy)
         builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
-                                  iface.mapCanvas().hasCrsTransformEnabled(),
+                                  True,
                                   tolerance)
         feedback.pushInfo(self.tr('Building graph...'))
         snappedPoints = director.makeGraph(builder, [startPoint])

diff --git a/python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py b/python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py
@@ -203,7 +203,7 @@ def processAlgorithm(self, feedback):
 
         director.addStrategy(strategy)
         builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
-                                  iface.mapCanvas().hasCrsTransformEnabled(),
+                                  True,
                                   tolerance)
 
         feedback.pushInfo(self.tr('Loading start points...'))

diff --git a/python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py b/python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py
@@ -203,7 +203,7 @@ def processAlgorithm(self, feedback):
 
         director.addStrategy(strategy)
         builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
-                                  iface.mapCanvas().hasCrsTransformEnabled(),
+                                  True,
                                   tolerance)
 
         feedback.pushInfo(self.tr('Loading end points...'))

diff --git a/python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py b/python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py
@@ -204,7 +204,7 @@ def processAlgorithm(self, feedback):
 
         director.addStrategy(strategy)
         builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
-                                  iface.mapCanvas().hasCrsTransformEnabled(),
+                                  True,
                                   tolerance)
         feedback.pushInfo(self.tr('Building graph...'))
         snappedPoints = director.makeGraph(builder, [startPoint, endPoint])

diff --git a/src/app/openstreetmap/qgsosmdownloaddialog.cpp b/src/app/openstreetmap/qgsosmdownloaddialog.cpp
@@ -101,17 +101,14 @@ void QgsOSMDownloadDialog::onExtentCanvas()
 {
   QgsRectangle r( QgisApp::instance()->mapCanvas()->extent() );
 
-  if ( QgisApp::instance()->mapCanvas()->hasCrsTransformEnabled() )
-  {
-    QgsCoordinateReferenceSystem dst = QgsCoordinateReferenceSystem::fromSrsId( GEOCRS_ID );
+  QgsCoordinateReferenceSystem dst = QgsCoordinateReferenceSystem::fromSrsId( GEOCRS_ID );
 
-    QgsCoordinateTransform ct( QgisApp::instance()->mapCanvas()->mapSettings().destinationCrs(), dst );
-    r = ct.transformBoundingBox( r );
-    if ( !r.isFinite() )
-    {
-      QMessageBox::information( this, tr( "OpenStreetMap download" ), tr( "Could not transform canvas extent." ) );
-      return;
-    }
+  QgsCoordinateTransform ct( QgisApp::instance()->mapCanvas()->mapSettings().destinationCrs(), dst );
+  r = ct.transformBoundingBox( r );
+  if ( !r.isFinite() )
+  {
+    QMessageBox::information( this, tr( "OpenStreetMap download" ), tr( "Could not transform canvas extent." ) );
+    return;
   }
 
   setRect( r );