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

"Fix" for Output Element scrolling issue (still a problem), SuperImage class addition, The new key handling that all ports now have, Output Element text defaults to black now

This commit is contained in:
MikeTheWatchGuy 2019-06-01 22:40:30 -04:00
parent 9b35531e2c
commit 97d374cfea
1 changed files with 96 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
PySimpleGUIWeb/PySimpleGUIWeb.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python3 #usr/bin/python3
import sys import sys
import types import types
import datetime import datetime
@ -1291,7 +1291,8 @@ class Output(Element):
:param key: :param key:
''' '''
bg = background_color if background_color else DEFAULT_INPUT_ELEMENTS_COLOR bg = background_color if background_color else DEFAULT_INPUT_ELEMENTS_COLOR
fg = text_color if text_color is not None else DEFAULT_INPUT_TEXT_COLOR # fg = text_color if text_color is not None else DEFAULT_INPUT_TEXT_COLOR
fg = text_color if text_color is not None else 'black' if DEFAULT_INPUT_TEXT_COLOR == COLOR_SYSTEM_DEFAULT else DEFAULT_INPUT_TEXT_COLOR
self.Disabled = disabled self.Disabled = disabled
self.Widget = None # type: remi.gui.TextInput self.Widget = None # type: remi.gui.TextInput
if size_px == (None, None) and size == (None, None): if size_px == (None, None) and size == (None, None):
@ -1716,6 +1717,55 @@ class SuperImage(remi.gui.Image):
headers = {'Content-type': self.mimetype if self.mimetype else 'application/octet-stream'} headers = {'Content-type': self.mimetype if self.mimetype else 'application/octet-stream'}
return [self.imagedata, headers] return [self.imagedata, headers]
class SuperImagenew(remi.gui.Image):
def __init__(self, file_path_name=None, **kwargs):
"""
This new app_instance variable is causing lots of problems. I do not know the value of the App
when I create this image.
:param app_instance:
:param file_path_name:
:param kwargs:
"""
# self.app_instance = app_instance
image = file_path_name
super(SuperImage, self).__init__(image, **kwargs)
self.imagedata = None
self.mimetype = None
self.encoding = None
if not image: return
self.load(image)
def load(self, file_path_name):
if type(file_path_name) is bytes or len(file_path_name) > 200:
self.imagedata = base64.b64decode(file_path_name)
else:
self.mimetype, self.encoding = mimetypes.guess_type(file_path_name)
with open(file_path_name, 'rb') as f:
self.imagedata = f.read()
self.refresh()
def refresh(self):
i = int(time.time() * 1e6)
# self.app_instance.execute_javascript("""
if Window.App is not None:
Window.App.execute_javascript("""
var url = '/%(id)s/get_image_data?update_index=%(frame_index)s';
var xhr = new XMLHttpRequest();
xhr.open('GET', url, true);
xhr.responseType = 'blob'
xhr.onload = function(e){
var urlCreator = window.URL || window.webkitURL;
var imageUrl = urlCreator.createObjectURL(this.response);
document.getElementById('%(id)s').src = imageUrl;
}
xhr.send();
""" % {'id': id(self), 'frame_index':i})
def get_image_data(self, update_index):
headers = {'Content-type': self.mimetype if self.mimetype else 'application/octet-stream'}
return [self.imagedata, headers]
# ---------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Graph # # Graph #
@ -2935,6 +2985,7 @@ class Window:
self.web_multiple_instance = web_multiple_instance self.web_multiple_instance = web_multiple_instance
self.MessageQueue = Queue() self.MessageQueue = Queue()
self.master_widget = None # type: remi.gui.VBox self.master_widget = None # type: remi.gui.VBox
self.UniqueKeyCounter = 0
if layout is not None: if layout is not None:
self.Layout(layout) self.Layout(layout)
@ -3259,24 +3310,39 @@ class Window:
def BuildKeyDict(self): def BuildKeyDict(self):
dict = {} dict = {}
self.AllKeysDict = self._BuildKeyDictForWindow(self, dict) self.AllKeysDict = self._BuildKeyDictForWindow(self,self, dict)
# print(f'keys built = {self.AllKeysDict}')
def _BuildKeyDictForWindow(self, window, key_dict): def _BuildKeyDictForWindow(self, top_window, window, key_dict):
for row_num, row in enumerate(window.Rows): for row_num, row in enumerate(window.Rows):
for col_num, element in enumerate(row): for col_num, element in enumerate(row):
if element.Type == ELEM_TYPE_COLUMN: if element.Type == ELEM_TYPE_COLUMN:
key_dict = self._BuildKeyDictForWindow(element, key_dict) key_dict = self._BuildKeyDictForWindow(top_window, element, key_dict)
if element.Type == ELEM_TYPE_FRAME: if element.Type == ELEM_TYPE_FRAME:
key_dict = self._BuildKeyDictForWindow(element, key_dict) key_dict = self._BuildKeyDictForWindow(top_window, element, key_dict)
if element.Type == ELEM_TYPE_TAB_GROUP: if element.Type == ELEM_TYPE_TAB_GROUP:
key_dict = self._BuildKeyDictForWindow(element, key_dict) key_dict = self._BuildKeyDictForWindow(top_window, element, key_dict)
if element.Type == ELEM_TYPE_TAB: if element.Type == ELEM_TYPE_TAB:
key_dict = self._BuildKeyDictForWindow(element, key_dict) key_dict = self._BuildKeyDictForWindow(top_window, element, key_dict)
if element.Key is None: # if no key has been assigned.... create one for input elements
if element.Type == ELEM_TYPE_BUTTON:
element.Key = element.ButtonText
if element.Type in (ELEM_TYPE_MENUBAR, ELEM_TYPE_BUTTONMENU, ELEM_TYPE_CANVAS,
ELEM_TYPE_INPUT_SLIDER, ELEM_TYPE_GRAPH, ELEM_TYPE_IMAGE,
ELEM_TYPE_INPUT_CHECKBOX, ELEM_TYPE_INPUT_LISTBOX, ELEM_TYPE_INPUT_COMBO,
ELEM_TYPE_INPUT_MULTILINE, ELEM_TYPE_INPUT_OPTION_MENU, ELEM_TYPE_INPUT_SPIN,
ELEM_TYPE_INPUT_TEXT):
element.Key = top_window.DictionaryKeyCounter
top_window.DictionaryKeyCounter += 1
if element.Key is not None: if element.Key is not None:
if element.Key in key_dict.keys():
print('*** Duplicate key found in your layout {} ***'.format(element.Key)) if element.Type != ELEM_TYPE_BUTTON else None
element.Key = element.Key + str(self.UniqueKeyCounter)
self.UniqueKeyCounter += 1
print('*** Replaced new key with {} ***'.format(element.Key)) if element.Type != ELEM_TYPE_BUTTON else None
key_dict[element.Key] = element key_dict[element.Key] = element
return key_dict return key_dict
def FindElementWithFocus(self): def FindElementWithFocus(self):
return self.FocusElement return self.FocusElement
# element = _FindElementWithFocusInSubForm(self) # element = _FindElementWithFocusInSubForm(self)
@ -3453,7 +3519,6 @@ class Window:
# s = remi.server.StandaloneServer(self.MyApp, width=1100, height=600) # s = remi.server.StandaloneServer(self.MyApp, width=1100, height=600)
# s.start() # s.start()
Window.port_number += 1 Window.port_number += 1
try: try:
remi.start(self.MyApp, remi.start(self.MyApp,
title=self.Title, title=self.Title,
@ -3474,7 +3539,6 @@ class Window:
self.MessageQueue.put(None) # if returned from start call, then the window has been destroyed and a None event should be generated self.MessageQueue.put(None) # if returned from start call, then the window has been destroyed and a None event should be generated
class MyApp(remi.App): class MyApp(remi.App):
def __init__(self,*args, userdata2=None): def __init__(self,*args, userdata2=None):
# self.window = window # type: Window # self.window = window # type: Window
@ -3486,6 +3550,8 @@ class Window:
self.window = userdata2 # type: Window self.window = userdata2 # type: Window
self.master_widget = None self.master_widget = None
self.window.App = self self.window.App = self
Window.App = self
self.lines_shown = []
if userdata2 is None: if userdata2 is None:
# res_path = os.path.dirname(os.path.abspath(__file__)) # res_path = os.path.dirname(os.path.abspath(__file__))
@ -3501,7 +3567,10 @@ class Window:
lines = Window.stdout_string_io.readlines() lines = Window.stdout_string_io.readlines()
# lines.reverse() # lines.reverse()
# self.window.OutputElementForStdOut.Widget.set_text("".join(lines)) # self.window.OutputElementForStdOut.Widget.set_text("".join(lines))
# self.window.OutputElementForStdOut.Update("".join(lines))
if lines != self.lines_shown:
self.window.OutputElementForStdOut.Update("".join(lines)) self.window.OutputElementForStdOut.Update("".join(lines))
self.lines_shown = lines
def main(self, name='world'): def main(self, name='world'):
# margin 0px auto allows to center the app to the screen # margin 0px auto allows to center the app to the screen
@ -3902,6 +3971,8 @@ def ColorChooserButton(button_text, target=(None, None), image_filename=None, im
##################################### ----- RESULTS ------ ################################################## ##################################### ----- RESULTS ------ ##################################################
def AddToReturnDictionary(form, element, value): def AddToReturnDictionary(form, element, value):
form.ReturnValuesDictionary[element.Key] = value
return
if element.Key is None: if element.Key is None:
form.ReturnValuesDictionary[form.DictionaryKeyCounter] = value form.ReturnValuesDictionary[form.DictionaryKeyCounter] = value
element.Key = form.DictionaryKeyCounter element.Key = form.DictionaryKeyCounter
@ -4563,6 +4634,10 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
# ------------------------- OPTION MENU (Like ComboBox but different) element ------------------------- # # ------------------------- OPTION MENU (Like ComboBox but different) element ------------------------- #
elif element_type == ELEM_TYPE_INPUT_OPTION_MENU: elif element_type == ELEM_TYPE_INPUT_OPTION_MENU:
element.Widget = remi.gui.FileUploader('./', width=200, height=30, margin='10px')
# element.Widget = remi.gui.FileFolderNavigator(False, r'a:\TEMP', True, False)
tk_row_frame.append(element.Widget)
pass pass
# ------------------------- LISTBOX element ------------------------- # # ------------------------- LISTBOX element ------------------------- #
elif element_type == ELEM_TYPE_INPUT_LISTBOX: elif element_type == ELEM_TYPE_INPUT_LISTBOX:
@ -5837,6 +5912,7 @@ def PopupScrolled(*args, button_color=None, yes_no=False, auto_close=False, auto
else: else:
form.AddRow(Text('', size=(pad, 1), auto_size_text=False), Button('OK', size=(5, 1), button_color=button_color)) form.AddRow(Text('', size=(pad, 1), auto_size_text=False), Button('OK', size=(5, 1), button_color=button_color))
button, values = form.Read() button, values = form.Read()
form.Close()
return button return button
@ -6999,11 +7075,13 @@ def main():
layout = [ layout = [
[Menu(menu_def, key='_MENU_', text_color='yellow', background_color='#475841', font='Courier 14')], [Menu(menu_def, key='_MENU_', text_color='yellow', background_color='#475841', font='Courier 14')],
# [T('123435', size=(1,8))], # [T('123435', size=(1,8))],
[Image(data=DEFAULT_BASE64_ICON)], # [OptionMenu([])],
[T('System platform = %s'%sys.platform)],
[Image(data=DEFAULT_BASE64_ICON, enable_events=True)],
[Text('PySimpleGUIWeb Welcomes You...', tooltip='text', font=('Comic sans ms', 20),size=(40,1), text_color='red', enable_events=True, key='_PySimpleGUIWeb_')], [Text('PySimpleGUIWeb Welcomes You...', tooltip='text', font=('Comic sans ms', 20),size=(40,1), text_color='red', enable_events=True, key='_PySimpleGUIWeb_')],
[T('Current Time '), Text('Text', key='_TEXT_', font='Arial 18', text_color='black', size=(30,1)), Column(col1, background_color='red')], [T('Current Time '), Text('Text', key='_TEXT_', font='Arial 18', text_color='black', size=(30,1)), Column(col1, background_color='red')],
[T('Up Time'), Text('Text', key='_TEXT_UPTIME_', font='Arial 18', text_color='black', size=(30,1))], [T('Up Time'), Text('Text', key='_TEXT_UPTIME_', font='Arial 18', text_color='black', size=(30,1))],
[Input('Single Line Input', do_not_clear=True, enable_events=False, size=(30, 1), text_color='red')], [Input('Single Line Input', do_not_clear=True, enable_events=False, size=(30, 1), text_color='red', key='_IN_')],
[Multiline('Multiline Input', do_not_clear=True, size=(40, 4), enable_events=True, key='_MULTI_IN_')], [Multiline('Multiline Input', do_not_clear=True, size=(40, 4), enable_events=True, key='_MULTI_IN_')],
[Output(size=(60,10))], [Output(size=(60,10))],
[MultilineOutput('Multiline Output', size=(80, 8), text_color='blue', font='Courier 12', key='_MULTIOUT_', autoscroll=True)], [MultilineOutput('Multiline Output', size=(80, 8), text_color='blue', font='Courier 12', key='_MULTIOUT_', autoscroll=True)],
@ -7037,6 +7115,10 @@ def main():
elif event == 'Values': elif event == 'Values':
window.Element('_MULTIOUT_').Update(str(values), append=True) window.Element('_MULTIOUT_').Update(str(values), append=True)
nav = remi.gui.FileFolderNavigator(False,r'a:\TEMP', True, False)
# here is returned the Input Dialog widget, and it will be shown
# fileselectionDialog.show(window.Element('_IN_').Widget)
elif event != TIMEOUT_KEY: elif event != TIMEOUT_KEY:
window.Element('_MULTIOUT_').Update('EVENT: ' + str(event), append=True) window.Element('_MULTIOUT_').Update('EVENT: ' + str(event), append=True)
if event == 'Popup': if event == 'Popup':