yumoqing/kivyblocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2020-08-01 21:24:22 +08:00
parent c9510fbdf5
commit 757c080f1c
2 changed files with 120 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
kivyblocks/qrdata.py
View File

@ -6,181 +6,141 @@ from functools import partial
from kivy.factory import Factory from kivy.factory import Factory
from kivy.uix.floatlayout import FloatLayout from kivy.uix.floatlayout import FloatLayout
from kivy.uix.image import Image
from kivy.graphics.texture import Texture from kivy.graphics.texture import Texture
from kivy.properties import StringProperty from kivy.properties import StringProperty
from kivy.properties import ObjectProperty, StringProperty, ListProperty,\ from kivy.properties import ObjectProperty, StringProperty, ListProperty,\
BooleanProperty BooleanProperty
from kivy.lang import Builder from kivy.lang import Builder
from kivy.clock import Clock from kivy.clock import Clock
import qrcode import qrcode
Builder.load_string('''
<QRCodeWidget>
on_parent: if args[1]: qrimage.source = self.loading_image
canvas.before:
# Draw white Rectangle
Color:
rgba: root.background_color
Rectangle:
size: self.size
pos: self.pos
canvas.after:
Color:
rgba: .5, .5, .5, 1 if root.show_border else 0
Line:
width: dp(1.333)
points:
dp(2), dp(2),\
self.width - dp(2), dp(2),\
self.width - dp(2), self.height - dp(2),\
dp(2), self.height - dp(2),\
dp(2), dp(2)
Image
id: qrimage
pos_hint: {'center_x': .5, 'center_y': .5}
allow_stretch: True
size_hint: None, None
size: root.width * .9, root.height * .9
''')
class QRCodeWidget(FloatLayout): class QRCodeWidget(FloatLayout):
data = StringProperty(None, allow_none=True)
''' Data using which the qrcode is generated.
show_border = BooleanProperty(True) :data:`data` is a :class:`~kivy.properties.StringProperty`, defaulting to
'''Whether to show border around the widget. `None`.
'''
:data:`show_border` is a :class:`~kivy.properties.BooleanProperty`, loading_image = StringProperty('data/images/image-loading.gif')
defaulting to `True`. '''Intermediate image to be displayed while the widget ios being loaded.
'''
data = StringProperty(None, allow_none=True) :data:`loading_image` is a :class:`~kivy.properties.StringProperty`,
''' Data using which the qrcode is generated. defaulting to `'data/images/image-loading.gif'`.
'''
:data:`data` is a :class:`~kivy.properties.StringProperty`, defaulting to def __init__(self, **kwargs):
`None`. self.qrimage = Image(allow_stretch=True)
''' self.addr = None
super(QRCodeWidget, self).__init__(**kwargs)
self.background_color = [1,1,1,1]
self.qr = None
self._qrtexture = None
self.qrimage.pos_hint = {'center_x':0.5, 'center_y':0.5}
self.add_widget(self.qrimage)
background_color = ListProperty((1, 1, 1, 1)) def on_size(self,o,s):
''' Background color of the background of the widget to be displayed self.qrimage.width = self.width
behind the qrcode. self.qrimage.height = self.height
self.on_data(None,self.data)
:data:`background_color` is a :class:`~kivy.properties.ListProperty`, def on_data(self, instance, value):
defaulting to `(1, 1, 1, 1)`. if not (self.canvas or value):
''' return
img = self.qrimage
img.anim_delay = .25
img.source = self.loading_image
self.generate_qr(value)
loading_image = StringProperty('data/images/image-loading.gif') def generate_qr(self, value):
'''Intermediate image to be displayed while the widget ios being loaded. self.set_addr(value)
self.update_qr()
:data:`loading_image` is a :class:`~kivy.properties.StringProperty`, def set_addr(self, addr):
defaulting to `'data/images/image-loading.gif'`. if self.addr == addr:
''' return
MinSize = 210 if len(addr) < 128 else 500
self.setMinimumSize((MinSize, MinSize))
self.addr = addr
self.qr = None
def __init__(self, **kwargs): def update_qr(self):
super(QRCodeWidget, self).__init__(**kwargs) if not self.addr and self.qr:
self.addr = None return
self.qr = None QRCode = qrcode.QRCode
self._qrtexture = None L = qrcode.constants.ERROR_CORRECT_L
addr = self.addr
try:
self.qr = qr = QRCode(
version=None,
error_correction=L,
box_size=10,
border=0,
)
qr.add_data(addr)
qr.make(fit=True)
self.qr = qr
self.update_texture()
except Exception as e:
print('eeeee',e)
self.qr=None
def on_data(self, instance, value): def setMinimumSize(self, size):
if not (self.canvas or value): # currently unused, do we need this?
return self._texture_size = size
img = self.ids.get('qrimage', None)
if not img: def _create_texture(self, k):
# if texture hasn't yet been created delay the texture updation self._qrtexture = texture = Texture.create(size=(k,k), colorfmt='rgb')
Clock.schedule_once(lambda dt: self.on_data(instance, value)) # don't interpolate texture
return texture.min_filter = 'nearest'
img.anim_delay = .25 texture.mag_filter = 'nearest'
img.source = self.loading_image
Thread(target=partial(self.generate_qr, value)).start()
def generate_qr(self, value): def update_texture(self):
self.set_addr(value) if not self.addr:
self.update_qr() return
def set_addr(self, addr): matrix = self.qr.get_matrix()
if self.addr == addr: k = len(matrix)
return self._create_texture(k)
MinSize = 210 if len(addr) < 128 else 500
self.setMinimumSize((MinSize, MinSize))
self.addr = addr
self.qr = None
def update_qr(self):
if not self.addr and self.qr:
return
QRCode = qrcode.QRCode
L = qrcode.constants.ERROR_CORRECT_L
addr = self.addr
try:
self.qr = qr = QRCode(
version=None,
error_correction=L,
box_size=10,
border=0,
)
qr.add_data(addr)
qr.make(fit=True)
except Exception as e:
print(e)
self.qr=None
self.update_texture()
def setMinimumSize(self, size):
# currently unused, do we need this?
self._texture_size = size
def _create_texture(self, k, dt):
self._qrtexture = texture = Texture.create(size=(k,k), colorfmt='rgb')
# don't interpolate texture
texture.min_filter = 'nearest'
texture.mag_filter = 'nearest'
def update_texture(self):
if not self.addr:
return
matrix = self.qr.get_matrix()
k = len(matrix)
# create the texture in main UI thread otherwise
# this will lead to memory corruption
Clock.schedule_once(partial(self._create_texture, k), -1)
cr, cg, cb, ca = self.background_color[:] cr, cg, cb, ca = self.background_color[:]
cr, cg, cb = 255, 255, 255 cr, cg, cb = 255, 255, 255
###used bytearray for python 3.5 eliminates need for btext ###used bytearray for python 3.5 eliminates need for btext
buff = bytearray() buff = bytearray()
for r in range(k): for r in range(k):
for c in range(k): for c in range(k):
buff.extend([0, 0, 0] if matrix[r][c] else [cr, cg, cb]) buff.extend([0, 0, 0] if matrix[r][c] else [cr, cg, cb])
# then blit the buffer # then blit the buffer
# join not neccesarry when using a byte array # join not neccesarry when using a byte array
# buff =''.join(map(chr, buff)) # buff =''.join(map(chr, buff))
# update texture in UI thread. # update texture in UI thread.
Clock.schedule_once(lambda dt: self._upd_texture(buff)) self._upd_texture(buff)
def _upd_texture(self, buff): def _upd_texture(self, buff):
texture = self._qrtexture texture = self._qrtexture
if not texture: if not texture:
# if texture hasn't yet been created delay the texture updation # if texture hasn't yet been created delay the texture updation
Clock.schedule_once(lambda dt: self._upd_texture(buff)) Clock.schedule_once(lambda dt: self._upd_texture(buff))
return return
texture.blit_buffer(buff, colorfmt='rgb', bufferfmt='ubyte') texture.blit_buffer(buff, colorfmt='rgb', bufferfmt='ubyte')
texture.flip_vertical() texture.flip_vertical()
img = self.ids.qrimage img = self.qrimage
img.anim_delay = -1 img.anim_delay = -1
img.texture = texture img.texture = texture
img.canvas.ask_update() img.canvas.ask_update()
Factory.register('QRCodeWidget',QRCodeWidget) Factory.register('QRCodeWidget',QRCodeWidget)
if __name__ == '__main__': if __name__ == '__main__':
from kivy.app import runTouchApp from kivy.app import runTouchApp
import sys import sys
data = str(sys.argv[1:]) data = str(sys.argv[1:])
runTouchApp(QRCodeWidget(data=data)) data = """{
"host":"122.22.22.33",
"port":12345
}"""
runTouchApp(Factory.QRCodeWidget(data=data))

13
kivyblocks/vplayer.py
View File

@ -250,15 +250,16 @@ class OSC_VPlayer(BaseVPlayer):
self.map('/next',self.next) self.map('/next',self.next)
self.map('/previous',self.previous) self.map('/previous',self.previous)
t = threading.Thread(target=self.server.serve_forever) t = threading.Thread(target=self.server.serve_forever)
t.daemon_threads = True
t.start() t.start()
self.fullscreen = True
label = Label(text='%s %d' % (self.ip,self.port), font_size=CSize(2)) def osc_server_quit(self):
label.x = self.width - label.width, 0 self.server.shutdown()
label.y = 0 self.server.server_close()
self.add_widget(label)
def __del__(self): def __del__(self):
self.server.server_close() print("*******************VPlayer deleted**********")
self.quit()
def map(self,p,f): def map(self,p,f):
self.dispatcher.map(p,f,None) self.dispatcher.map(p,f,None)