浏览代码

G_progress() does not support GRASS_MESSAGE_FORMAT=gui, fixes https://trac.osgeo.org/grass/ticket/2751

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@74449 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 6 年之前
父节点
当前提交
291b94a5be
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      lib/gis/percent.c

+ 6 - 4
lib/gis/percent.c

@@ -168,17 +168,19 @@ void G_progress(long n, int s)
 	return;
     
     if (n == s && n == 1) {
-	if (format != G_INFO_FORMAT_PLAIN)
-	    fprintf(stderr, "\r");
-	else
+	if (format == G_INFO_FORMAT_PLAIN)
 	    fprintf(stderr, "\n");
+        else if (format != G_INFO_FORMAT_GUI)
+	    fprintf(stderr, "\r");
 	return;
     }
 
     if (n % s == 0) {
 	if (format == G_INFO_FORMAT_PLAIN)
 	    fprintf(stderr, "%ld..", n);
-	else
+	else if (format == G_INFO_FORMAT_GUI)
+            fprintf(stderr, "GRASS_INFO_PROGRESS: %ld\n", n);
+        else
 	    fprintf(stderr, "%10ld\b\b\b\b\b\b\b\b\b\b", n);
     }
 }