diff --git a/Application/Exporter.py b/Application/Exporter.py index 73f0a35..21af56e 100644 --- a/Application/Exporter.py +++ b/Application/Exporter.py @@ -41,7 +41,7 @@ class Exporter: start = time.time() for i, layer in enumerate(layers): - print(f"{i}/{len(layers)} {round(i/len(layers)*100,2)}% {round((time.time() - start)/(i+1), 2)}") + print(f"\r {i}/{len(layers)} {round(i/len(layers)*100,2)}% {round((time.time() - start)/(i+1), 2)}", end='\r') if len(layer.bounds[0]) == 0: continue diff --git a/Application/LayerFactory.py b/Application/LayerFactory.py index d1d3aeb..16d8c35 100644 --- a/Application/LayerFactory.py +++ b/Application/LayerFactory.py @@ -43,7 +43,7 @@ class LayerFactory: for frameNumber in sorted(data.keys()): contours = data[frameNumber] if frameNumber%5000 == 0: - print(f"{int(round(frameNumber/max(data.keys()), 2)*100)}% done with Layer extraction") + print("\r" + f" {int(round(frameNumber/max(data.keys()), 2)*100)}% done with Layer extraction", end='\r') tmp = [[frameNumber, contour] for contour in contours] #pool.map(self.getLayers, tmp) @@ -96,7 +96,7 @@ class LayerFactory: layers = self.sortLayers(foundLayerIDs) layer1 = layers[0] - for layerID in range(1, len(layers)): + for layerID in range(0, len(layers)): layer2 = layers[layerID] layer1 = self.merge2Layers(layer1, layer2)