added webserver and ui for editable toml config

7 years ago · 35efd69424
parent c7284b6149
commit 35efd69424
29 changed files with 149 additions and 18 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/notiframe/NotiFrame.py
+++ b/notiframe/NotiFrame.py
@ -45,11 +45,11 @@ config2 = {'resWidth': 640,  'resHeight': 384, 'cellsWidth': 3, 'cellsHeight': 3
 ]}
 #print(toml.dumps(config))
-print(config)
+#print(config)
-print(config2)
+#print(config2)
-cwidth = int(round(config['resWidth']/config['cellsWidth']))
+cwidth = int(round(int(config['resWidth'])/int(config['cellsWidth'])))
-cheight = int(round(config['resHeight']/config['cellsHeight']))
+cheight = int(round(int(config['resHeight'])/int(config['cellsHeight'])))
 image_yellow = Image.new('1', (config['resWidth'], config['resHeight']), 255)    # 255: clear the frame
 draw_yellow = ImageDraw.Draw(image_yellow)
@ -91,18 +91,18 @@ def drawWidget(w):
    image_yellow.paste(w.image_yellow, (coordX, coordY))
 def render(index):
-	if index is not 0:
+    if index is not 0:
 		for widg in widgetList:
 			widg.updateWidget()
-	draw_black.rectangle(xy=((0,0), image_black.size), fill=255)
+    draw_black.rectangle(xy=((0,0), image_black.size), fill=255)
-	draw_yellow.rectangle(xy=((0,0), image_yellow.size), fill=255)
+    draw_yellow.rectangle(xy=((0,0), image_yellow.size), fill=255)
-	for widg in widgetList:
+    for widg in widgetList:
-		drawWidget(widg)
+        drawWidget(widg)
-	if not testMode:
+    if not testMode:
-		epd.display_frame(epd.get_frame_buffer(image_black),epd.get_frame_buffer(image_yellow))
+        epd.display_frame(epd.get_frame_buffer(image_black),epd.get_frame_buffer(image_yellow))
-	else:
+    else:
-		image_black.save(os.path.join(mydir, 'test/imgBlack.bmp'))
+        image_black.save(os.path.join(mydir, 'test/imgBlack.bmp'))
-		image_yellow.save(os.path.join(mydir, 'test/imgYellow.bmp'))
+        image_yellow.save(os.path.join(mydir, 'test/imgYellow.bmp'))
 widgetList = initWidgets()
 i = 0
--- a/notiframe/config.toml
+++ b/notiframe/config.toml
@ -1,16 +1,16 @@
 cellsHeight = 3
 resHeight = 384
 cellsHeight = 3
 resWidth = 640
 cellsWidth = 3
 [[widgets]]
 bwStyle = "mono"
 filename = "forest.jpg"
 width = 3
 posX = 0
 posY = 0
 scaleMode = "fill"
 bwStyle = "mono"
 type = "image"
 filename = "forest.jpg"
 height = 3
 type = "image"
 [[widgets]]
 list = "Plans"
@ -38,3 +38,4 @@ board = "Organisation"
 posX = 1
 posY = 2
 type = "trello"
--- a/notiframe/drivers/init.py
+++ b/notiframe/drivers/init.py
--- a/notiframe/drivers/epd7in5b.py
+++ b/notiframe/drivers/epd7in5b.py
--- a/notiframe/drivers/epdif.py
+++ b/notiframe/drivers/epdif.py
--- a/notiframe/test/card_image.bmp
+++ b/notiframe/test/card_image.bmp
--- a/notiframe/test/greyscale.bmp
+++ b/notiframe/test/greyscale.bmp
--- a/notiframe/test/imgBlack.bmp
+++ b/notiframe/test/imgBlack.bmp
--- a/notiframe/test/imgBlackWidget.bmp
+++ b/notiframe/test/imgBlackWidget.bmp
--- a/notiframe/test/imgYellow.bmp
+++ b/notiframe/test/imgYellow.bmp
--- a/notiframe/test/imgYellowWidget.bmp
+++ b/notiframe/test/imgYellowWidget.bmp
--- a/notiframe/test/mask.bmp
+++ b/notiframe/test/mask.bmp
--- a/notiframe/webserver/templates/home.html
+++ b/notiframe/webserver/templates/home.html
@ -0,0 +1,33 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link href="/style.css" rel="stylesheet" type="text/css" media="all">
 </head>
 <body>
 	<div>
 		<form action="/home" method="post">
 		{% for n in range(widgLists| length) %}
 		<h4>Widget {{n}}</h4>
 			{% for key, value in widgLists[n].iteritems() %}
 				{{key}}: <input type="text" name="{{key}}{{n}}" value="{{value}}">
 				<br>
 			{% endfor %}
 			<br>
 		{% endfor %}
 		<h4>System Settings</h4>
 		{% for key, value in sysList.iteritems() %}
 			{{key}}: <input type="text" name="{{key}}" value="{{value}}">
 			<br>
 			{% endfor %}
 		<br>
 		<input type="submit" value="Submit">
 		</form>
 	</div>
 </body>
 </html>
--- a/notiframe/webserver/templates/style.css
+++ b/notiframe/webserver/templates/style.css
--- a/notiframe/webserver/webserver.py
+++ b/notiframe/webserver/webserver.py
@ -0,0 +1,97 @@
 from flask import Flask, render_template, request, redirect, url_for
 import toml
 import os
 app = Flask(__name__)
 mydir = os.path.dirname(os.path.abspath(__file__))
 #print(mydir)
 mydir = os.path.join(mydir, '../')
 #print(mydir)
 essentials = {'type': None, 'height': None, 'width': None, 'posX': None, 'posY': None}
 trello_options = {'board': None, 'list': None}
 image_options = {'filename': None, 'scaleMode': None, 'bwStyle': None}
 def convert(input):
    if isinstance(input, dict):
        return dict((convert(key), convert(value)) for key, value in input.iteritems())
    elif isinstance(input, list):
        return [convert(element) for element in input]
    elif isinstance(input, unicode):
        return input.encode('utf-8')
    else:
        return input
 #HOMEPAGE
@app.route('/home', methods=['GET', 'POST'])
 def home():
 	config = read_config()
 	widgLists, sysList = prep_dict_for_web(config)
 	if request.method == 'POST':
 		#update system variables
 		for key in sysList:
 			if request.form[key]:
 				if isInt(request.form[key]):
 					#print(request.form[key] + " is int")
 					sysList[key] = int(request.form[key])
 				else:
 					sysList[key] = request.form[key]
 		#update widget variables
 		#for i in range(len(widgLists)):
 		#	for key in widgLists[i]:
 		#		if request.form[key+str(i)]:
 		#			widgLists[i][key] = request.form[key+str(i)]
 		for i in range(len(widgLists)):
 			for key in widgLists[i]:
 				#print(request.form[key+str(i)])
 				if isInt(request.form[key+str(i)]):
 					#print(request.form[key+str(i)] + " is int")
 					widgLists[i][key] = int(request.form[key+str(i)])
 				else:
 					widgLists[i][key] = request.form[key+str(i)]
 		#print(widgLists)
 		#print(sysList)
 		update_config(widgLists, sysList)
 	return render_template('home.html', title='Overview', widgLists=widgLists, sysList=sysList)
 def isInt(s):
    try: 
        int(s)
        return True
    except ValueError:
        return False
 def prep_dict_for_web(config):
 	widgLists = config['widgets'] #list of dicts
 	sysList = {} #dict
 	for key in config:
 		if key != 'widgets':
 			sysList[key] = config[key]
 	return widgLists, sysList
 def read_config():
 	uni_config = toml.load(os.path.join(mydir, 'config.toml'))
 	config = convert(uni_config)
 	#print(config)
 	#config = {'widgets': [
 	#{'width': 3, 'posX': 0, 'posY': 0, 'scaleMode': 'fill', 'bwStyle': 'mono', 'type': 'image', 'filename': 'forest.jpg', 'height': 3}, 
 	#{'list': 'Plans', 'height': 3, 'width': 1, 'board': 'Organisation', 'posX': 0, 'posY': 0, 'type': 'trello'}, 
 	#{'list': 'To Do:', 'height': 3, 'width': 2, 'board': 'E-paper', 'posX': 1, 'posY': 0, 'type': 'trello'}
 	#], 'cellsHeight': 3, 'resHeight': 384, 'resWidth': 640, 'cellsWidth': 3}
 	return config
 def update_config(widgLists, sysList):
 	config = {'widgets': widgLists}
 	for key in sysList:
 		config[key] = sysList[key]
 	convert(config)
 	path = os.path.join(mydir, 'config.toml')
 	with open(path, "w+") as config_file:
        	config_file.write(toml.dumps(config))
 if __name__ == '__main__':
    app.run(debug=True,host='0.0.0.0')
--- a/notiframe/widgets/init.py
+++ b/notiframe/widgets/init.py
--- a/notiframe/widgets/resources/fonts/DejaVuSans.ttf
+++ b/notiframe/widgets/resources/fonts/DejaVuSans.ttf
--- a/notiframe/widgets/resources/fonts/DejaVuSansMono.ttf
+++ b/notiframe/widgets/resources/fonts/DejaVuSansMono.ttf
--- a/notiframe/widgets/resources/fonts/FreeMonoBold.ttf
+++ b/notiframe/widgets/resources/fonts/FreeMonoBold.ttf
--- a/notiframe/widgets/resources/images/calvin.jpg
+++ b/notiframe/widgets/resources/images/calvin.jpg
--- a/notiframe/widgets/resources/images/folk.png
+++ b/notiframe/widgets/resources/images/folk.png
--- a/notiframe/widgets/resources/images/forest.jpg
+++ b/notiframe/widgets/resources/images/forest.jpg
--- a/notiframe/widgets/resources/images/leaves.jpg
+++ b/notiframe/widgets/resources/images/leaves.jpg
--- a/notiframe/widgets/resources/images/onyxbook.jpg
+++ b/notiframe/widgets/resources/images/onyxbook.jpg
--- a/notiframe/widgets/resources/images/staff.png
+++ b/notiframe/widgets/resources/images/staff.png
--- a/notiframe/widgets/resources/images/steps.jpg
+++ b/notiframe/widgets/resources/images/steps.jpg
--- a/notiframe/widgets/widget.py
+++ b/notiframe/widgets/widget.py
--- a/readme.md
+++ b/readme.md