Changeset 32 for foam/trunk

Timestamp:

03/23/2009 04:27:22 PM (12 years ago)

Author:

dave

Message:

added a proper scene state which deals with sending yarp bottles

Location:

foam/trunk/simple-faceident

Files:

• Makefile (modified) (2 diffs)
• src/SceneState.cpp (added)
• src/SceneState.h (added)
• src/main.cpp (modified) (6 diffs)

foam/trunk/simple-faceident/Makefile

@@ -6 +6 @@
 all: simple-faceident
 
-simple-faceident: main.o FaceBank.o ImageUtils.o
-        $(CC) main.o FaceBank.o ImageUtils.o -rdynamic -o simple-faceident $(LDFLAGS)
+simple-faceident: main.o FaceBank.o ImageUtils.o SceneState.o
+        $(CC) main.o FaceBank.o ImageUtils.o SceneState.o -rdynamic -o simple-faceident $(LDFLAGS)
 
 main.o: src/main.cpp
@@ -18 +18 @@
         $(CC) $(CXXFLAGS) -c src/ImageUtils.cpp
 
+SceneState.o: src/SceneState.cpp
+        $(CC) $(CXXFLAGS) -c src/SceneState.cpp
+
 clean:
         rm -rf *.o simple-faceident

foam/trunk/simple-faceident/src/main.cpp

@@ -29 +29 @@
 #include <time.h>
 #include <ctype.h>
-#include <yarp/os/all.h>
 
 #include "FaceBank.h"
 #include "ImageUtils.h"
+#include "SceneState.h"
 
 using namespace std;
-using namespace yarp::os;
 
 #ifdef _EiC
@@ -59 +58 @@
 // These are the tweakable bits - see comments in FaceBank.h
 FaceBank facebank(30, 40, 0.15); 
+SceneState scenestate;
 
 // show all faces currently detected 
@@ -68 +68 @@
 int facenum=0;
 int framenum=0;
-
-Network YarpNetwork;
-Port YarpPort;
 
 //////////////////////////////////////////////////////////
@@ -112 +109 @@
             input_name = argv[i];
     }
-
-        /////////////////////////////////
-        // yarp init
-        cerr<<"connecting to yarp..."<<endl;
-        YarpPort.open("/faceident");
-        
-        /////////////////////////////////
 
     cascade = (CvHaarClassifierCascade*)cvLoad( cascade_name, 0, 0, 0 );
@@ -326 +316 @@
                                 int y=imgsize.height-facebank.GetFaceHeight();
                                 cvLine(img, cvPoint(r->x+r->width/2,r->y+r->height/2),
-                                        cvPoint(x+facebank.GetFaceWidth()/2,y), color);
-                                /////////////////////
-                                // YARP send
-                                
+                                        cvPoint(x+facebank.GetFaceWidth()/2,y), color);                 
+
                                 if (!learn)
                                 {
-                                        Bottle b;  
-                                        b.clear();
-                                        b.add((int)ID);
-                                        b.add(confidence);
-                                        YarpPort.write(b);
+                                        scenestate.AddPresent(ID, SceneState::User(confidence));
                                 }
-
-                                ////////////////////
-
                         }
 
@@ -346 +327 @@
         }
     }
+
+        scenestate.Update();
 
         char info[256];