Non-blocking reads!! Fix for listbox returning too few values
This commit is contained in:
parent
645482b3c6
commit
f92a592c0c
|
@ -2570,7 +2570,7 @@ class Window:
|
||||||
|
|
||||||
def Read(self, timeout=None, timeout_key=TIMEOUT_KEY):
|
def Read(self, timeout=None, timeout_key=TIMEOUT_KEY):
|
||||||
if timeout == 0: # timeout of zero runs the old readnonblocking
|
if timeout == 0: # timeout of zero runs the old readnonblocking
|
||||||
event, values = self.ReadNonBlocking()
|
event, values = self._ReadNonBlocking()
|
||||||
if event is None:
|
if event is None:
|
||||||
event = timeout_key
|
event = timeout_key
|
||||||
if values is None:
|
if values is None:
|
||||||
|
@ -2636,11 +2636,14 @@ class Window:
|
||||||
else:
|
else:
|
||||||
return self.ReturnValues
|
return self.ReturnValues
|
||||||
|
|
||||||
def ReadNonBlocking(self):
|
def _ReadNonBlocking(self):
|
||||||
if self.TKrootDestroyed:
|
if self.TKrootDestroyed:
|
||||||
return None, None
|
return None, None
|
||||||
if not self.Shown:
|
if not self.Shown:
|
||||||
self.Show(non_blocking=True)
|
self.Show(non_blocking=True)
|
||||||
|
else:
|
||||||
|
# self.QTWindow.show() ####### The thing that causes the window to be visible ######
|
||||||
|
print(self.QTApplication.processEvents())
|
||||||
if 0: # TODO add window closed with X logic
|
if 0: # TODO add window closed with X logic
|
||||||
self.TKrootDestroyed = True
|
self.TKrootDestroyed = True
|
||||||
_my_windows.Decrement()
|
_my_windows.Decrement()
|
||||||
|
@ -3267,7 +3270,7 @@ def BuildResultsForSubform(form, initialize_only, top_level_form):
|
||||||
value = 0
|
value = 0
|
||||||
elif element.Type == ELEM_TYPE_INPUT_LISTBOX:
|
elif element.Type == ELEM_TYPE_INPUT_LISTBOX:
|
||||||
try:
|
try:
|
||||||
value= [element.QT_ListWidget.currentItem().text(),]
|
value= [item.text() for item in element.QT_ListWidget.selectedItems()]
|
||||||
except:
|
except:
|
||||||
value = []
|
value = []
|
||||||
elif element.Type == ELEM_TYPE_INPUT_SPIN:
|
elif element.Type == ELEM_TYPE_INPUT_SPIN:
|
||||||
|
@ -3552,7 +3555,9 @@ def PackFormIntoFrame(window, containing_frame, toplevel_win):
|
||||||
element_pad = full_element_pad
|
element_pad = full_element_pad
|
||||||
# ------------------------- COLUMN element ------------------------- #
|
# ------------------------- COLUMN element ------------------------- #
|
||||||
if element_type == ELEM_TYPE_COLUMN:
|
if element_type == ELEM_TYPE_COLUMN:
|
||||||
column_widget = QWidget()
|
# column_widget = QWidget()
|
||||||
|
column_widget = QGroupBox()
|
||||||
|
# column_widget.setFrameShape(QtWidgets.QFrame.NoFrame)
|
||||||
|
|
||||||
style = ''
|
style = ''
|
||||||
if font is not None:
|
if font is not None:
|
||||||
|
@ -3560,14 +3565,21 @@ def PackFormIntoFrame(window, containing_frame, toplevel_win):
|
||||||
style += 'font-size: %spt;'%font[1]
|
style += 'font-size: %spt;'%font[1]
|
||||||
if element.BackgroundColor is not None:
|
if element.BackgroundColor is not None:
|
||||||
style += 'background-color: %s;' % element.BackgroundColor
|
style += 'background-color: %s;' % element.BackgroundColor
|
||||||
|
style += 'border: 0px solid gray; '
|
||||||
column_widget.setStyleSheet(style)
|
column_widget.setStyleSheet(style)
|
||||||
|
|
||||||
# print(style)
|
# print(style)
|
||||||
column_layout = QFormLayout()
|
column_layout = QFormLayout()
|
||||||
column_vbox = QVBoxLayout()
|
column_vbox = QVBoxLayout()
|
||||||
|
|
||||||
PackFormIntoFrame(element, column_layout, toplevel_win)
|
PackFormIntoFrame(element, column_layout, toplevel_win)
|
||||||
|
|
||||||
|
|
||||||
column_vbox.addLayout(column_layout)
|
column_vbox.addLayout(column_layout)
|
||||||
column_widget.setLayout(column_vbox)
|
column_widget.setLayout(column_vbox)
|
||||||
|
|
||||||
|
column_widget.setStyleSheet(style)
|
||||||
|
|
||||||
qt_row_layout.addWidget(column_widget)
|
qt_row_layout.addWidget(column_widget)
|
||||||
# ------------------------- TEXT element ------------------------- #
|
# ------------------------- TEXT element ------------------------- #
|
||||||
elif element_type == ELEM_TYPE_TEXT:
|
elif element_type == ELEM_TYPE_TEXT:
|
||||||
|
@ -4118,11 +4130,14 @@ def StartupTK(window):
|
||||||
if window.FocusElement is not None:
|
if window.FocusElement is not None:
|
||||||
window.FocusElement.setFocus()
|
window.FocusElement.setFocus()
|
||||||
|
|
||||||
window.QTWindow.show() ####### The thing that causes the window to be visible ######
|
if not window.NonBlocking:
|
||||||
|
window.QTWindow.show() ####### The thing that causes the window to be visible ######
|
||||||
|
window.QTApplication.exec_()
|
||||||
|
else:
|
||||||
|
window.QTWindow.show() ####### The thing that causes the window to be visible ######
|
||||||
|
window.QTApplication.processEvents()
|
||||||
|
|
||||||
|
|
||||||
window.QTApplication.exec_()
|
|
||||||
|
|
||||||
|
|
||||||
window.CurrentlyRunningMainloop = False
|
window.CurrentlyRunningMainloop = False
|
||||||
window.TimerCancelled = True
|
window.TimerCancelled = True
|
||||||
|
|
Loading…
Reference in New Issue