From b485023baea2b38050c4bbfe97aa2934bbcb82b9 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Fri, 23 Apr 2021 15:13:41 +0800 Subject: [PATCH] bugfix --- kivyblocks/custom_camera.py | 6 +++--- kivyblocks/xcamera/xcamera.kv | 2 +- setup.py | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/kivyblocks/custom_camera.py b/kivyblocks/custom_camera.py index 1e29bb1..74dc7c4 100644 --- a/kivyblocks/custom_camera.py +++ b/kivyblocks/custom_camera.py @@ -8,6 +8,7 @@ import numpy as np import cv2 from kivy.base import Builder from .image_processing.image_processing import face_detection +from .xcamera.xcamera import XCamera btxt = """: resolution: (1920,1050) @@ -24,7 +25,7 @@ btxt = """: PopMatrix """ -class CustomCamera(Camera): +class CustomCamera(XCamera): detectFaces = BooleanProperty(False) angle = NumericProperty(0) def __init__(self, **kwargs): @@ -60,9 +61,8 @@ class CustomCamera(Camera): cameras = self._camera.get_camera_count() return cameras -class QrReader(Camera): +class QrReader(XCamera): def __init__(self, **kw): - Logger.info('QrReader:Initialed...........') super(QrReader, self).__init__(**kw) self.qr_reader = cv2.QRCodeDetector() self.register_event_type('on_data') diff --git a/kivyblocks/xcamera/xcamera.kv b/kivyblocks/xcamera/xcamera.kv index b8af343..e816a7f 100644 --- a/kivyblocks/xcamera/xcamera.kv +++ b/kivyblocks/xcamera/xcamera.kv @@ -1,4 +1,4 @@ -#:import xcamera kivy_garden.xcamera.xcamera +#:import xcamera kivyblocks.xcamera.xcamera icon_color: (0, 0, 0, 1) diff --git a/setup.py b/setup.py index e90f876..04e08b7 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,9 @@ package_data = { 'imgs/*.gif', 'imgs/*.jpg', 'ttf/*.ttf', - 'ui/*.uidesc' + 'ui/*.uidesc', + 'xcamera/xcamera.kv', + 'xcamera/data/*' ], }