Commit 6b60401e authored by sumpfralle's avatar sumpfralle

fixed counting of multiple progress steps


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1227 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent 51b910d9
...@@ -100,7 +100,7 @@ class ProgressGTK(object): ...@@ -100,7 +100,7 @@ class ProgressGTK(object):
self._multi_base_text = base_text self._multi_base_text = base_text
else: else:
self._multi_base_text = "" self._multi_base_text = ""
self._multi_counter = 1 self._multi_counter = 0
if count > 1: if count > 1:
self._multi_maximum = count self._multi_maximum = count
self.update_multiple(increment=False) self.update_multiple(increment=False)
...@@ -116,10 +116,10 @@ class ProgressGTK(object): ...@@ -116,10 +116,10 @@ class ProgressGTK(object):
self._multi_counter += 1 self._multi_counter += 1
self._progress_bar.set_fraction(0) self._progress_bar.set_fraction(0)
if self._multi_base_text: if self._multi_base_text:
text = "%s %d/%d" % (self._multi_base_text, self._multi_counter, text = "%s %d/%d" % (self._multi_base_text,
self._multi_maximum) self._multi_counter + 1, self._multi_maximum)
else: else:
text = "%d/%d" % (self._multi_counter, self._multi_maximum) text = "%d/%d" % (self._multi_counter + 1, self._multi_maximum)
self._multi_widget.set_text(text) self._multi_widget.set_text(text)
self._multi_widget.set_fraction(min(1.0, self._multi_widget.set_fraction(min(1.0,
float(self._multi_counter) / self._multi_maximum)) float(self._multi_counter) / self._multi_maximum))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment