The precision (digits after decimal point) is now adjusted automatically

Author: eisneinechse

src/windows/export.py

@@ -29,6 +29,7 @@
 import os
 import time
 import tempfile
+import math
 
 import openshot
 
@@ -906,19 +907,27 @@ def accept(self):
             start_frame_export = video_settings.get("start_frame")
             end_frame_export = video_settings.get("end_frame")
             last_exported_time = time.time()
+            old_part = 0.0
+            new_part = 0.0
+            afterpoint = 1
             # Precision of the progress bar
             progress_format = "%4.1f%% "
             # Write each frame in the selected range
             for frame in range(video_settings.get("start_frame"), video_settings.get("end_frame") + 1):
                 # Update progress bar (emit signal to main window)
                 end_time_export = time.time()
                 if ((frame % progressstep) == 0) or ((end_time_export - last_exported_time) > 1):
-                    if (end_time_export - last_exported_time) > 5:
-                        progress_format = "%4.4f%% "
-                    elif (end_time_export - last_exported_time) > 1:
-                        progress_format = "%4.2f%% "
+                    new_part = (frame - start_frame_export) * 1.0  / (end_frame_export - start_frame_export)
+                    if ((new_part - old_part) > 0.0):
+                        afterpoint = math.ceil( -2.0 - math.log10( new_part - old_part ))
                     else:
-                        progress_format = "%4.1f%% "
+                        afterpoint = 1
+                    if afterpoint < 1:
+                        afterpoint = 1
+                    if afterpoint > 5:
+                        afterpoint = 5
+                    old_part = new_part
+                    progress_format = "%4." + str(afterpoint) + "f%% "
                     last_exported_time = time.time()
                     if ((( frame - start_frame_export ) != 0) & (( end_time_export - start_time_export ) != 0)):
                         seconds_left = round(( start_time_export - end_time_export )*( frame - end_frame_export )/( frame - start_frame_export ))

src/windows/main_window.py

@@ -95,7 +95,7 @@ class MainWindow(QMainWindow, updates.UpdateWatcher):
     WaveformReady = pyqtSignal(str, list)
     TransformSignal = pyqtSignal(str)
     ExportStarted = pyqtSignal(str, int, int)
-    ExportFrame = pyqtSignal(str, int, int, int,str)
+    ExportFrame = pyqtSignal(str, int, int, int, str)
     ExportEnded = pyqtSignal(str)
     MaxSizeChanged = pyqtSignal(object)
     InsertKeyframe = pyqtSignal(object)