diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2011-08-29 04:16:16 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2011-08-29 04:16:16 (GMT) |
| commit | 5665b24048a2577d50a39bd4b6928754972e988a (patch) | |
| tree | 1a243d176eea8d6db51211f44b68c54bed2e4826 /plugins/camera_sensor | |
| parent | ecb5e001f04de664b54b47ce310a067187fe3aa0 (diff) | |
| parent | 0c8c1663c2238ed2f5899ee946d2b8e68b7ccb23 (diff) | |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
Diffstat (limited to 'plugins/camera_sensor')
| -rw-r--r-- | plugins/camera_sensor/camera_sensor.py | 7 | ||||
| -rw-r--r-- | plugins/camera_sensor/icons/sensoroff.svg | 9 |
2 files changed, 6 insertions, 10 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): diff --git a/plugins/camera_sensor/icons/sensoroff.svg b/plugins/camera_sensor/icons/sensoroff.svg index ec55f03..2d56090 100644 --- a/plugins/camera_sensor/icons/sensoroff.svg +++ b/plugins/camera_sensor/icons/sensoroff.svg @@ -16,13 +16,8 @@ id="metadata15"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs13" /><rect - width="55" - height="55" - x="0" - y="0" - id="rect3269" - style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none" /><g + id="defs13" /> +<g transform="matrix(0.67,0,0,0.67,9.075,9.0749996)" id="toolbar_x5F_view" style="fill:#ffffff;fill-opacity:1;display:block"> |
