diff --git a/mariusz/build/Debug/GNU-Linux-x86/src/HandPointer/HandPointer.o.d b/mariusz/build/Debug/GNU-Linux-x86/src/HandPointer/HandPointer.o.d deleted file mode 100644 index 901bb98..0000000 --- a/mariusz/build/Debug/GNU-Linux-x86/src/HandPointer/HandPointer.o.d +++ /dev/null @@ -1,7 +0,0 @@ -build/Debug/GNU-Linux-x86/src/HandPointer/HandPointer.o: \ - src/HandPointer/HandPointer.cpp include/cvBlob/cvblob.h \ - src/HandPointer/Mouse.hpp - -include/cvBlob/cvblob.h: - -src/HandPointer/Mouse.hpp: diff --git a/mariusz/build/Debug/GNU-Linux-x86/src/HandPointer/Mouse.o.d b/mariusz/build/Debug/GNU-Linux-x86/src/HandPointer/Mouse.o.d deleted file mode 100644 index e51be53..0000000 --- a/mariusz/build/Debug/GNU-Linux-x86/src/HandPointer/Mouse.o.d +++ /dev/null @@ -1,4 +0,0 @@ -build/Debug/GNU-Linux-x86/src/HandPointer/Mouse.o: \ - src/HandPointer/Mouse.cpp src/HandPointer/Mouse.hpp - -src/HandPointer/Mouse.hpp: diff --git a/mariusz/dist/Debug/GNU-Linux-x86/mariusz b/mariusz/dist/Debug/GNU-Linux-x86/mariusz index 3409dcc..1b2550b 100755 Binary files a/mariusz/dist/Debug/GNU-Linux-x86/mariusz and b/mariusz/dist/Debug/GNU-Linux-x86/mariusz differ diff --git a/mariusz/nbproject/Makefile-Debug.mk b/mariusz/nbproject/Makefile-Debug.mk index 74f3e76..6ad8aa7 100644 --- a/mariusz/nbproject/Makefile-Debug.mk +++ b/mariusz/nbproject/Makefile-Debug.mk @@ -36,7 +36,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ ${OBJECTDIR}/src/HandPointer/HandPointer.o \ - ${OBJECTDIR}/src/HandPointer/Mouse.o + ${OBJECTDIR}/src/HandPointer/Media.o # C Compiler Flags @@ -68,10 +68,10 @@ ${OBJECTDIR}/src/HandPointer/HandPointer.o: nbproject/Makefile-${CND_CONF}.mk sr ${RM} $@.d $(COMPILE.cc) -g -Iinclude/cvBlob `pkg-config opencv --cflags --libs` -lX11 -I/usr/local/include -L/usr/local/lib -lcvblob -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HandPointer/HandPointer.o src/HandPointer/HandPointer.cpp -${OBJECTDIR}/src/HandPointer/Mouse.o: nbproject/Makefile-${CND_CONF}.mk src/HandPointer/Mouse.cpp +${OBJECTDIR}/src/HandPointer/Media.o: nbproject/Makefile-${CND_CONF}.mk src/HandPointer/Media.cpp ${MKDIR} -p ${OBJECTDIR}/src/HandPointer ${RM} $@.d - $(COMPILE.cc) -g -Iinclude/cvBlob `pkg-config opencv --cflags --libs` -lX11 -I/usr/local/include -L/usr/local/lib -lcvblob -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HandPointer/Mouse.o src/HandPointer/Mouse.cpp + $(COMPILE.cc) -g -Iinclude/cvBlob `pkg-config opencv --cflags --libs` -lX11 -I/usr/local/include -L/usr/local/lib -lcvblob -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HandPointer/Media.o src/HandPointer/Media.cpp # Subprojects .build-subprojects: diff --git a/mariusz/nbproject/Makefile-Release.mk b/mariusz/nbproject/Makefile-Release.mk index 9fefdcb..96c6469 100644 --- a/mariusz/nbproject/Makefile-Release.mk +++ b/mariusz/nbproject/Makefile-Release.mk @@ -36,7 +36,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} # Object Files OBJECTFILES= \ ${OBJECTDIR}/src/HandPointer/HandPointer.o \ - ${OBJECTDIR}/src/HandPointer/Mouse.o + ${OBJECTDIR}/src/HandPointer/Media.o # C Compiler Flags @@ -68,10 +68,10 @@ ${OBJECTDIR}/src/HandPointer/HandPointer.o: src/HandPointer/HandPointer.cpp ${RM} $@.d $(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HandPointer/HandPointer.o src/HandPointer/HandPointer.cpp -${OBJECTDIR}/src/HandPointer/Mouse.o: src/HandPointer/Mouse.cpp +${OBJECTDIR}/src/HandPointer/Media.o: src/HandPointer/Media.cpp ${MKDIR} -p ${OBJECTDIR}/src/HandPointer ${RM} $@.d - $(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HandPointer/Mouse.o src/HandPointer/Mouse.cpp + $(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/HandPointer/Media.o src/HandPointer/Media.cpp # Subprojects .build-subprojects: diff --git a/mariusz/nbproject/configurations.xml b/mariusz/nbproject/configurations.xml index 571c1fb..85b204e 100644 --- a/mariusz/nbproject/configurations.xml +++ b/mariusz/nbproject/configurations.xml @@ -4,7 +4,7 @@ - src/HandPointer/Mouse.hpp + src/HandPointer/Media.hpp src/HandPointer/HandPointer.cpp - src/HandPointer/Mouse.cpp + src/HandPointer/Media.cpp - + - + @@ -79,9 +79,9 @@ - + - + diff --git a/mariusz/src/HandPointer/HandPointer.cpp b/mariusz/src/HandPointer/HandPointer.cpp index 6a883c4..d322556 100644 --- a/mariusz/src/HandPointer/HandPointer.cpp +++ b/mariusz/src/HandPointer/HandPointer.cpp @@ -17,7 +17,7 @@ #include #include "opencv2/opencv.hpp" #include -#include "Mouse.hpp" +#include "Media.hpp" using namespace cv; using namespace std; using namespace cvb; @@ -42,9 +42,11 @@ int main(int, char**) { if (!cap.isOpened()) // check if we succeeded return -1; - Mouse mouse; + Media mouse; bool mouseon = true; int x, y; + // W H + pair res = mouse.getResolution(); namedWindow("output", 1); namedWindow("bin", 1); @@ -100,7 +102,7 @@ int main(int, char**) { x = (int) it->second->centroid.x; y = (int) it->second->centroid.y; if (mouseon) { - mouse.setMouse(x/(double)frame.cols*1600,y/(double)frame.rows*900); + mouse.setMouse(x/(double)frame.cols*res.second,y/(double)frame.rows*res.first); } break; } diff --git a/mariusz/src/HandPointer/Media.cpp b/mariusz/src/HandPointer/Media.cpp new file mode 100644 index 0000000..b832568 --- /dev/null +++ b/mariusz/src/HandPointer/Media.cpp @@ -0,0 +1,35 @@ +/* + * File: mouse.cpp + * Author: mar + * + * Created on 13 kwiecieĊ„ 2013, 15:38 + */ + +#include "Media.hpp" + +Media::Media() { + dpy = XOpenDisplay(0); + root_window = XRootWindow(dpy, 0); + XSelectInput(dpy, root_window, KeyReleaseMask); + +} +void Media::setMouse(const int x,const int y){ + XWarpPointer(dpy, None, root_window, 0, 0, 0, 0, x, y); + XFlush(dpy); +} +std::pair Media::getResolution(){ + + std::pair resoluton; + + resoluton.first = XDisplayHeight(dpy,0); + resoluton.second= XDisplayWidth(dpy,0); + return resoluton; + +} +Media::Media(const Media& orig) { +} + +Media::~Media() { + //free(&dpy); +} + diff --git a/mariusz/src/HandPointer/Mouse.hpp b/mariusz/src/HandPointer/Media.hpp similarity index 65% rename from mariusz/src/HandPointer/Mouse.hpp rename to mariusz/src/HandPointer/Media.hpp index 9bd6401..b97ef84 100644 --- a/mariusz/src/HandPointer/Mouse.hpp +++ b/mariusz/src/HandPointer/Media.hpp @@ -8,12 +8,15 @@ #ifndef MOUSE_HPP #define MOUSE_HPP #include -class Mouse { +#include + +class Media { public: - Mouse(); - Mouse(const Mouse& orig); + Media(); + Media(const Media& orig); void setMouse(const int,const int); - virtual ~Mouse(); + std::pair getResolution(); + virtual ~Media(); private: Display *dpy; Window root_window; diff --git a/mariusz/src/HandPointer/Mouse.cpp b/mariusz/src/HandPointer/Mouse.cpp deleted file mode 100644 index 44d3f83..0000000 --- a/mariusz/src/HandPointer/Mouse.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * File: mouse.cpp - * Author: mar - * - * Created on 13 kwiecieĊ„ 2013, 15:38 - */ - -#include "Mouse.hpp" - -Mouse::Mouse() { - dpy = XOpenDisplay(0); - root_window = XRootWindow(dpy, 0); - XSelectInput(dpy, root_window, KeyReleaseMask); - -} -void Mouse::setMouse(const int x,const int y){ - XWarpPointer(dpy, None, root_window, 0, 0, 0, 0, x, y); - XFlush(dpy); -} -Mouse::Mouse(const Mouse& orig) { -} - -Mouse::~Mouse() { - //free(&dpy); -} -