Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt/tawindow.py
diff options
context:
space:
mode:
authorWalter Bender <walter@sugarlabs.org>2010-12-29 17:03:42 (GMT)
committer Walter Bender <walter@sugarlabs.org>2010-12-29 17:03:42 (GMT)
commitb9f147f3f72f0ce0eecf7e6598cad4b785aa4719 (patch)
treeffb27f2c169a35ba5092c938fd372d620b4194bf /TurtleArt/tawindow.py
parentb628998276dd58151d2e850587096ef3d9cb8646 (diff)
refactored camera code to use poll for MESSAGE_EOS instead of timeout
Diffstat (limited to 'TurtleArt/tawindow.py')
-rwxr-xr-xTurtleArt/tawindow.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index a063a2d..ba5b5cf 100755
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -249,11 +249,6 @@ class TurtleArtWindow():
CONSTANTS['width'] = int(self.canvas.width / self.coord_scale)
CONSTANTS['height'] = int(self.canvas.height / self.coord_scale)
- self.lc = LogoCode(self)
- self.saved_pictures = []
-
- self.block_operation = ''
-
if self.interactive_mode:
self._setup_misc()
self._show_toolbar_palette(0, False)
@@ -264,13 +259,18 @@ class TurtleArtWindow():
PALETTES[PALETTE_NAMES.index('sensor')].append('voltage')
self.audio_started = False
- self.camera = False
+ self.camera_available = False
v4l2src = gst.element_factory_make('v4l2src')
if v4l2src.props.device_name is not None:
PALETTES[PALETTE_NAMES.index('sensor')].append('readcamera')
PALETTES[PALETTE_NAMES.index('sensor')].append('luminance')
PALETTES[PALETTE_NAMES.index('sensor')].append('camera')
- self.camera = True
+ self.camera_available = True
+
+ self.lc = LogoCode(self)
+ self.saved_pictures = []
+
+ self.block_operation = ''
"""
The following code will initialize a USB RFID reader. Please note that