fix vector save as

qgis · Jul 26, 2012 · fa277af · fa277af
1 parent 812a51e
commit fa277af
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -460,7 +460,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
     }
 
     // save as vector file
-    theMenu.addAction( tr( "Save As..." ), QgisApp::instance(), SLOT( saveAsVectorFile() ) );
+    theMenu.addAction( tr( "Save As..." ), QgisApp::instance(), SLOT( saveAsFile() ) );
 
     // save selection as vector file
     QAction* saveSelectionAsAction = theMenu.addAction( tr( "Save Selection As..." ), QgisApp::instance(), SLOT( saveSelectionAsVectorFile() ) );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3909,16 +3909,18 @@ void QgisApp::saveAsRasterFile()
 void QgisApp::saveAsFile()
 {
   QgsMapLayer* layer = activeLayer();
-  if ( layer )
-  {
-    QgsMapLayer::LayerType layerType = layer->type();
-    if ( layerType == QgsMapLayer::RasterLayer )
-    {
-      saveAsRasterFile();
-    }
+  if ( !layer )
     return;
+
+  QgsMapLayer::LayerType layerType = layer->type();
+  if ( layerType == QgsMapLayer::RasterLayer )
+  {
+    saveAsRasterFile();
+  }
+  else if ( layerType == QgsMapLayer::VectorLayer )
+  {
+    saveAsVectorFileGeneral( false );
   }
-  saveAsVectorFileGeneral( false );
 }
 
 void QgisApp::saveSelectionAsVectorFile()

diff --git a/src/core/qgsrasterdataprovider.cpp b/src/core/qgsrasterdataprovider.cpp
@@ -22,7 +22,8 @@
 #include <QTime>
 #include <QMap>
 #include <QByteArray>
-#include <qmath>
+
+#include <qmath.h>
 
 void QgsRasterDataProvider::readBlock( int bandNo, QgsRectangle
                                        const & viewExtent, int width,