Добавлено отображение бесконечного прогрессбара для каждой задачи

master3.3
Mike khiretskiy 10 years ago
parent 7491c0109b
commit 1c6fe19814

@ -271,12 +271,17 @@ class MainFrameRes(QtGui.QWidget):
# add normal message label
lbl_temp = LabelWordWrap(item.message, self, mono=mono)
lbl_temp.setMinimumHeight(lbl_temp.minimumSizeHint().height())
lbl_temp.setMaximumHeight(lbl_temp.minimumSizeHint().height())
if mono:
lbl_temp.setMinimumHeight(lbl_temp.minimumSizeHint().height())
lbl_temp.setMaximumHeight(lbl_temp.sizeHint().height())
else:
lbl_temp.setMinimumHeight(lbl_temp.minimumSizeHint().height())
#lbl_temp.setMaximumHeight(lbl_temp.minimumSizeHint().height())
lbl_temp.setMaximumHeight(lbl_temp.sizeHint().height())
self.work_layout._addWidget(lbl_temp)
self.initUI()
#self._parent.main_frame.verticalScrollBar().setSliderPosition \
# (self._parent.main_frame.verticalScrollBar().maximum())
self._parent.main_frame.verticalScrollBar().setSliderPosition \
(self._parent.main_frame.verticalScrollBar().maximum())
def show_error(self, message):
# add error message label
@ -317,14 +322,17 @@ class MainFrameRes(QtGui.QWidget):
def startTask(self, item):
if self.progress_list:
self.progress_list[len(self.progress_list)-1].hide()
self.progress_list[-1].hide()
task_widget = TaskWidget(item.message, self)
self.task_list.append(task_widget)
self.work_layout._addWidget(task_widget)
self.add_Progress()
self.initUI()
def endTask(self, item, set_res = True):
if self.progress_list:
self.progress_list[-1].hide()
if set_res:
if hasattr(item,"result") and not item.result is None:
self.set_result_task(not item.result)
@ -638,9 +646,7 @@ class MainFrameRes(QtGui.QWidget):
self.get_Frame(sid, pid, def_end_frame = end_frame)
def get_Progress(self, sid, pid, id):
""" get progress for the current job """
def add_Progress(self):
progressBar = QtGui.QProgressBar()
progressBar.setMinimumHeight(progressBar.sizeHint().height())
progressBar.setTextVisible(True)
@ -650,6 +656,20 @@ class MainFrameRes(QtGui.QWidget):
progressBar.setMinimum(0)
progressBar.setMaximum(0)
self.initUI()
return progressBar
def get_Progress(self, sid, pid, id):
""" get progress for the current job """
#if self.progress_list and self.progress_list[-1].isVisible():
if self.progress_list:
progressBar = self.progress_list[-1]
else:
progressBar = self.add_Progress()
#else:
# progressBar = self.add_Progress()
#if self.progress_list:
# self.progress_list[-1].hide()
temp_progress = -1
# Call server method
if hasattr (self, 'get_Progress_thread'):

Loading…
Cancel
Save