[mousetrap/ng] Added a namespace Mtp and removed the Mtp prefix on classes names



commit 7a866f3a3166608677fb6aa62a51cf681d70fac0
Author: Flavio Percoco Premoli <flaper87 gmail com>
Date:   Sat Jan 16 23:06:50 2010 +0100

    Added a namespace Mtp and removed the Mtp prefix on classes names

 src/mousetrap/ocvfw/boost/PyMtpCapture.cpp |   21 ++--
 src/mousetrap/ocvfw/dev/MtpCamera.cpp      |   27 -----
 src/mousetrap/ocvfw/dev/MtpCapture.cpp     |  128 -----------------------
 src/mousetrap/ocvfw/dev/PyMtpCapture.cpp   |    4 +-
 src/mousetrap/ocvfw/include/MtpCamera.h    |   42 --------
 src/mousetrap/ocvfw/include/MtpCapture.h   |  156 ----------------------------
 src/mousetrap/ocvfw/setup.py               |    4 +-
 7 files changed, 15 insertions(+), 367 deletions(-)
---
diff --git a/src/mousetrap/ocvfw/boost/PyMtpCapture.cpp b/src/mousetrap/ocvfw/boost/PyMtpCapture.cpp
index 63bc55f..f19b618 100644
--- a/src/mousetrap/ocvfw/boost/PyMtpCapture.cpp
+++ b/src/mousetrap/ocvfw/boost/PyMtpCapture.cpp
@@ -20,13 +20,14 @@
 
 #include "cv.h"
 #include "highgui.h"
-#include "MtpCapture.h"
+#include "Capture.h"
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
 
 using namespace std;
 using namespace cv;
+using namespace Mtp;
 using namespace boost::python;
 
 // Defining memebers overloads
@@ -71,14 +72,14 @@ BOOST_PYTHON_MODULE(camera)
 		//.def("adjustROI", &Mat::adjustROI)
 	;
 
-	class_<MtpCapture>("Capture")
-			.def("color", &MtpCapture::color, color_overloads())
-			.def("flip", &MtpCapture::flip)
-			.def("image", &MtpCapture::image)
-			.def("init", &MtpCapture::init)
-			.def("rect", &MtpCapture::rect)
-			.def("resize", &MtpCapture::resize)
-			.def("set_async", &MtpCapture::set_async)
-			.def("sync", &MtpCapture::sync)
+	class_<Capture>("Capture", init<>())
+			.def("color", &Capture::color, color_overloads())
+			.def("flip", &Capture::flip)
+			//.def("image", &Capture::image)
+			.def("init", &Capture::init)
+			.def("rect", &Capture::rect)
+			.def("resize", &Capture::resize)
+			.def("set_async", &Capture::set_async)
+			.def("sync", &Capture::sync)
 	;
 }
diff --git a/src/mousetrap/ocvfw/dev/PyMtpCapture.cpp b/src/mousetrap/ocvfw/dev/PyMtpCapture.cpp
index 0c80d6b..0450c2c 100644
--- a/src/mousetrap/ocvfw/dev/PyMtpCapture.cpp
+++ b/src/mousetrap/ocvfw/dev/PyMtpCapture.cpp
@@ -22,12 +22,12 @@
 #include "cv.h"
 #include "highgui.h"
 
-#include "MtpCapture.h"
+#include "Capture.h"
 
 #include "Python.h"
 #include "structmember.h"
 
-static MtpCapture cap;
+static Capture cap;
 
 typedef struct {
 	PyObject_HEAD
diff --git a/src/mousetrap/ocvfw/setup.py b/src/mousetrap/ocvfw/setup.py
index c09c8e1..a23b9b8 100644
--- a/src/mousetrap/ocvfw/setup.py
+++ b/src/mousetrap/ocvfw/setup.py
@@ -23,8 +23,8 @@ module = Extension('camera',
                                   '/usr/include/boost/',
                                   './include/'],
                     sources = ['backends/OcvfwBase.cpp',
-                               'dev/MtpCamera.cpp', 
-                               'dev/MtpCapture.cpp', 
+                               'dev/Camera.cpp', 
+                               'dev/Capture.cpp', 
                                #'dev/PyMtpCapture.cpp',
                                'boost/PyMtpCapture.cpp'
                                ],)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]