The previous axis swapping code would oddly rely on the input coordinates remaining on untransformed device coordinates, while those are gotten on screen coordinates (hence rotated), this would cause swapping not to kick in, and result in swapped X/Y scaling to be applied to X/Y ranges. So make the axis swapping code be calculated upon screen coordinates, as the collected points already are, and swap the applied scalings if necessary. Also, the code that swapped coordinates before returning to the caller would scramble min/max values when swapping x/y. Fix that too, minimum and maximum should stay like that when swapping axes. https://bugzilla.gnome.org/show_bug.cgi?id=732442
191 lines
6.1 KiB
C
191 lines
6.1 KiB
C
/*
|
|
* Copyright (c) 2009 Tias Guns
|
|
* Copyright (c) 2009 Soren Hauberg
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "calibrator.h"
|
|
|
|
#define SWAP(valtype,x,y) \
|
|
G_STMT_START { \
|
|
valtype t; t = (x); x = (y); y = t; \
|
|
} G_STMT_END
|
|
|
|
/* reset clicks */
|
|
void
|
|
reset (struct Calib *c)
|
|
{
|
|
c->num_clicks = 0;
|
|
}
|
|
|
|
/* check whether the coordinates are along the respective axis */
|
|
static gboolean
|
|
along_axis (struct Calib *c,
|
|
int xy,
|
|
int x0,
|
|
int y0)
|
|
{
|
|
return ((abs(xy - x0) <= c->threshold_misclick) ||
|
|
(abs(xy - y0) <= c->threshold_misclick));
|
|
}
|
|
|
|
/* add a click with the given coordinates */
|
|
gboolean
|
|
add_click (struct Calib *c,
|
|
int x,
|
|
int y)
|
|
{
|
|
g_debug ("Trying to add click (%d, %d)", x, y);
|
|
|
|
/* Double-click detection */
|
|
if (c->threshold_doubleclick > 0 && c->num_clicks > 0)
|
|
{
|
|
int i = c->num_clicks-1;
|
|
while (i >= 0)
|
|
{
|
|
if (abs(x - c->clicked_x[i]) <= c->threshold_doubleclick &&
|
|
abs(y - c->clicked_y[i]) <= c->threshold_doubleclick)
|
|
{
|
|
g_debug ("Detected double-click, ignoring");
|
|
return FALSE;
|
|
}
|
|
i--;
|
|
}
|
|
}
|
|
|
|
/* Mis-click detection */
|
|
if (c->threshold_misclick > 0 && c->num_clicks > 0)
|
|
{
|
|
gboolean misclick = TRUE;
|
|
|
|
if (c->num_clicks == 1)
|
|
{
|
|
/* check that along one axis of first point */
|
|
if (along_axis(c, x,c->clicked_x[0],c->clicked_y[0]) ||
|
|
along_axis(c, y,c->clicked_x[0],c->clicked_y[0]))
|
|
{
|
|
misclick = FALSE;
|
|
}
|
|
}
|
|
else if (c->num_clicks == 2)
|
|
{
|
|
/* check that along other axis of first point than second point */
|
|
if ((along_axis(c, y,c->clicked_x[0],c->clicked_y[0]) &&
|
|
along_axis(c, c->clicked_x[1],c->clicked_x[0],c->clicked_y[0])) ||
|
|
(along_axis(c, x,c->clicked_x[0],c->clicked_y[0]) &&
|
|
along_axis(c, c->clicked_y[1],c->clicked_x[0],c->clicked_y[0])))
|
|
{
|
|
misclick = FALSE;
|
|
}
|
|
}
|
|
else if (c->num_clicks == 3)
|
|
{
|
|
/* check that along both axis of second and third point */
|
|
if ((along_axis(c, x,c->clicked_x[1],c->clicked_y[1]) &&
|
|
along_axis(c, y,c->clicked_x[2],c->clicked_y[2])) ||
|
|
(along_axis(c, y,c->clicked_x[1],c->clicked_y[1]) &&
|
|
along_axis(c, x,c->clicked_x[2],c->clicked_y[2])))
|
|
{
|
|
misclick = FALSE;
|
|
}
|
|
}
|
|
|
|
if (misclick)
|
|
{
|
|
g_debug ("Detected misclick, resetting");
|
|
reset(c);
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
g_debug ("Click (%d, %d) added", x, y);
|
|
c->clicked_x[c->num_clicks] = x;
|
|
c->clicked_y[c->num_clicks] = y;
|
|
c->num_clicks++;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/* calculate and apply the calibration */
|
|
gboolean
|
|
finish (struct Calib *c,
|
|
XYinfo *new_axis,
|
|
gboolean *swap)
|
|
{
|
|
gboolean swap_xy;
|
|
float scale_x;
|
|
float scale_y;
|
|
int delta_x;
|
|
int delta_y;
|
|
XYinfo axis = {-1, -1, -1, -1};
|
|
|
|
if (c->num_clicks != 4)
|
|
return FALSE;
|
|
|
|
/* Should x and y be swapped? If the device and output are wider
|
|
* towards different axes, swapping must be performed
|
|
*/
|
|
swap_xy = (c->geometry.width > c->geometry.height) !=
|
|
((c->old_axis.x_max - c->old_axis.x_min) > (c->old_axis.y_max - c->old_axis.y_min));
|
|
|
|
if (swap_xy)
|
|
SWAP (int, c->geometry.width, c->geometry.height);
|
|
|
|
/* Compute min/max coordinates. */
|
|
/* These are scaled using the values of old_axis */
|
|
scale_x = (c->old_axis.x_max - c->old_axis.x_min)/(float)c->geometry.width;
|
|
scale_y = (c->old_axis.y_max - c->old_axis.y_min)/(float)c->geometry.height;
|
|
|
|
/* Swap back for usage with the collected click points, which are in screen
|
|
* coordinates, hence possibly rotated.
|
|
*/
|
|
if (swap_xy)
|
|
SWAP(gdouble, scale_x, scale_y);
|
|
|
|
axis.x_min = ((((c->clicked_x[UL] + c->clicked_x[LL]) / 2)) * scale_x) + c->old_axis.x_min;
|
|
axis.x_max = ((((c->clicked_x[UR] + c->clicked_x[LR]) / 2)) * scale_x) + c->old_axis.x_min;
|
|
axis.y_min = ((((c->clicked_y[UL] + c->clicked_y[UR]) / 2)) * scale_y) + c->old_axis.y_min;
|
|
axis.y_max = ((((c->clicked_y[LL] + c->clicked_y[LR]) / 2)) * scale_y) + c->old_axis.y_min;
|
|
|
|
/* Add/subtract the offset that comes from not having the points in the
|
|
* corners (using the same coordinate system they are currently in)
|
|
*/
|
|
delta_x = (axis.x_max - axis.x_min) / (float)(NUM_BLOCKS - 2);
|
|
axis.x_min -= delta_x;
|
|
axis.x_max += delta_x;
|
|
delta_y = (axis.y_max - axis.y_min) / (float)(NUM_BLOCKS - 2);
|
|
axis.y_min -= delta_y;
|
|
axis.y_max += delta_y;
|
|
|
|
/* If x and y has to be swapped we also have to swap the parameters */
|
|
if (swap_xy)
|
|
{
|
|
SWAP (int, axis.x_min, axis.y_min);
|
|
SWAP (int, axis.x_max, axis.y_max);
|
|
}
|
|
|
|
*new_axis = axis;
|
|
*swap = swap_xy;
|
|
|
|
return TRUE;
|
|
}
|
|
|