[mousetrap] Fixed idm_example
- From: Flavio Percoco <flaper src gnome org>
- To: svn-commits-list gnome org
- Subject: [mousetrap] Fixed idm_example
- Date: Wed, 22 Jul 2009 07:29:22 +0000 (UTC)
commit 3ff10ada0297219ae1be3455022c8a899c224a31
Author: Flavio Percoco Premoli <flaper87 gmail com>
Date: Sun Jul 19 15:41:33 2009 +0200
Fixed idm_example
.gitignore | 6 +++
ChangeLog | 91 ++--------------------------------------------
dev_tools/idm_example.py | 19 ++++------
3 files changed, 17 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab2c86f..18be05d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,9 @@ compile
*~
*.swp
*.dropbox
+*.Documents
+*.Proporsal
+*.test
+*.Videos
+*.tarballs
+*.planner
diff --git a/ChangeLog b/ChangeLog
index 3d13d0b..aaf4e72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,89 +1,4 @@
-commit c23829bc8f7cc8debf266e6cd6273c0398cb9648
-Author: Flavio Percoco Premoli <flaper87 gmail com>
-Date: Mon May 4 05:39:09 2009 +0200
+2009-04-17 Flavio Percoco Premoli <flaper87 gmail com>
- Settings Dialog Update
-
-commit e6523cbaf859c05c9948798ac1c93e80e60ad370
-Author: Flavio Percoco Premoli <flaper87 gmail com>
-Date: Sun May 3 08:15:11 2009 +0200
-
- Added ChangeLog file
-
-commit 6a9d9789722f2473434d4692daf796346a20ae97
-Author: Flavio Percoco Premoli <flaper87 gmail com>
-Date: Sun May 3 08:06:06 2009 +0200
-
- Merging svn's ng branch with git's ng branch
-
-commit 447265508a42e8ba4d4c82b301d36eb59aa8b464
-Author: Flavio Percoco <flaper src gnome org>
-Date: Fri Apr 3 16:00:06 2009 +0000
-
- Settings Dialog Update
-
- svn path=/branches/ng/; revision=30
-
-commit fa1e4b79f40fc126a45077f18a2ed154ab2f18a4
-Author: Flavio Percoco <flaper src gnome org>
-Date: Tue Mar 31 12:06:44 2009 +0000
-
- Missing files
-
- svn path=/branches/ng/; revision=29
-
-commit c468683e8f484a21e05833f36d26f0701223ac0a
-Author: Flavio Percoco <flaper src gnome org>
-Date: Tue Mar 31 12:03:56 2009 +0000
-
- BugFix
-
- svn path=/branches/ng/; revision=28
-
-commit d68899ff80835e1426660e6007f660afea7cfa13
-Author: Flavio Percoco <flaper src gnome org>
-Date: Tue Mar 31 12:02:22 2009 +0000
-
- Settings handler added, User preferences dialog under construction
-
- svn path=/branches/ng/; revision=27
-
-commit 903f9efaf1d72c6c73c5112687b84ae2e3dd09aa
-Author: Flavio Percoco <flaper src gnome org>
-Date: Sun Feb 22 18:48:32 2009 +0000
-
- Uncommented movement line
-
- svn path=/branches/ng/; revision=22
-
-commit 655b267bb701d88b87e386ddf95c24a49efdbec4
-Author: Flavio Percoco <flaper src gnome org>
-Date: Sun Feb 22 18:24:52 2009 +0000
-
- Added mouse movements
-
- svn path=/branches/ng/; revision=21
-
-commit aa4e37bd166fa69c51165f5ddacbf4cba59d1b7e
-Author: Flavio Percoco <flaper src gnome org>
-Date: Sat Feb 21 21:34:12 2009 +0000
-
- Added missing files, some paths fixed
-
- svn path=/branches/ng/; revision=20
-
-commit e4ee0ab7f5ee5947b6065e9c77ce0e266100b3d0
-Author: Flavio Percoco <flaper src gnome org>
-Date: Sat Feb 21 21:20:07 2009 +0000
-
- Deleted .emacs.desktop file
-
- svn path=/branches/ng/; revision=19
-
-commit 07d635cc4cb23c663e7f157d6672335acd353df7
-Author: Flavio Percoco <flaper src gnome org>
-Date: Sat Feb 21 21:17:24 2009 +0000
-
- Added new branch for the new generation MouseTrap's development
-
- svn path=/branches/ng/; revision=18
+ * *: The ChangeLog is auto-generated when releasing. If you
+ are seeing this, use 'git log' for a detailed list of changes.
diff --git a/dev_tools/idm_example.py b/dev_tools/idm_example.py
index 869d47c..549d290 100644
--- a/dev_tools/idm_example.py
+++ b/dev_tools/idm_example.py
@@ -29,7 +29,7 @@ __license__ = "GPLv2"
import ocvfw.debug as debug
import ocvfw.commons as commons
-from ocvfw.dev.camera import Camera, Capture, Point
+from ocvfw.dev.camera import Capture, Point
# IDM's Information
# a_name: IDM's name
@@ -57,10 +57,6 @@ class Module(object):
# Debugging is always important
debug.debug("ocvfw.idm", "Starting %s idm" % a_name)
- # This will init the Camera class.
- # This class is used to handle the camera device.
- Camera.init()
-
# Controller instance
self.ctr = controller
@@ -109,12 +105,14 @@ class Module(object):
# Starts the Capture using the async method.
# This means that self.cap.sync() wont be called periodically
# by the idm because the Capture syncs the image asynchronously (See dev/camera.py)
- self.cap = Capture(async=True, idx=cam)
+ # The default backend used is OcvfwPython but it is possible to chose other backends
+ # that will use other libs to process images.
+ self.cap = Capture(async=True, idx=cam, backend="OcvfwPython")
# This sets the final image default color to rgb. The default color is bgr.
self.cap.change(color="rgb")
- def get_image(self):
+ def get_capture(self):
"""
Gets the last queried and formated image.
Function used by the mousetrap/ui/main.py
@@ -126,10 +124,9 @@ class Module(object):
returns self.cap.resize(200, 160, True)
"""
- # Calls the resize method passing the new with, height
- # specifying that the new image has to be a copy of the original
- # so, self.cap.resize will copy the original instead of modifying it.
- return self.cap.resize(200, 160, True)
+ # We return the self.cap object, the method calling
+ # this method will chose if resize the image or not.
+ return self.cap
def get_pointer(self):
"""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]