generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support

Browse Source
This commit is contained in:
Vadim Pisarevsky 2016-07-19 19:06:03 +00:00
commit b34272f8a2
2 changed files with 78 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/highgui/src/window_QT.cpp
View File

@ -2629,8 +2629,18 @@ void DefaultViewPort::resizeEvent(QResizeEvent* evnt)
void DefaultViewPort::wheelEvent(QWheelEvent* evnt) void DefaultViewPort::wheelEvent(QWheelEvent* evnt)
{ {
scaleView(evnt->delta() / 240.0, evnt->pos()); int delta = evnt->delta();
int cv_event = -1;
int flags = ((delta & 0xffff)<<16) | ((evnt->orientation() == Qt::Vertical) ? CV_EVENT_MOUSEWHEEL : CV_EVENT_MOUSEHWHEEL);
QPoint pt = evnt->pos();
icvmouseHandler(evnt, mouse_wheel, cv_event, flags);
icvmouseProcessing(QPoingF(pt), cv_event, flags);
scaleView(delta / 240.0, pt);
viewport()->update(); viewport()->update();
QWidget::mouseWheel(evnt);
} }

85
modules/highgui/src/window_gtk.cpp
View File

@ -52,8 +52,11 @@
#include <stdio.h> #include <stdio.h>
#if (GTK_MAJOR_VERSION == 3) #if (GTK_MAJOR_VERSION == 3)
#define GTK_VERSION3 #define GTK_VERSION3 1
#endif //GTK_MAJOR_VERSION >= 3 #endif //GTK_MAJOR_VERSION >= 3
#if (GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 4))
#define GTK_VERSION3_4 1
#endif
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include <gtk/gtkgl.h> #include <gtk/gtkgl.h>
@ -61,6 +64,13 @@
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#ifndef BIT_ALLIN
#define BIT_ALLIN(x,y) ( ((x)&(y)) == (y) )
#endif
#ifndef BIT_MAP
#define BIT_MAP(x,y,z) ( ((x)&(y)) ? (z) : 0 )
#endif
// TODO Fix the initial window size when flags=0. Right now the initial window is by default // TODO Fix the initial window size when flags=0. Right now the initial window is by default
// 320x240 size. A better default would be actual size of the image. Problem // 320x240 size. A better default would be actual size of the image. Problem
// is determining desired window size with trackbars while still allowing resizing. // is determining desired window size with trackbars while still allowing resizing.
@ -1006,6 +1016,7 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
CvWindow* window; CvWindow* window;
int len; int len;
int b_nautosize;
cvInitSystem(1,(char**)&name); cvInitSystem(1,(char**)&name);
if( !name ) if( !name )
@ -1066,6 +1077,8 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
G_CALLBACK(icvOnMouse), window ); G_CALLBACK(icvOnMouse), window );
g_signal_connect( window->widget, "motion-notify-event", g_signal_connect( window->widget, "motion-notify-event",
G_CALLBACK(icvOnMouse), window ); G_CALLBACK(icvOnMouse), window );
g_signal_connect( window->widget, "scroll-event",
G_CALLBACK(icvOnMouse), window );
g_signal_connect( window->frame, "delete-event", g_signal_connect( window->frame, "delete-event",
G_CALLBACK(icvOnClose), window ); G_CALLBACK(icvOnClose), window );
#if defined(GTK_VERSION3) #if defined(GTK_VERSION3)
@ -1076,7 +1089,12 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
G_CALLBACK(cvImageWidget_expose), window ); G_CALLBACK(cvImageWidget_expose), window );
#endif //GTK_VERSION3 #endif //GTK_VERSION3
gtk_widget_add_events (window->widget, GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK) ;
#if defined(GTK_VERSION3_4)
gtk_widget_add_events (window->widget, GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK) ;
#else
gtk_widget_add_events (window->widget, GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK) ;
#endif //GTK_VERSION3_4
gtk_widget_show( window->frame ); gtk_widget_show( window->frame );
gtk_window_set_title( GTK_WINDOW(window->frame), name ); gtk_window_set_title( GTK_WINDOW(window->frame), name );
@ -1085,11 +1103,11 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
hg_windows->prev = window; hg_windows->prev = window;
hg_windows = window; hg_windows = window;
gtk_window_set_resizable( GTK_WINDOW(window->frame), (flags & CV_WINDOW_AUTOSIZE) == 0 ); b_nautosize = ((flags & CV_WINDOW_AUTOSIZE) == 0);
gtk_window_set_resizable( GTK_WINDOW(window->frame), b_nautosize );
// allow window to be resized // allow window to be resized
if( (flags & CV_WINDOW_AUTOSIZE)==0 ){ if( b_nautosize ){
GdkGeometry geometry; GdkGeometry geometry;
geometry.min_width = 50; geometry.min_width = 50;
geometry.min_height = 50; geometry.min_height = 50;
@ -1817,7 +1835,7 @@ static gboolean icvOnKeyPress(GtkWidget* widget, GdkEventKey* event, gpointer us
{ {
int code = 0; int code = 0;
if ( (event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK && (event->keyval == GDK_s || event->keyval == GDK_S)) if ( BIT_ALLIN(event->state, GDK_CONTROL_MASK) && (event->keyval == GDK_s || event->keyval == GDK_S))
{ {
try try
{ {
@ -1901,7 +1919,7 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da
CvWindow* window = (CvWindow*)user_data; CvWindow* window = (CvWindow*)user_data;
CvPoint2D32f pt32f(-1., -1.); CvPoint2D32f pt32f(-1., -1.);
CvPoint pt(-1,-1); CvPoint pt(-1,-1);
int cv_event = -1, state = 0; int cv_event = -1, state = 0, flags = 0;
CvImageWidget * image_widget = CV_IMAGE_WIDGET( widget ); CvImageWidget * image_widget = CV_IMAGE_WIDGET( widget );
if( window->signature != CV_WINDOW_MAGIC_VAL || if( window->signature != CV_WINDOW_MAGIC_VAL ||
@ -1947,12 +1965,41 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da
} }
state = event_button->state; state = event_button->state;
} }
else if( event->type == GDK_SCROLL )
{
#if defined(GTK_VERSION3_4)
// NOTE: in current implementation doesn't possible to put into callback function delta_x and delta_y separetely
double delta = (event->scroll.delta_x + event->scroll.delta_y);
int orient = (event->scroll.delta_y!=0) ? CV_EVENT_MOUSEHWHEEL : CV_EVENT_MOUSEWHEEL;
#else
int orient = CV_EVENT_MOUSEWHEEL;
#endif //GTK_VERSION3_4
if( cv_event >= 0 ){ state = event->scroll.state;
switch(event->scroll.direction) {
#if defined(GTK_VERSION3_4)
case GDK_SCROLL_SMOOTH: flags |= (((int)delta << 16));
break;
#endif //GTK_VERSION3_4
case GDK_SCROLL_LEFT: orient = CV_EVENT_MOUSEHWHEEL;
case GDK_SCROLL_UP: flags |= ((-(int)1 << 16));
break;
case GDK_SCROLL_RIGHT: orient = CV_EVENT_MOUSEHWHEEL;
case GDK_SCROLL_DOWN: flags |= (((int)1 << 16));
break;
default: ;
};
cv_event = orient;
}
if( cv_event >= 0 )
{
// scale point if image is scaled // scale point if image is scaled
if( (image_widget->flags & CV_WINDOW_AUTOSIZE)==0 && if( (image_widget->flags & CV_WINDOW_AUTOSIZE)==0 &&
image_widget->original_image && image_widget->original_image &&
image_widget->scaled_image ){ image_widget->scaled_image )
{
// image origin is not necessarily at (0,0) // image origin is not necessarily at (0,0)
#if defined (GTK_VERSION3) #if defined (GTK_VERSION3)
int x0 = (gtk_widget_get_allocated_width(widget) - image_widget->scaled_image->cols)/2; int x0 = (gtk_widget_get_allocated_width(widget) - image_widget->scaled_image->cols)/2;
@ -1966,25 +2013,27 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da
pt.y = cvFloor( ((pt32f.y-y0)*image_widget->original_image->rows)/ pt.y = cvFloor( ((pt32f.y-y0)*image_widget->original_image->rows)/
image_widget->scaled_image->rows ); image_widget->scaled_image->rows );
} }
else{ else
{
pt = cvPointFrom32f( pt32f ); pt = cvPointFrom32f( pt32f );
} }
// if((unsigned)pt.x < (unsigned)(image_widget->original_image->width) && // if((unsigned)pt.x < (unsigned)(image_widget->original_image->width) &&
// (unsigned)pt.y < (unsigned)(image_widget->original_image->height) ) // (unsigned)pt.y < (unsigned)(image_widget->original_image->height) )
{ {
int flags = (state & GDK_SHIFT_MASK ? CV_EVENT_FLAG_SHIFTKEY : 0) | flags |= BIT_MAP(state, GDK_SHIFT_MASK, CV_EVENT_FLAG_SHIFTKEY) |
(state & GDK_CONTROL_MASK ? CV_EVENT_FLAG_CTRLKEY : 0) | BIT_MAP(state, GDK_CONTROL_MASK, CV_EVENT_FLAG_CTRLKEY) |
(state & (GDK_MOD1_MASK|GDK_MOD2_MASK) ? CV_EVENT_FLAG_ALTKEY : 0) | BIT_MAP(state, GDK_MOD1_MASK, CV_EVENT_FLAG_ALTKEY) |
(state & GDK_BUTTON1_MASK ? CV_EVENT_FLAG_LBUTTON : 0) | BIT_MAP(state, GDK_MOD2_MASK, CV_EVENT_FLAG_ALTKEY) |
(state & GDK_BUTTON2_MASK ? CV_EVENT_FLAG_MBUTTON : 0) | BIT_MAP(state, GDK_BUTTON1_MASK, CV_EVENT_FLAG_LBUTTON) |
(state & GDK_BUTTON3_MASK ? CV_EVENT_FLAG_RBUTTON : 0); BIT_MAP(state, GDK_BUTTON2_MASK, CV_EVENT_FLAG_MBUTTON) |
BIT_MAP(state, GDK_BUTTON3_MASK, CV_EVENT_FLAG_RBUTTON);
window->on_mouse( cv_event, pt.x, pt.y, flags, window->on_mouse_param ); window->on_mouse( cv_event, pt.x, pt.y, flags, window->on_mouse_param );
} }
} }
return FALSE; return FALSE;
} }
static gboolean icvAlarm( gpointer user_data ) static gboolean icvAlarm( gpointer user_data )