diff --git a/apps/sample/trimesh_QT/glarea.cpp b/apps/sample/trimesh_QT/glarea.cpp index d709750d..8c2a372d 100644 --- a/apps/sample/trimesh_QT/glarea.cpp +++ b/apps/sample/trimesh_QT/glarea.cpp @@ -24,11 +24,15 @@ History $Log: not supported by cvs2svn $ +Revision 1.1 2007/10/18 08:52:06 benedetti +Initial release. + ****************************************************************************/ #include #include "glarea.h" +#include GLArea::GLArea (QWidget * parent) :QGLWidget (parent) @@ -139,24 +143,6 @@ void GLArea::paintGL () track.DrawPostApply(); } -vcg::Trackball::Button GLArea::QT2VCG (Qt::MouseButton qtbt, Qt::KeyboardModifiers modifiers) -{ - int vcgbt = vcg::Trackball::BUTTON_NONE; - if (qtbt & Qt::LeftButton) - vcgbt |= vcg::Trackball::BUTTON_LEFT; - if (qtbt & Qt::RightButton) - vcgbt |= vcg::Trackball::BUTTON_RIGHT; - if (qtbt & Qt::MidButton) - vcgbt |= vcg::Trackball::BUTTON_MIDDLE; - if (modifiers & Qt::ShiftModifier) - vcgbt |= vcg::Trackball::KEY_SHIFT; - if (modifiers & Qt::ControlModifier) - vcgbt |= vcg::Trackball::KEY_CTRL; - if (modifiers & Qt::AltModifier) - vcgbt |= vcg::Trackball::KEY_ALT; - return vcg::Trackball::Button (vcgbt); -} - void GLArea::keyReleaseEvent (QKeyEvent * e) { e->ignore (); @@ -203,19 +189,6 @@ void GLArea::mouseReleaseEvent (QMouseEvent * e) updateGL (); } -vcg::Trackball::Button GLArea::QTWheel2VCG (Qt::KeyboardModifiers modifiers) -{ - int vcgbt = vcg::Trackball::WHEEL; - if (modifiers & Qt::ShiftModifier) - vcgbt |= vcg::Trackball::KEY_SHIFT; - if (modifiers & Qt::ControlModifier) - vcgbt |= vcg::Trackball::KEY_CTRL; - if (modifiers & Qt::AltModifier) - vcgbt |= vcg::Trackball::KEY_ALT; - return vcg::Trackball::Button (vcgbt); -} - - void GLArea::wheelEvent (QWheelEvent * e) { const int WHEEL_STEP = 120; diff --git a/apps/sample/trimesh_QT/glarea.h b/apps/sample/trimesh_QT/glarea.h index 0418fed1..0253c5c6 100644 --- a/apps/sample/trimesh_QT/glarea.h +++ b/apps/sample/trimesh_QT/glarea.h @@ -24,10 +24,12 @@ History $Log: not supported by cvs2svn $ +Revision 1.1 2007/10/18 08:52:06 benedetti +Initial release. + ****************************************************************************/ - #ifndef GLAREA_H_ #define GLAREA_H_ @@ -96,9 +98,6 @@ private: DrawMode drawmode; /// mesh data structure initializer void initMesh(QString message); - /// translation between QT and VCG keyboard and mouse modifiers - vcg::Trackball::Button QT2VCG (Qt::MouseButton qtbt, Qt::KeyboardModifiers modifiers); - vcg::Trackball::Button QTWheel2VCG (Qt::KeyboardModifiers modifiers); }; #endif /*GLAREA_H_ */