[mousetrap/gnome3-wip: 125/240] Move haar_files list to configuration.
- From: Heidi Ellis <heidiellis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mousetrap/gnome3-wip: 125/240] Move haar_files list to configuration.
- Date: Mon, 8 Sep 2014 15:23:04 +0000 (UTC)
commit 7a30b4defd9db7d6cb5e2dde0e2cce17e03998b7
Author: Stoney Jackson <dr stoney gmail com>
Date: Mon Jun 23 14:35:24 2014 -0400
Move haar_files list to configuration.
src/mousetrap/config.py | 8 ++++++++
src/mousetrap/vision.py | 7 +------
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/src/mousetrap/config.py b/src/mousetrap/config.py
index 549b8d5..e9c8177 100644
--- a/src/mousetrap/config.py
+++ b/src/mousetrap/config.py
@@ -2,6 +2,7 @@ class Config(dict):
def __init__(self):
self['loops_per_second'] = 10
+ # The plugins to load in the order they will load and run.
self['assembly'] = [
'mousetrap.plugins.camera.CameraPlugin',
'mousetrap.plugins.display.DisplayPlugin',
@@ -9,6 +10,13 @@ class Config(dict):
'mousetrap.plugins.eyes.EyesPlugin',
]
+ self['haar_files'] = {
+ "face": "haars/haarcascade_frontalface_default.xml",
+ "nose": "haars/haarcascade_mcs_nose.xml",
+ "left_eye": "haars/haarcascade_mcs_lefteye.xml",
+ "open_eye": "haars/haarcascade_eye.xml",
+ }
+
# See `logging` and `logging.config`
self['logging'] = {
'version': 1,
diff --git a/src/mousetrap/vision.py b/src/mousetrap/vision.py
index 6f30cf8..5d1962a 100644
--- a/src/mousetrap/vision.py
+++ b/src/mousetrap/vision.py
@@ -45,12 +45,7 @@ class HaarLoader(object):
def __init__(self, config):
self._config = config
- self._haar_files = {
- "face": "haars/haarcascade_frontalface_default.xml",
- "nose": "haars/haarcascade_mcs_nose.xml",
- "left_eye": "haars/haarcascade_mcs_lefteye.xml",
- "open_eye": "haars/haarcascade_eye.xml",
- }
+ self._haar_files = config['haar_files']
self._haar_cache = {}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]