bofh/baroness
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Gui: take settings from settings file, show pictures of drinks

Browse Source
This commit is contained in:
Bernhard Stampfer
2016-03-26 21:01:47 +01:00
parent d7e2a0d29d
commit 8469f00884
7 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
app/gui.py
View File

@@ -1,26 +1,33 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import wx import wx
import wx.lib.buttons
import wx.lib.platebtn
from plot import * from plot import *
from database import * from database import *
from settings import *
import flask as fla import flask as fla
class MainWindow(wx.Frame): class MainWindow(wx.Frame):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(MainWindow, self).__init__(*args, **kwargs) super(MainWindow, self).__init__(*args, **kwargs)
self.init_ui()
def init_ui(self):
self.SetSize((480, 320))
self.SetTitle('Baroness Control')
self.panelStart = PanelStart(self) self.panelStart = PanelStart(self)
self.panelDrinks = PanelDrinks(self) self.panelDrinks = PanelDrinks(self)
self.panelUsers = PanelUsers(self) self.panelUsers = PanelUsers(self)
self.panelThanks = PanelThanks(self) self.panelThanks = PanelThanks(self)
self.panelSorry = PanelSorry(self) self.panelSorry = PanelSorry(self)
self.settings = Settings()
self.user = User() self.user = User()
self.drinkl = str()
self.active = 0
self.init_ui()
def init_ui(self):
self.SetSize((480, 320))
self.SetTitle('Baroness Control')
self.active = 0 self.active = 0
self.switchPanels() self.switchPanels()
@@ -38,6 +45,9 @@ class MainWindow(wx.Frame):
return self.user.id return self.user.id
# return self.user # return self.user
def getDrink(self):
return self.drink
def onExit(self, e=None): def onExit(self, e=None):
self.active = 0 self.active = 0
self.switchPanels() self.switchPanels()
@@ -56,8 +66,8 @@ class MainWindow(wx.Frame):
def onProduct(self, e): def onProduct(self, e):
self.active = 3 self.active = 3
print self.user.longname + ' consumes' print self.user.longname + ' consumes'
buttonl = e.GetEventObject().GetLabelText() self.drinkl = e.GetEventObject().GetLabelText()
drink = get_product_by_name(buttonl.split('\n')[0]).id drink = get_product_by_name(self.drinkl.split('\n')[0]).id
with app.app_context(): with app.app_context():
for i in range(0, int(self.panelDrinks.GetAmount())): for i in range(0, int(self.panelDrinks.GetAmount())):
add_consume(self.user.name, drink) add_consume(self.user.name, drink)
@@ -73,12 +83,19 @@ class MainWindow(wx.Frame):
if self.active == 0: if self.active == 0:
self.panelStart.Show() self.panelStart.Show()
elif self.active == 1: elif self.active == 1:
if not settings.onlyOneDrink:
self.panelDrinks.l_amount.SetLabel("%02d" % 1)
self.panelDrinks.l_user.SetLabel(self.user.longname) self.panelDrinks.l_user.SetLabel(self.user.longname)
self.panelDrinks.Show() self.panelDrinks.Show()
elif self.active == 2: elif self.active == 2:
self.panelUsers.Show() self.panelUsers.Show()
elif self.active == 3: elif self.active == 3:
self.panelThanks.label_1.SetLabel(self.user.longname) self.panelThanks.label_1.SetLabel(self.user.longname + "\n" + "%02d x " % int(self.panelDrinks.GetAmount()) + self.drinkl.split('\n')[0])
self.panelThanks.label_1.Wrap(340)
try:
self.panelThanks.bitmap_2.SetBitmap(wx.Bitmap("./app/static/product_%s.png" % self.drinkl.split('\n')[0], wx.BITMAP_TYPE_ANY))
except:
print "no picture for drink:", self.drinkl.split('\n')
self.panelThanks.Show() self.panelThanks.Show()
self.delayExit() self.delayExit()
elif self.active == 4: elif self.active == 4:
@@ -92,8 +109,9 @@ class PanelStart (wx.Panel):
wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=(0, 0), size=(480, 320)) wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=(0, 0), size=(480, 320))
#panel = wx.Panel(self, -1) #panel = wx.Panel(self, -1)
self.bitmap_1 = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap("./gui/start.png", wx.BITMAP_TYPE_ANY), pos=(0, 0)) self.bitmap_1 = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap("./gui/start.png", wx.BITMAP_TYPE_ANY), pos=(0, 0))
self.Bind(wx.EVT_LEFT_DOWN, parent.onStart) if not settings.hideGuiList:
self.bitmap_1.Bind(wx.EVT_LEFT_DOWN, parent.onStart) self.Bind(wx.EVT_LEFT_DOWN, parent.onStart)
self.bitmap_1.Bind(wx.EVT_LEFT_DOWN, parent.onStart)
def on_quit(self, e): def on_quit(self, e):
print "close" print "close"
@@ -106,9 +124,15 @@ class PanelThanks (wx.Panel):
wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=(0, 0), size=(480, 320)) wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=(0, 0), size=(480, 320))
#panel = wx.Panel(self, -1) #panel = wx.Panel(self, -1)
self.bitmap_1 = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap("./gui/thanks.png", wx.BITMAP_TYPE_ANY), pos=(0, 0)) self.bitmap_1 = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap("./gui/thanks.png", wx.BITMAP_TYPE_ANY), pos=(0, 0))
self.bitmap_1.Bind(wx.EVT_LEFT_DOWN, parent.onExit) self.bitmap_2 = wx.StaticBitmap(self, wx.ID_ANY, wx.NullBitmap, pos=(10, 10))
self.label_1 = wx.StaticText(self, wx.ID_ANY, 'bla blub', pos=(100,100))
self.label_1.SetFont(wx.Font(30, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.label_1 = wx.StaticText(self, wx.ID_ANY, 'bla blub', pos=(120, 50), size=(340, 100))
self.label_1.SetFont(wx.Font(25, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
self.label_1.SetForegroundColour("white")
#self.l_product = wx.StaticText(self, wx.ID_ANY, 'bla blub', pos=(120, 100), size=(340, 100))
#self.l_product.SetFont(wx.Font(30, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
#self.l_product.SetForegroundColour("white")
def on_quit(self, e): def on_quit(self, e):
print "close" print "close"
@@ -158,22 +182,24 @@ class PanelDrinks (wx.Panel):
for product in products: for product in products:
if product.isshown: if product.isshown:
#480x320 #480x320
self.but = wx.Button(self, id=wx.ID_ANY, label=product.name + u"\n" + "%0.2f" % product.price, pos=(0+i*120, 0), size=(120, 120)) self.but = wx.Button(self, id=wx.ID_ANY, label=product.name + u"\n" + u"%0.2f" % product.price, pos=(0+i*120, 0), size=(120, 120))
self.but.SetBackgroundColour((255-(i*20 % 40), (160+(i*50 % 100)), 0))
#self.but.SetForegroundColour("#006699")
self.but.SetFont(wx.Font(23, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.but.SetFont(wx.Font(23, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
print "Button %s created" % product.name
self.but.Bind(wx.EVT_LEFT_DOWN, parent.onProduct, id=self.but.Id) self.but.Bind(wx.EVT_LEFT_DOWN, parent.onProduct, id=self.but.Id)
i = i+1 i += 1
self.b_less = wx.Button(self, id = wx.ID_ANY, label=u"-", pos=(0,240), size=(120, 80)) if not settings.onlyOneDrink:
self.b_less.SetFont(wx.Font(60, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.b_less = wx.Button(self, id = wx.ID_ANY, label=u"-", pos=(0,240), size=(120, 80))
self.b_less.Bind(wx.EVT_LEFT_DOWN, self.onLess, id=self.b_less.Id) self.b_less.SetFont(wx.Font(60, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
self.b_less.Bind(wx.EVT_LEFT_DOWN, self.onLess, id=self.b_less.Id)
self.l_amount = wx.StaticText(self, wx.ID_ANY, "1", pos=(145,245), style=wx.ALIGN_CENTER) self.l_amount = wx.StaticText(self, wx.ID_ANY, "%2d" % 0, pos=(137, 245), style=wx.ALIGN_CENTER)
self.l_amount.SetFont(wx.Font(50, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Sans")) self.l_amount.SetFont(wx.Font(50, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Sans"))
self.b_more = wx.Button(self, id = wx.ID_ANY, label=u"+", pos=(240,240), size=(120, 80)) self.b_more = wx.Button(self, id = wx.ID_ANY, label=u"+", pos=(240,240), size=(120, 80))
self.b_more.SetFont(wx.Font(60, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.b_more.SetFont(wx.Font(60, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
self.b_more.Bind(wx.EVT_LEFT_DOWN, self.onMore, id=self.b_more.Id) self.b_more.Bind(wx.EVT_LEFT_DOWN, self.onMore, id=self.b_more.Id)
self.b_exit = wx.Button(self, id = wx.ID_ANY, label=u"x", pos=(360,240), size=(120, 80)) self.b_exit = wx.Button(self, id = wx.ID_ANY, label=u"x", pos=(360,240), size=(120, 80))
self.b_exit.SetFont(wx.Font(30, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.b_exit.SetFont(wx.Font(30, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
@@ -187,13 +213,14 @@ class PanelDrinks (wx.Panel):
def onMore(self,e, id=-1): def onMore(self,e, id=-1):
self.amount = int(self.l_amount.GetLabelText()) + 1 self.amount = int(self.l_amount.GetLabelText()) + 1
self.l_amount.SetLabel(str(self.amount)) if self.amount <= settings.drinkLimit:
self.Layout() self.l_amount.SetLabel("%02d" % self.amount)
self.Layout()
def onLess(self,e, id=-1): def onLess(self,e, id=-1):
self.amount = int(self.l_amount.GetLabelText()) - 1 self.amount = int(self.l_amount.GetLabelText()) - 1
if self.amount > 0: if self.amount > 0:
self.l_amount.SetLabel(str(self.amount)) self.l_amount.SetLabel( "%02d" % self.amount)
self.Layout() self.Layout()
def GetAmount(self): def GetAmount(self):
@@ -217,26 +244,32 @@ class PanelUsers (wx.Panel):
if user.isshown: if user.isshown:
names.append(user.longname) names.append(user.longname)
self.but_names = list() self.but_names = list()
i = 0 i = 0
for name in names: for name in names:
#480x320 #480x320
self.but = wx.Button(self, id=wx.ID_ANY, label=name, pos=(0,0+i*80), size=(400, 80)) #self.but = wx.Button (self, id=wx.ID_ANY, label=name, pos=(0,0+i*80), size=(400, 80))
self.but.SetFont(wx.Font(20, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.but = wx.lib.platebtn.PlateButton(self, label=name, pos=(3, 3+i*80),
style=wx.BU_EXACTFIT | wx.lib.platebtn.PB_STYLE_SQUARE)
self.but.SetSize((392, 74))
self.but.SetBackgroundColour((255-(i*20 % 40), (160+(i*50 % 100)), 0))
#self.but.SetForegroundColour("#006699")
self.but.SetPressColor(wx.Color(255,255,255,0))
self.but.SetFont(wx.Font(25, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
self.but.Bind(wx.EVT_LEFT_DOWN, parent.onUser, id=self.but.Id) self.but.Bind(wx.EVT_LEFT_DOWN, parent.onUser, id=self.but.Id)
self.but_names.append(self.but) self.but_names.append(self.but)
i += 1 i += 1
self.b_up = wx.Button(self, id=wx.ID_ANY, label=u"\u25B2", pos=(400,0), size=(80, 80)) self.b_up = wx.Button(self, id=wx.ID_ANY, label=u"\u25B2", pos=(400, 0), size=(80, 80))
self.b_up.SetFont(wx.Font(20, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.b_up.SetFont(wx.Font(20, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
self.b_up.Bind(wx.EVT_LEFT_DOWN, self.on_up, id=self.b_up.Id) self.b_up.Bind(wx.EVT_LEFT_DOWN, self.on_up, id=self.b_up.Id)
self.b_down = wx.Button(self, id=wx.ID_ANY, label=u"\u25BC", pos=(400,240), size=(80, 80)) self.b_down = wx.Button(self, id=wx.ID_ANY, label=u"\u25BC", pos=(400, 240), size=(80, 80))
self.b_down.SetFont(wx.Font(20, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.b_down.SetFont(wx.Font(20, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
self.b_down.Bind(wx.EVT_LEFT_DOWN, self.on_down, id=self.b_down.Id) self.b_down.Bind(wx.EVT_LEFT_DOWN, self.on_down, id=self.b_down.Id)
self.b_exit = wx.Button(self, id=wx.ID_ANY, label="X", pos=(400,120), size=(80, 80)) self.b_exit = wx.Button(self, id=wx.ID_ANY, label="X", pos=(400, 120), size=(80, 80))
self.b_exit.SetFont(wx.Font(20, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans")) self.b_exit.SetFont(wx.Font(20, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Humor Sans"))
self.b_exit.Bind(wx.EVT_LEFT_DOWN, parent.onExit, id=self.b_exit.Id) self.b_exit.Bind(wx.EVT_LEFT_DOWN, parent.onExit, id=self.b_exit.Id)
self.Bind(wx.EVT_CLOSE, self.on_quit) self.Bind(wx.EVT_CLOSE, self.on_quit)
@@ -247,14 +280,14 @@ class PanelUsers (wx.Panel):
if self.but_names[len(self.but_names)-1].GetPosition()[1] < 320: if self.but_names[len(self.but_names)-1].GetPosition()[1] < 320:
return return
for button in self.but_names: for button in self.but_names:
button.SetPosition((button.GetPosition()[0],button.GetPosition()[1]-320)) button.SetPosition((button.GetPosition()[0], button.GetPosition()[1]-320))
self.Layout() self.Layout()
def on_up(self,e , id=-1): def on_up(self,e , id=-1):
if self.but_names[0].GetPosition()[1] == 0: if self.but_names[0].GetPosition()[1] >= 0:
return return
for button in self.but_names: for button in self.but_names:
button.SetPosition((button.GetPosition()[0],button.GetPosition()[1]+320)) button.SetPosition((button.GetPosition()[0], button.GetPosition()[1]+320))
self.Layout() self.Layout()
def on_button_press(self,e, id=-1): def on_button_press(self,e, id=-1):
@@ -262,6 +295,10 @@ class PanelUsers (wx.Panel):
print id print id
#if id == self.b_down.Id: #if id == self.b_down.Id:
def trap(self, e):
e.Skip()
return
def on_quit(self, e): def on_quit(self, e):
print "close" print "close"
self.Destroy() self.Destroy()

6
app/settings.py
View File

@@ -15,12 +15,14 @@
# #
################################################################ ################################################################
class Settings: class Settings:
def __init__(self): def __init__(self):
##User Interaction ##User Interaction
#Gui #Gui
self.hideGuiList = False #Show the consumers in the gui self.hideGuiList = False #Show the consumers in the gui
self.disableRFID = False #Disable RFID Reading
self.allowHiding = False #Allow a user to hide from the gui consumer list self.allowHiding = False #Allow a user to hide from the gui consumer list
self.onlyOneDrink = False #Hide selection for amount in the gui self.onlyOneDrink = False #Hide selection for amount in the gui
self.drinkLimit = 20 #Max amount of consumptions in the gui (default 20) self.drinkLimit = 20 #Max amount of consumptions in the gui (default 20)
@@ -39,4 +41,6 @@ class Settings:
self.annoyLimit = 100 #Money limit for autoAnnoy (default 100) self.annoyLimit = 100 #Money limit for autoAnnoy (default 100)
##Developer Settings ##Developer Settings
self.debug = False #Show debug output in console self.debug = False #Show debug output in console
settings = Settings()

BIN
gui/products.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
gui/products.xcf
View File

Binary file not shown.

BIN
gui/start.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
gui/thanks.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
gui/users.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB