[QGIS Commit] r10960 - trunk/qgis/src/plugins/grass

[svn_qgis at osgeo.org]

Author: rugginoso
Date: 2009-06-19 09:07:56 -0400 (Fri, 19 Jun 2009)
New Revision: 10960

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
Log:
Fixed #1364.
Changed the behavior of the file selection dialog.


Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2009-06-19 12:09:40 UTC (rev 10959)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2009-06-19 13:07:56 UTC (rev 10960)
@@ -19,6 +19,7 @@
 #include "qgsgrassselect.h"
 #include "qgsgrasstools.h"
 #include "qgsgrassprovider.h"
+#include "qgsgrassutils.h"
 #include "qgsgrass.h"
 
 #include "qgisinterface.h"
@@ -1498,8 +1499,14 @@
       if ( onlyLayer1 && layers[j].left( 1 ) != "1" )
         continue;
 
+      QStringList split = uri.split( '/',  QString::SkipEmptyParts );
+      QString layer = split.last();
+
+      QString name = QgsGrassUtils::vectorLayerName(
+                       map, layer, 1 );
+
       // TODO vector layer name
-      mIface->addVectorLayer( uri, layers[j], "grass" );
+      mIface->addVectorLayer( uri, name, "grass" );
     }
   }
 
@@ -3100,7 +3107,7 @@
 
   if ( fd->exec() == QDialog::Accepted )
   {
-    QString selectedFile = fd->selectedFiles().first();
+    QString selectedFile = fd->selectedFiles().last();
     QFileInfo fi = QFileInfo(selectedFile);
     currentDir = fi.absoluteDir();
     if (mType == Multiple)