Merge lp:~zedtux/quiestla/1.0 into lp:quiestla

[Guillaume Hain]

Fixing mistake in branches :s

[Guillaume Hain (zedtux)]

review: Approve

=== modified file 'quiestla/common/opencvclient.py'
--- quiestla/common/opencvclient.py	2010-06-23 17:50:59 +0000
+++ quiestla/common/opencvclient.py	2010-06-24 08:02:29 +0000
@@ -69,8 +69,6 @@
     def detect_faces_in_image(self):
         self.initialize_opencv_objects()
         
-        #self.initialize_detection_meter()
-        
         log.debug("Starting faces detection")
 
         for haarcascade in HAARCASCADES:
@@ -99,8 +97,6 @@
             
         log.debug("Detection is finished")
         
-        #self.stop_detection_meter()
-        
         self.emit_signal("detection_is_finished")
     
     def initialize_opencv_objects(self):
@@ -118,16 +114,13 @@
         
         log.debug("OpenCV objects ready for detection !")
     
-    def initialize_detection_meter(self):
-        self.__detection_meter = cvGetTickCount()
-        log.debug("Detecting meter initialized")
-    
-    def stop_detection_meter(self):
-        self.__detection_meter = cvGetTickCount() - self.__detection_meter
-        log.debug("Elapsed time during detection: %gms" % (self.__detection_meter / (cvGetTickFrequency() * 1000.)))
-    
     def found_faces_count(self):
         return len(self.__face_validator.get_valid_faces())
     
     def get_faces_areas(self):
         return self.__face_validator.get_valid_faces()
+    
+    def draw_faces_areas_at(self, path):
+        for face in self.get_faces_areas():
+            cvRectangle(self.__image, cvPoint(int(face.get_x()), int(face.get_y())), cvPoint(int(face.get_x()+face.get_width()), int(face.get_y()+face.get_height())), CV_RGB(0, 255, 0), 2, 8, 0)
+        cvSaveImage(str(path), self.__image)

=== modified file 'quiestla/common/quiestlaservice.py'
--- quiestla/common/quiestlaservice.py	2010-06-23 17:50:59 +0000
+++ quiestla/common/quiestlaservice.py	2010-06-24 08:02:29 +0000
@@ -42,7 +42,7 @@
         self.__opencv_client.set_callback("detection_is_finished", self.DetectionFinished)
         
         if self.is_dbus_ready():
-            log.debug("DBUSService %s is ready ! Starting listening")
+            log.debug("DBUSService %s is ready ! Starting listening" % self.get_dbus_name())
             self.listen()
         else:
             log.error("DBUSService instance is invalid !")
@@ -73,3 +73,10 @@
         
         print result
         return dbus.Array(result, signature="aai")
+    
+    @dbus.service.method(DBUS_SERVICE_NAME + ".WhereArePeople", in_signature="s", out_signature="b")
+    def DrawFacesAreasAt(self, path):
+        if self.__opencv_client.found_faces_count() == 0:
+            return False
+        else:
+            return self.__opencv_client.draw_faces_areas_at(path)