Merge branch 'fix-progress-percentage' into all-my-reqs

DrPleaseRespect · Sep 10, 2022 · b5d846d · b5d846d
2 parents 86c9990 + 7416fa2
commit b5d846d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Code/Implementations/EsrganNcnn.cs b/Code/Implementations/EsrganNcnn.cs
@@ -78,7 +78,15 @@ private static void OutputHandler(string line, bool error)
 
             Logger.Log("[NCNN] " + line.Replace("\n", " ").Replace("\r", " "));
 
-            if(error)
+            bool showTileProgress = Upscale.currentMode == Upscale.UpscaleMode.Preview || Upscale.currentMode == Upscale.UpscaleMode.Single;
+
+            if (showTileProgress && line.Trim().EndsWith("%"))
+            {
+                float percent = float.Parse(line.Replace("%", "").Replace(",", "."));
+                Program.mainForm.SetProgress(percent, $"Upscaling Tiles ({percent}%)");
+            }
+
+            if (error)
                 GeneralOutputHandler.HandleImpErrorMsgs(line, GeneralOutputHandler.ProcessType.Ncnn);
         }
     }

diff --git a/Code/Implementations/RealEsrganNcnn.cs b/Code/Implementations/RealEsrganNcnn.cs
@@ -90,7 +90,7 @@ private static void OutputHandler(string line, bool error)
 
             if (showTileProgress && line.Trim().EndsWith("%"))
             {
-                float percent = float.Parse(line.Replace("%", "").Replace(",", ".")) / 100f;
+                float percent = float.Parse(line.Replace("%", "").Replace(",", "."));
                 Program.mainForm.SetProgress(percent, $"Upscaling Tiles ({percent}%)");
             }