manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated anttweakbar mapper

This commit is contained in:
Luigi Malomo 2014-02-24 18:30:47 +00:00
parent 89f4146e2c
commit 4b243bf707
3 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wrap/qt/anttweakbarMapper.cpp
View File

@ -1,6 +1,7 @@
#include <QtGui> #include <QtGui>
#include <QWidget> #include <QWidget>
#include <AntTweakBar.h> #include <AntTweakBar.h>
#include <wrap/qt/device_to_logical.h>
void TW_CALL CopyCDStringToClient(char **destPtr, const char *src) void TW_CALL CopyCDStringToClient(char **destPtr, const char *src)
{ {
@ -35,14 +36,26 @@ TwMouseButtonID Qt2TwMouseButtonId(QMouseEvent *e)
int TwMousePressQt(QMouseEvent *e) int TwMousePressQt(QMouseEvent *e)
{ {
TwMouseMotion(e->x (), e->y ()); TwMouseMotion(e->x (), e->y ());
return TwMouseButton(TW_MOUSE_PRESSED, Qt2TwMouseButtonId(e)); return TwMouseButton(TW_MOUSE_PRESSED, Qt2TwMouseButtonId(e));
}
int TwMousePressQt(QWidget *qw, QMouseEvent *e)
{
TwMouseMotion(QTLogicalToDevice(qw, e->x()), QTLogicalToDevice(qw, e->y()));
return TwMouseButton(TW_MOUSE_PRESSED, Qt2TwMouseButtonId(e));
} }
int TwMouseReleaseQt(QMouseEvent *e) int TwMouseReleaseQt(QMouseEvent *e)
{ {
TwMouseMotion(e->x (), e->y ()); TwMouseMotion(e->x (), e->y ());
return TwMouseButton(TW_MOUSE_RELEASED, Qt2TwMouseButtonId(e)); return TwMouseButton(TW_MOUSE_RELEASED, Qt2TwMouseButtonId(e));
}
int TwMouseReleaseQt(QWidget *qw, QMouseEvent *e)
{
TwMouseMotion(QTLogicalToDevice(qw, e->x()), QTLogicalToDevice(qw, e->y()));
return TwMouseButton(TW_MOUSE_RELEASED, Qt2TwMouseButtonId(e));
} }
int TwKeyPressQt(QKeyEvent *e) int TwKeyPressQt(QKeyEvent *e)

6
wrap/qt/anttweakbarMapper.h
View File

@ -1,12 +1,18 @@
#ifndef ANTTWEAKBARMAPPER_H #ifndef ANTTWEAKBARMAPPER_H
#define ANTTWEAKBARMAPPER_H #define ANTTWEAKBARMAPPER_H
#include <AntTweakBar.h>
#include <QWidget>
#include <string>
void TW_CALL CopyCDStringToClient(char **destPtr, const char *src); void TW_CALL CopyCDStringToClient(char **destPtr, const char *src);
void TW_CALL CopyStdStringToClient(std::string& destClientString, const std::string& srcLibraryString); void TW_CALL CopyStdStringToClient(std::string& destClientString, const std::string& srcLibraryString);
TwMouseButtonID Qt2TwMouseButtonId(QMouseEvent *e); TwMouseButtonID Qt2TwMouseButtonId(QMouseEvent *e);
int TwMousePressQt(QMouseEvent *e); int TwMousePressQt(QMouseEvent *e);
int TwMouseReleaseQt(QMouseEvent *e); int TwMouseReleaseQt(QMouseEvent *e);
int TwMousePressQt(QWidget *qw, QMouseEvent *e);
int TwMouseReleaseQt(QWidget *qw, QMouseEvent *e);
int TwKeyPressQt(QKeyEvent *e); int TwKeyPressQt(QKeyEvent *e);
#endif // ANTTWEAKBARMAPPER_H #endif // ANTTWEAKBARMAPPER_H

23
wrap/qt/anttweakbarMapperNew.cpp
View File

@ -1,6 +1,7 @@
#include <QtGui> #include <QtGui>
#include <QWidget> #include <QWidget>
#include <AntTweakBar.h> #include <AntTweakBar.h>
#include <wrap/qt/device_to_logical.h>
void TW_CALL CopyCDStringToClient(char **destPtr, const char *src) void TW_CALL CopyCDStringToClient(char **destPtr, const char *src)
{ {
@ -35,14 +36,26 @@ TwMouseButtonID Qt2TwMouseButtonId(QMouseEvent *e)
int TwMousePressQt(QMouseEvent *e) int TwMousePressQt(QMouseEvent *e)
{ {
TwMouseMotion(e->x (), e->y ()); TwMouseMotion(e->x (), e->y ());
return TwMouseButton(TW_MOUSE_PRESSED, Qt2TwMouseButtonId(e)); return TwMouseButton(TW_MOUSE_PRESSED, Qt2TwMouseButtonId(e));
}
int TwMousePressQt(QWidget *qw, QMouseEvent *e)
{
TwMouseMotion(QTLogicalToDevice(qw, e->x()), QTLogicalToDevice(qw, e->y()));
return TwMouseButton(TW_MOUSE_PRESSED, Qt2TwMouseButtonId(e));
} }
int TwMouseReleaseQt(QMouseEvent *e) int TwMouseReleaseQt(QMouseEvent *e)
{ {
TwMouseMotion(e->x (), e->y ()); TwMouseMotion(e->x (), e->y ());
return TwMouseButton(TW_MOUSE_RELEASED, Qt2TwMouseButtonId(e)); return TwMouseButton(TW_MOUSE_RELEASED, Qt2TwMouseButtonId(e));
}
int TwMouseReleaseQt(QWidget *qw, QMouseEvent *e)
{
TwMouseMotion(QTLogicalToDevice(qw, e->x()), QTLogicalToDevice(qw, e->y()));
return TwMouseButton(TW_MOUSE_RELEASED, Qt2TwMouseButtonId(e));
} }
int TwKeyPressQt(QKeyEvent *e) int TwKeyPressQt(QKeyEvent *e)
@ -56,7 +69,7 @@ int TwKeyPressQt(QKeyEvent *e)
if( key>0 && key<0x7e ) k=key; // plain ascii codes if( key>0 && key<0x7e ) k=key; // plain ascii codes
if( key>=Qt::Key_F1 && key<=Qt::Key_F12 ) if( key>=Qt::Key_F1 && key<=Qt::Key_F15 )
k = TW_KEY_F1 + (key-Qt::Key_F1 ); k = TW_KEY_F1 + (key-Qt::Key_F1 );
else else
if ( key>=Qt::Key_A && key<=Qt::Key_Z) if ( key>=Qt::Key_A && key<=Qt::Key_Z)