Browse Source

Merge branch 'dev' of ssh://git.csrichter.com:2222/~/git/gr-multirds into dev

merged qt gui update changes (processEvents call)
dev
Clemens Richter 9 years ago
parent
commit
de9a6f74e9
  1. 14
      python/tmc_parser.py

14
python/tmc_parser.py

@ -305,10 +305,18 @@ class tmc_parser_Widget(QtGui.QWidget):
filters=[{"type":"location", "str":lf},{"type":"event", "str":ef}] filters=[{"type":"location", "str":lf},{"type":"event", "str":ef}]
if tmc_dict.matchFilter(tmc_msg,self.showInvalid,filters): if tmc_dict.matchFilter(tmc_msg,self.showInvalid,filters):
print_dbg("a",end="") print_dbg("a",end="")
self.logOutput.append(Qt.QString.fromUtf8(tmc_msg.log_string())) logstr=Qt.QString.fromUtf8(tmc_msg.log_string())
print_dbg(".",end="")
self.logOutput.append(logstr)
QtGui.QApplication.processEvents()
print_dbg(".",end="")
print_dbg("a",end="") print_dbg("a",end="")
self.logOutput.append(Qt.QString.fromUtf8(tmc_msg.multi_str())) multistr=Qt.QString.fromUtf8(tmc_msg.multi_str())
print_dbg(".",end="")
self.logOutput.append(multistr)
print_dbg("a",end="") print_dbg("a",end="")
QtGui.QApplication.processEvents()
print_dbg(".",end="")
if auto_scroll: if auto_scroll:
#sb=self.logOutput.verticalScrollBar() #disabled 2017-04-28 might be cause of double free #sb=self.logOutput.verticalScrollBar() #disabled 2017-04-28 might be cause of double free
new_max=sb.maximum() new_max=sb.maximum()
@ -334,6 +342,7 @@ class tmc_parser_Widget(QtGui.QWidget):
code.interact(local=locals()) code.interact(local=locals())
print("read filters,",end="") print("read filters,",end="")
self.logOutput.clear() self.logOutput.clear()
QtGui.QApplication.processEvents()
print("cleared,",end="") print("cleared,",end="")
filters=[{"type":"location", "str":lf},{"type":"event", "str":ef}] filters=[{"type":"location", "str":lf},{"type":"event", "str":ef}]
#print("getting logstring with filters:%s, showInvalid:%i"%(filters,self.showInvalid)) #print("getting logstring with filters:%s, showInvalid:%i"%(filters,self.showInvalid))
@ -342,6 +351,7 @@ class tmc_parser_Widget(QtGui.QWidget):
print("got str,",end="") print("got str,",end="")
self.logOutput.append(Qt.QString.fromUtf8(logstr)) self.logOutput.append(Qt.QString.fromUtf8(logstr))
QtGui.QApplication.processEvents()
self.logMutex.release(1) self.logMutex.release(1)
print("appended,",end="") print("appended,",end="")
self.parser.dataLock.release(1) self.parser.dataLock.release(1)

Loading…
Cancel
Save