better error message

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5109 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 29, 2006 · 6bde5e0 · 6bde5e0
1 parent c84a078
commit 6bde5e0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/plugins/grass/qgsgrassbrowser.cpp b/src/plugins/grass/qgsgrassbrowser.cpp
@@ -219,6 +219,11 @@ void QgsGrassBrowser::doubleClicked(const QModelIndex & index)
     addMap();
 }
 
+QString QgsGrassBrowser::formatMessage( QString msg )
+{
+    return msg.replace("<","&lt;").replace(">","&gt;").replace("\n","<br>");
+}
+
 void QgsGrassBrowser::copyMap()
 {
     #ifdef QGISDEBUG
@@ -274,14 +279,17 @@ void QgsGrassBrowser::copyMap()
 	module.append(".exe");
 #endif
         QProcess process(this);
-        process.start(module, QStringList( typeName + "=" + map + "@" + mapset + "," + newName ) );
+        QStringList args(typeName + "=" + map + "@" + mapset + "," + newName );
+        process.start(module, args );
         if ( !process.waitForFinished() || process.exitCode() != 0 )
         {
             QString output ( process.readAllStandardOutput () );
             QString error ( process.readAllStandardError () );
             QMessageBox::warning( 0, "Warning", "Cannot copy map "
-              + map + "@" + mapset + "<br>" + output.replace("\n","<br>")
-                                   + "<br>" + error.replace("\n","<br>") ); 
+                       + map + "@" + mapset 
+                       + "<br>command: " + module + " " + args.join(" ")
+                       + "<br>" + formatMessage(output)
+                       + "<br>" + formatMessage(error) ); 
         }
         else
         {
@@ -337,14 +345,17 @@ void QgsGrassBrowser::renameMap()
 	module.append(".exe");
 #endif
         QProcess process(this);
+        QStringList args(typeName + "=" + map + "," + newName );
         process.start(module, QStringList( typeName + "=" + map + "," + newName ) );
         if ( !process.waitForFinished() || process.exitCode() != 0 )
         {
             QString output ( process.readAllStandardOutput () );
             QString error ( process.readAllStandardError () );
             QMessageBox::warning( 0, "Warning", "Cannot rename map "
-              	             + map + "<br>" + output.replace("\n","<br>")
-                                   + "<br>" + error.replace("\n","<br>") ); 
+                       + map  
+                       + "<br>command: " + module + " " + args.join(" ")
+                       + "<br>" + formatMessage(output)
+                       + "<br>" + formatMessage(error) ); 
         }
         else
         {
@@ -389,14 +400,17 @@ void QgsGrassBrowser::deleteMap()
 	module.append(".exe");
 #endif
         QProcess process(this);
+        QStringList args(typeName + "=" + map );
         process.start(module, QStringList( typeName + "=" + map ) );
         if ( !process.waitForFinished() || process.exitCode() != 0 )
         {
             QString output ( process.readAllStandardOutput () );
             QString error ( process.readAllStandardError () );
             QMessageBox::warning( 0, "Warning", "Cannot delete map "
-                             + map + "<br>" + output.replace("\n","<br>")
-                                   + "<br>" + error.replace("\n","<br>") ); 
+                       + map  
+                       + "<br>command: " + module + " " + args.join(" ")
+                       + "<br>" + formatMessage(output)
+                       + "<br>" + formatMessage(error) ); 
         }
         else
         {

diff --git a/src/plugins/grass/qgsgrassbrowser.h b/src/plugins/grass/qgsgrassbrowser.h
@@ -101,6 +101,9 @@ public slots:
     QAction *mActionRenameMap;
     QAction *mActionSetRegion;
     QAction *mActionRefresh;
+
+    //! Escape HTML tags and convert \n to <br> 
+    QString formatMessage ( QString msg );
 };
 
 #endif // QGSGRASSBROWSER_H