[GRASS] fixed overwrite existing output

blazek · blazek · commit 07fae8fe51b4 · 2015-10-20T11:19:20.000+02:00
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -630,13 +630,15 @@ void QgsGrassModule::run()
         if ( ret == QMessageBox::Cancel )
           return;
 
-        // r.mapcalc does not use standard parser
-        if ( typeid( *mOptions ) != typeid( QgsGrassMapcalc ) )
+#if GRASS_VERSION_MAJOR < 7
+        // r.mapcalc does not use standard parser (does not accept --o) in GRASS 6
+        if ( mXName != "r.mapcalc" )
         {
           arguments.append( "--o" );
-          //mProcess.addArgument( "--o" );
-          //command.append ( " --o" );
         }
+#else
+        arguments.append( "--o" );
+#endif
       }
     }
 
@@ -649,6 +651,7 @@ void QgsGrassModule::run()
     mViewButton->setEnabled( false );
 
     QStringList list = mOptions->arguments();
+    list << arguments;
 
     QStringList argumentsHtml;
     for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp
@@ -119,7 +119,9 @@ void QgsGrassModuleInputModel::onDirectoryChanged( const QString & path )
       watch( path + "/" + watchedDir );
     }
     // TODO: use db path defined in mapset VAR
+#if GRASS_VERSION_MAJOR >= 7
     watch( path + "/tgis/sqlite.db" );
+#endif
   }
   else // cellhd or vector dir
   {
@@ -209,7 +211,9 @@ void QgsGrassModuleInputModel::refreshMapset( QStandardItem *mapsetItem, const Q
   if ( types.isEmpty() )
   {
     types << QgsGrassObject::Raster << QgsGrassObject::Vector;
+#if GRASS_VERSION_MAJOR >= 7
     types << QgsGrassObject::Strds << QgsGrassObject::Stvds << QgsGrassObject::Str3ds;
+#endif
   }
   Q_FOREACH ( QgsGrassObject::Type type, types )
   {
@@ -304,7 +308,9 @@ void QgsGrassModuleInputModel::reload()
     {
       watch( dirPath + "/" + watchedDir );
     }
+#if GRASS_VERSION_MAJOR >= 7
     watch( dirPath + "/tgis/sqlite.db" );
+#endif
   }
 }
 
diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
@@ -274,7 +274,7 @@ void QgsGrassTools::runModule( QString name, bool direct )
 #ifdef Q_OS_WIN
     QgsGrass::putEnv( "GRASS_HTML_BROWSER", QgsGrassUtils::htmlBrowserPath() );
     QStringList env;
-    QByteArray origPath = qgetenv( "PATH" ); 
+    QByteArray origPath = qgetenv( "PATH" );
     QByteArray origPythonPath = qgetenv( "PYTHONPATH" );
     QString path = QString( origPath ) + QgsGrass::pathSeparator() + QgsGrass::grassModulesPaths().join( QgsGrass::pathSeparator() );
     QString pythonPath = QString( origPythonPath ) + QgsGrass::pathSeparator() + QgsGrass::getPythonPath();
@@ -303,7 +303,10 @@ void QgsGrassTools::runModule( QString name, bool direct )
   }
   else
   {
+    // set wait cursor because starting module may be slow because of getting temporal datasets (t.list)
+    QApplication::setOverrideCursor( Qt::WaitCursor );
     QgsGrassModule *gmod = new QgsGrassModule( this, name, mIface, direct, mTabWidget );
+    QApplication::restoreOverrideCursor();
     if ( !gmod->errors().isEmpty() )
     {
       QgsGrass::warning( gmod->errors().join( "\n" ) );
@@ -332,7 +335,6 @@ void QgsGrassTools::runModule( QString name, bool direct )
 
   // We must call resize to reset COLUMNS environment variable
   // used by bash !!!
-
 #if 0
   /* TODO: Implement something that resizes the terminal without
    *       crashes.
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -1486,6 +1486,7 @@ QStringList QgsGrass::grassObjects( const QgsGrassObject& mapsetObject, QgsGrass
   }
   else if ( type == QgsGrassObject::Strds || type == QgsGrassObject::Stvds || type == QgsGrassObject::Str3ds )
   {
+#if GRASS_VERSION_MAJOR >= 7
     QString cmd =  gisbase() + "/scripts/t.list";
     QStringList arguments;
 
@@ -1515,6 +1516,7 @@ QStringList QgsGrass::grassObjects( const QgsGrassObject& mapsetObject, QgsGrass
         }
       }
     }
+#endif
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -630,13 +630,15 @@ void QgsGrassModule::run()`
`630`	`630`	`if ( ret == QMessageBox::Cancel )`
`631`	`631`	`return;`
`632`	`632`
`633`		`- // r.mapcalc does not use standard parser`
`634`		`- if ( typeid( *mOptions ) != typeid( QgsGrassMapcalc ) )`
	`633`	`+#if GRASS_VERSION_MAJOR < 7`
	`634`	`+ // r.mapcalc does not use standard parser (does not accept --o) in GRASS 6`
	`635`	`+ if ( mXName != "r.mapcalc" )`
`635`	`636`	`{`
`636`	`637`	`arguments.append( "--o" );`
`637`		`- //mProcess.addArgument( "--o" );`
`638`		`- //command.append ( " --o" );`
`639`	`638`	`}`
	`639`	`+#else`
	`640`	`+ arguments.append( "--o" );`
	`641`	`+#endif`
`640`	`642`	`}`
`641`	`643`	`}`
`642`	`644`
`@@ -649,6 +651,7 @@ void QgsGrassModule::run()`
`649`	`651`	`mViewButton->setEnabled( false );`
`650`	`652`
`651`	`653`	`QStringList list = mOptions->arguments();`
	`654`	`+ list << arguments;`
`652`	`655`
`653`	`656`	`QStringList argumentsHtml;`
`654`	`657`	`for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,9 @@ void QgsGrassModuleInputModel::onDirectoryChanged( const QString & path )`
`119`	`119`	`watch( path + "/" + watchedDir );`
`120`	`120`	`}`
`121`	`121`	`// TODO: use db path defined in mapset VAR`
	`122`	`+#if GRASS_VERSION_MAJOR >= 7`
`122`	`123`	`watch( path + "/tgis/sqlite.db" );`
	`124`	`+#endif`
`123`	`125`	`}`
`124`	`126`	`else // cellhd or vector dir`
`125`	`127`	`{`
`@@ -209,7 +211,9 @@ void QgsGrassModuleInputModel::refreshMapset( QStandardItem *mapsetItem, const Q`
`209`	`211`	`if ( types.isEmpty() )`
`210`	`212`	`{`
`211`	`213`	`types << QgsGrassObject::Raster << QgsGrassObject::Vector;`
	`214`	`+#if GRASS_VERSION_MAJOR >= 7`
`212`	`215`	`types << QgsGrassObject::Strds << QgsGrassObject::Stvds << QgsGrassObject::Str3ds;`
	`216`	`+#endif`
`213`	`217`	`}`
`214`	`218`	`Q_FOREACH ( QgsGrassObject::Type type, types )`
`215`	`219`	`{`
`@@ -304,7 +308,9 @@ void QgsGrassModuleInputModel::reload()`
`304`	`308`	`{`
`305`	`309`	`watch( dirPath + "/" + watchedDir );`
`306`	`310`	`}`
	`311`	`+#if GRASS_VERSION_MAJOR >= 7`
`307`	`312`	`watch( dirPath + "/tgis/sqlite.db" );`
	`313`	`+#endif`
`308`	`314`	`}`
`309`	`315`	`}`
`310`	`316`
Original file line number	Diff line number	Diff line change
`@@ -1486,6 +1486,7 @@ QStringList QgsGrass::grassObjects( const QgsGrassObject& mapsetObject, QgsGrass`
`1486`	`1486`	`}`
`1487`	`1487`	`else if ( type == QgsGrassObject::Strds \|\| type == QgsGrassObject::Stvds \|\| type == QgsGrassObject::Str3ds )`
`1488`	`1488`	`{`
	`1489`	`+#if GRASS_VERSION_MAJOR >= 7`
`1489`	`1490`	`QString cmd = gisbase() + "/scripts/t.list";`
`1490`	`1491`	`QStringList arguments;`
`1491`	`1492`
`@@ -1515,6 +1516,7 @@ QStringList QgsGrass::grassObjects( const QgsGrassObject& mapsetObject, QgsGrass`
`1515`	`1516`	`}`
`1516`	`1517`	`}`
`1517`	`1518`	`}`
	`1519`	`+#endif`
`1518`	`1520`	`}`
`1519`	`1521`	`else`
`1520`	`1522`	`{`