Dxf: possibility to export only the features overlapping the map extent

mhugent · mhugent · commit b1b7904e14f5 · 2013-12-10T16:00:58.000+01:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3846,7 +3846,14 @@ void QgisApp::dxfExport()
       {
         dxfExport.setMapUnits( r->mapUnits() );
       }
+
+      //extent
+      if ( d.exportMapExtent() )
+      {
+        dxfExport.setExtent( mapCanvas()->extent() );
+      }
     }
+
     QFile dxfFile( d.saveFile() );
     if ( dxfExport.writeToFile( &dxfFile ) == 0 )
     {
diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp
@@ -140,6 +140,11 @@ void QgsDxfExportDialog::setOkEnabled()
   btn->setEnabled( fi.absoluteDir().exists() );
 }
 
+bool QgsDxfExportDialog::exportMapExtent() const
+{
+  return mMapExtentCheckBox->isChecked();
+}
+
 void QgsDxfExportDialog::saveSettings()
 {
   QSettings s;
diff --git a/src/app/qgsdxfexportdialog.h b/src/app/qgsdxfexportdialog.h
@@ -32,6 +32,7 @@ class QgsDxfExportDialog: public QDialog, private Ui::QgsDxfExportDialogBase
     double symbologyScale() const;
     QgsDxfExport::SymbologyExport symbologyMode() const;
     QString saveFile() const;
+    bool exportMapExtent() const;
 
   public slots:
     /** change the selection of layers in the list */
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -565,9 +565,13 @@ void QgsDxfExport::writeEntities()
       renderer->stopRender( ctx );
     }
 
-
-    QgsFeatureIterator featureIt = vl->getFeatures( QgsFeatureRequest().setSubsetOfAttributes(
-                                     renderer->usedAttributes(), dp->fields() ) );
+    QgsFeatureRequest freq = QgsFeatureRequest().setSubsetOfAttributes(
+                               renderer->usedAttributes(), dp->fields() );
+    if ( !mExtent.isEmpty() )
+    {
+      freq.setFilterRect( mExtent );
+    }
+    QgsFeatureIterator featureIt = vl->getFeatures( freq );
     QgsFeature fet;
     while ( featureIt.nextFeature( fet ) )
     {
@@ -625,6 +629,10 @@ void QgsDxfExport::writeEntitiesSymbolLevels( QgsVectorLayer* layer )
     req.setFlags( QgsFeatureRequest::NoGeometry );
   }
   req.setSubsetOfAttributes( QStringList( renderer->usedAttributes() ), layer->pendingFields() );
+  if ( !mExtent.isEmpty() )
+  {
+    req.setFilterRect( mExtent );
+  }
   QgsFeatureIterator fit = layer->getFeatures( req );
 
   //fetch features
diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
@@ -56,6 +56,9 @@ class CORE_EXPORT QgsDxfExport
     void setSymbologyExport( SymbologyExport e ) { mSymbologyExport = e; }
     SymbologyExport symbologyExport() const { return mSymbologyExport; }
 
+    void setExtent( const QgsRectangle& r ) { mExtent = r; }
+    QgsRectangle extent() const { return mExtent; }
+
     //get closest entry in dxf palette
     static int closestColorMatch( QRgb pixel );
 
@@ -83,6 +86,8 @@ class CORE_EXPORT QgsDxfExport
   private:
 
     QList< QgsMapLayer* > mLayers;
+    /**Extent for export, only intersecting features are exported. If the extent is an empty rectangle, all features are exported*/
+    QgsRectangle mExtent;
     /**Scale for symbology export (used if symbols units are mm)*/
     double mSymbologyScaleDenominator;
     SymbologyExport mSymbologyExport;
diff --git a/src/ui/qgsdxfexportdialogbase.ui b/src/ui/qgsdxfexportdialogbase.ui
@@ -115,6 +115,13 @@
      </item>
     </layout>
    </item>
+   <item row="3" column="1">
+    <widget class="QCheckBox" name="mMapExtentCheckBox">
+     <property name="text">
+      <string>Export features intersecting the current map extent</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

Original file line number	Diff line number	Diff line change
`@@ -3846,7 +3846,14 @@ void QgisApp::dxfExport()`
`3846`	`3846`	`{`
`3847`	`3847`	`dxfExport.setMapUnits( r->mapUnits() );`
`3848`	`3848`	`}`
	`3849`	`+`
	`3850`	`+ //extent`
	`3851`	`+ if ( d.exportMapExtent() )`
	`3852`	`+ {`
	`3853`	`+ dxfExport.setExtent( mapCanvas()->extent() );`
	`3854`	`+ }`
`3849`	`3855`	`}`
	`3856`	`+`
`3850`	`3857`	`QFile dxfFile( d.saveFile() );`
`3851`	`3858`	`if ( dxfExport.writeToFile( &dxfFile ) == 0 )`
`3852`	`3859`	`{`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,11 @@ void QgsDxfExportDialog::setOkEnabled()`
`140`	`140`	`btn->setEnabled( fi.absoluteDir().exists() );`
`141`	`141`	`}`
`142`	`142`
	`143`	`+bool QgsDxfExportDialog::exportMapExtent() const`
	`144`	`+{`
	`145`	`+ return mMapExtentCheckBox->isChecked();`
	`146`	`+}`
	`147`	`+`
`143`	`148`	`void QgsDxfExportDialog::saveSettings()`
`144`	`149`	`{`
`145`	`150`	`QSettings s;`