Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-08-27 12:39:34 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-08-27 12:39:34 (GMT)
commit44172fa401e3d70309222c02ab3e2d06bf1890fd (patch)
tree6e186811264ca31f8beeda6bfa84022cb6bae05a
parent0a7c8b78631e651799c07488eaedd01f93437e04 (diff)
pep8 cleanup
-rw-r--r--plugins/camera_sensor/camera_sensor.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/camera_sensor/camera_sensor.py b/plugins/camera_sensor/camera_sensor.py
index 7228b8b..5bd21ee 100644
--- a/plugins/camera_sensor/camera_sensor.py
+++ b/plugins/camera_sensor/camera_sensor.py
@@ -39,6 +39,7 @@ class Camera_sensor(Plugin):
def __init__(self, parent):
self._parent = parent
self._status = False
+ self._camera = None
v4l2src = gst.element_factory_make('v4l2src')
if v4l2src.props.device_name is not None:
@@ -49,7 +50,6 @@ class Camera_sensor(Plugin):
else:
self._imagepath = '/tmp/turtlepic.png'
- self._camera = None
self._status = True
def setup(self):
@@ -97,7 +97,8 @@ is pushed to the stack'),
hidden=True,
style='box-style',
label=_('brightness'),
- help_string=_('light level detected by camera'),
+ help_string=\
+ _('light level detected by camera'),
value_block=True,
prim_name='read_camera')
self._parent.lc.def_prim('luminance', 0,
@@ -133,7 +134,7 @@ is pushed to the stack'),
''' Initialize the camera if there is an camera block in use '''
if len(self._parent.block_list.get_similar_blocks('block',
['camera', 'read_camera', 'luminance'])) > 0:
- if self._camera is None:
+ if self._status and self._camera is None:
self._camera = Camera(self._imagepath)
def stop(self):