[GRASS-SVN] r68816 - in grass/branches/releasebranch_7_2/gui/wxpython: gui_core modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-06-30 06:19:43 -0700 (Thu, 30 Jun 2016)
New Revision: 68816

Modified:
   grass/branches/releasebranch_7_2/gui/wxpython/gui_core/gselect.py
   grass/branches/releasebranch_7_2/gui/wxpython/modules/import_export.py
Log:
wxGUI: fix importing files from directory and fix adding multiple bands to display after import
       (merge r68796 from trunk)


Modified: grass/branches/releasebranch_7_2/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/gui_core/gselect.py	2016-06-30 12:57:21 UTC (rev 68815)
+++ grass/branches/releasebranch_7_2/gui/wxpython/gui_core/gselect.py	2016-06-30 13:19:43 UTC (rev 68816)
@@ -2142,7 +2142,7 @@
                         dsn, "%s") % self._getExtPatternGlob(ext)):
                     baseName = os.path.basename(filename)
                     grassName = GetValidLayerName(baseName.split('.', -1)[0])
-                    projectionMatch = hasRastSameProjAsLocation(dsn)
+                    projectionMatch = hasRastSameProjAsLocation(filename)
                     projectionMatchCaption = getProjMatchCaption(
                         projectionMatch)
                     listData.append(

Modified: grass/branches/releasebranch_7_2/gui/wxpython/modules/import_export.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/modules/import_export.py	2016-06-30 12:57:21 UTC (rev 68815)
+++ grass/branches/releasebranch_7_2/gui/wxpython/modules/import_export.py	2016-06-30 13:19:43 UTC (rev 68816)
@@ -430,11 +430,11 @@
             if nBands < 0:
                 GWarning(_("Unable to determine number of raster bands"),
                          parent=self)
-            nBands = 1
+                nBands = 1
 
             userData['nbands'] = nBands
             cmd = self.getSettingsPageCmd()
-            cmd.append('input=%s' % dsn)
+            cmd.append('input=%s' % idsn)
             cmd.append('output=%s' % output)
 
             if self.overwrite.IsChecked():