list of input maps fixed

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5857 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 22, 2006 · 7c28470 · 7c28470
1 parent 2aa82c0
commit 7c28470
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -894,7 +894,10 @@ void QgsGrassMapcalc::updateMaps()
 	// Check if it is GRASS raster
 	QString source = QDir::cleanDirPath ( layer->source() ); 
 
-	QChar sep = QDir::separator();
+	// Note: QDir::cleanPath is using '/' also on Windows
+	//QChar sep = QDir::separator();
+	QChar sep = '/';
+
 	if ( source.contains( "cellhd" ) == 0 ) continue;
 
 	// Most probably GRASS layer, check GISBASE and LOCATION
@@ -910,8 +913,11 @@ void QgsGrassMapcalc::updateMaps()
 	QString mapset = split.last();
 	split.pop_back(); // mapset
 
-	QDir locDir ( sep + split.join ( QString(sep) ) ) ;
-	QString loc = locDir.canonicalPath();
+	//QDir locDir ( sep + split.join ( QString(sep) ) ) ;
+	//QString loc = locDir.canonicalPath();
+
+	QString loc =  source.remove ( QRegExp("/[^/]+/[^/]+/[^/]+$") );
+	loc = QDir(loc).canonicalPath();
 
 	QDir curlocDir ( QgsGrass::getDefaultGisdbase() + sep + QgsGrass::getDefaultLocation() );
 	QString curloc = curlocDir.canonicalPath();