mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1788 from PySimpleGUI/Dev-latest 

Fix suggested by the Remi project so that multiple connections will w…
This commit is contained in:
MikeTheWatchGuy 2019-08-06 19:09:07 -04:00 committed by GitHub
parent ca019f1292 31fc5acb8a
commit f5eed75717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PySimpleGUIWeb/PySimpleGUIWeb.py
View File

@ -1,4 +1,6 @@
#usr/bin/python3 #usr/bin/python3
version = __version__ = "0.30.0.0 Unreleased"
import sys import sys
import types import types
import datetime import datetime
@ -3550,7 +3552,8 @@ class Window:
else: else:
self.window = userdata2 # type: Window self.window = userdata2 # type: Window
self.master_widget = None self.master_widget = None
self.window.App = self print("new App instance %s" % str(id(self)))
# self.window.App = self
Window.App = self Window.App = self
self.lines_shown = [] self.lines_shown = []
@ -3559,6 +3562,10 @@ class Window:
# print('res path', res_path) # print('res path', res_path)
super(Window.MyApp, self).__init__(*args, static_file_path={'C':'c:','c':'c:','D':'d:', 'd':'d:', 'E':'e:', 'e':'e:', 'dot':'.', '.':'.'}) super(Window.MyApp, self).__init__(*args, static_file_path={'C':'c:','c':'c:','D':'d:', 'd':'d:', 'E':'e:', 'e':'e:', 'dot':'.', '.':'.'})
def _instance(self):
remi.App._instance(self)
self.window.App = remi.server.clients[self.session]
def log_message(self, *args, **kwargs): def log_message(self, *args, **kwargs):
pass pass
@ -4090,9 +4097,9 @@ def BuildResultsForSubform(form, initialize_only, top_level_form):
element = element # type: Checkbox element = element # type: Checkbox
value = element.Widget.get_value() value = element.Widget.get_value()
elif element.Type == ELEM_TYPE_INPUT_RADIO: elif element.Type == ELEM_TYPE_INPUT_RADIO:
RadVar = element.TKIntVar.get() # RadVar = element.TKIntVar.get()
this_rowcol = EncodeRadioRowCol(row_num, col_num) # this_rowcol = EncodeRadioRowCol(row_num, col_num)
value = RadVar == this_rowcol value = False
elif element.Type == ELEM_TYPE_BUTTON: elif element.Type == ELEM_TYPE_BUTTON:
if top_level_form.LastButtonClicked == element.ButtonText: if top_level_form.LastButtonClicked == element.ButtonText:
button_pressed_text = top_level_form.LastButtonClicked button_pressed_text = top_level_form.LastButtonClicked
@ -4110,24 +4117,26 @@ def BuildResultsForSubform(form, initialize_only, top_level_form):
value = None value = None
elif element.Type == ELEM_TYPE_INPUT_COMBO: elif element.Type == ELEM_TYPE_INPUT_COMBO:
element = element # type: Combo element = element # type: Combo
value = element.Widget.get_value() value = element.DefaultValue
elif element.Type == ELEM_TYPE_INPUT_OPTION_MENU: elif element.Type == ELEM_TYPE_INPUT_OPTION_MENU:
value = element.TKStringVar.get() # value = element.TKStringVar.get()
value = None
elif element.Type == ELEM_TYPE_INPUT_LISTBOX: elif element.Type == ELEM_TYPE_INPUT_LISTBOX:
element = element # type: Listbox element = element # type: Listbox
value = element.Widget.get_value() value = element.DefaultValues
value = [value,] # value = [value,]
# items = element.TKListbox.curselection() # items = element.TKListbox.curselection()
# value = [element.Values[int(item)] for item in items] # value = [element.Values[int(item)] for item in items]
elif element.Type == ELEM_TYPE_INPUT_SPIN: elif element.Type == ELEM_TYPE_INPUT_SPIN:
element = element # type: Spin element = element # type: Spin
value = element.Widget.get_value() value = element.DefaultValue
# value = element.Widget.get_value()
elif element.Type == ELEM_TYPE_INPUT_SLIDER: elif element.Type == ELEM_TYPE_INPUT_SLIDER:
element = element # type: Slider element = element # type: Slider
value = element.Widget.get_value() value = element.DefaultValue
elif element.Type == ELEM_TYPE_INPUT_MULTILINE: elif element.Type == ELEM_TYPE_INPUT_MULTILINE:
element = element # type: Multiline element = element # type: Multiline
value = element.Widget.get_value() value = element.DefaultText
elif element.Type == ELEM_TYPE_TAB_GROUP: elif element.Type == ELEM_TYPE_TAB_GROUP:
try: try:
value = element.TKNotebook.tab(element.TKNotebook.index('current'))['text'] value = element.TKNotebook.tab(element.TKNotebook.index('current'))['text']