da6086636b
Add a GimpTransformGridTool::matrix_to_info() virtual function,
which should extract the tool-specific transformation parameters
given a transformation matrix, and the old parameter set (which is
needed in some tools, to derive the parameters that aren't encoded
in the matrix, such as the pivot point). The transformation matrix
can be any combination of matrices calculated by the tool, and
their inverses. Subclasses should only implement this function if
every such matrix can be mapped back to transformation parameters.
This is currently the case for all the transform-grid tools, except
for the shear tool (since it only supports shearing along one of
the horizontal or the vertical directions, however, the combined
matrix may require shearing in both directions).
When a transform-grid tool implements this function, show a chain-
button between the two transform-direction radio-buttons in the
tool options. When the chain-button is linked, whenever the
transform corresponding to the active direction is modified, adjust
the transform corresponding to the non-active direction such that
the overall transform remains the same.
One notable workflow that this enables is transforming a layer
while adjusting a different area than its boundary, by first
defining the area while the transform-directions are linked, and
then transforming the area while the transform-directions are
unlinked.
(cherry picked from commit 39e23267f7)
385 lines
15 KiB
C
385 lines
15 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gegl.h>
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpmath/gimpmath.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "tools-types.h"
|
|
|
|
#include "widgets/gimphelp-ids.h"
|
|
#include "widgets/gimpwidgets-utils.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
#include "display/gimptoolhandlegrid.h"
|
|
#include "display/gimptoolgui.h"
|
|
|
|
#include "gimphandletransformoptions.h"
|
|
#include "gimphandletransformtool.h"
|
|
#include "gimptoolcontrol.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
/* the transformation is defined by 8 points:
|
|
*
|
|
* 4 points on the original image and 4 corresponding points on the
|
|
* transformed image. The first N_HANDLES points on the transformed
|
|
* image are visible as handles.
|
|
*
|
|
* For these handles, the constants TRANSFORM_HANDLE_N,
|
|
* TRANSFORM_HANDLE_S, TRANSFORM_HANDLE_E and TRANSFORM_HANDLE_W are
|
|
* used. Actually, it makes no sense to name the handles with north,
|
|
* south, east, and west. But this way, we don't need to define even
|
|
* more enum constants.
|
|
*/
|
|
|
|
/* index into trans_info array */
|
|
enum
|
|
{
|
|
X0,
|
|
Y0,
|
|
X1,
|
|
Y1,
|
|
X2,
|
|
Y2,
|
|
X3,
|
|
Y3,
|
|
OX0,
|
|
OY0,
|
|
OX1,
|
|
OY1,
|
|
OX2,
|
|
OY2,
|
|
OX3,
|
|
OY3,
|
|
N_HANDLES
|
|
};
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static void gimp_handle_transform_tool_modifier_key (GimpTool *tool,
|
|
GdkModifierType key,
|
|
gboolean press,
|
|
GdkModifierType state,
|
|
GimpDisplay *display);
|
|
|
|
static void gimp_handle_transform_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
|
|
const GimpMatrix3 *transform);
|
|
static void gimp_handle_transform_tool_prepare (GimpTransformGridTool *tg_tool);
|
|
static GimpToolWidget * gimp_handle_transform_tool_get_widget (GimpTransformGridTool *tg_tool);
|
|
static void gimp_handle_transform_tool_update_widget (GimpTransformGridTool *tg_tool);
|
|
static void gimp_handle_transform_tool_widget_changed (GimpTransformGridTool *tg_tool);
|
|
|
|
static void gimp_handle_transform_tool_info_to_points (GimpGenericTransformTool *generic);
|
|
|
|
|
|
G_DEFINE_TYPE (GimpHandleTransformTool, gimp_handle_transform_tool,
|
|
GIMP_TYPE_GENERIC_TRANSFORM_TOOL)
|
|
|
|
#define parent_class gimp_handle_transform_tool_parent_class
|
|
|
|
|
|
void
|
|
gimp_handle_transform_tool_register (GimpToolRegisterCallback callback,
|
|
gpointer data)
|
|
{
|
|
(* callback) (GIMP_TYPE_HANDLE_TRANSFORM_TOOL,
|
|
GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS,
|
|
gimp_handle_transform_options_gui,
|
|
GIMP_CONTEXT_PROP_MASK_BACKGROUND,
|
|
"gimp-handle-transform-tool",
|
|
_("Handle Transform"),
|
|
_("Handle Transform Tool: "
|
|
"Deform the layer, selection or path with handles"),
|
|
N_("_Handle Transform"), "<shift>L",
|
|
NULL, GIMP_HELP_TOOL_HANDLE_TRANSFORM,
|
|
GIMP_ICON_TOOL_HANDLE_TRANSFORM,
|
|
data);
|
|
}
|
|
|
|
static void
|
|
gimp_handle_transform_tool_class_init (GimpHandleTransformToolClass *klass)
|
|
{
|
|
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
|
|
GimpTransformToolClass *tr_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
|
|
GimpTransformGridToolClass *tg_class = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
|
|
GimpGenericTransformToolClass *generic_class = GIMP_GENERIC_TRANSFORM_TOOL_CLASS (klass);
|
|
|
|
tool_class->modifier_key = gimp_handle_transform_tool_modifier_key;
|
|
|
|
tg_class->matrix_to_info = gimp_handle_transform_tool_matrix_to_info;
|
|
tg_class->prepare = gimp_handle_transform_tool_prepare;
|
|
tg_class->get_widget = gimp_handle_transform_tool_get_widget;
|
|
tg_class->update_widget = gimp_handle_transform_tool_update_widget;
|
|
tg_class->widget_changed = gimp_handle_transform_tool_widget_changed;
|
|
|
|
generic_class->info_to_points = gimp_handle_transform_tool_info_to_points;
|
|
|
|
tr_class->undo_desc = C_("undo-type", "Handle transform");
|
|
tr_class->progress_text = _("Handle transformation");
|
|
}
|
|
|
|
static void
|
|
gimp_handle_transform_tool_init (GimpHandleTransformTool *ht_tool)
|
|
{
|
|
ht_tool->saved_handle_mode = GIMP_HANDLE_MODE_ADD_TRANSFORM;
|
|
}
|
|
|
|
static void
|
|
gimp_handle_transform_tool_modifier_key (GimpTool *tool,
|
|
GdkModifierType key,
|
|
gboolean press,
|
|
GdkModifierType state,
|
|
GimpDisplay *display)
|
|
{
|
|
GimpHandleTransformTool *ht_tool = GIMP_HANDLE_TRANSFORM_TOOL (tool);
|
|
GimpHandleTransformOptions *options;
|
|
GdkModifierType shift = gimp_get_extend_selection_mask ();
|
|
GdkModifierType ctrl = gimp_get_constrain_behavior_mask ();
|
|
GimpTransformHandleMode handle_mode;
|
|
|
|
options = GIMP_HANDLE_TRANSFORM_TOOL_GET_OPTIONS (tool);
|
|
|
|
handle_mode = options->handle_mode;
|
|
|
|
if (press)
|
|
{
|
|
if (key == (state & (shift | ctrl)))
|
|
{
|
|
/* first modifier pressed */
|
|
ht_tool->saved_handle_mode = options->handle_mode;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (! (state & (shift | ctrl)))
|
|
{
|
|
/* last modifier released */
|
|
handle_mode = ht_tool->saved_handle_mode;
|
|
}
|
|
}
|
|
|
|
if (state & shift)
|
|
{
|
|
handle_mode = GIMP_HANDLE_MODE_MOVE;
|
|
}
|
|
else if (state & ctrl)
|
|
{
|
|
handle_mode = GIMP_HANDLE_MODE_REMOVE;
|
|
}
|
|
|
|
if (handle_mode != options->handle_mode)
|
|
{
|
|
g_object_set (options,
|
|
"handle-mode", handle_mode,
|
|
NULL);
|
|
}
|
|
|
|
GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press,
|
|
state, display);
|
|
}
|
|
|
|
static void
|
|
gimp_handle_transform_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
|
|
const GimpMatrix3 *transform)
|
|
{
|
|
gimp_matrix3_transform_point (transform,
|
|
tg_tool->trans_info[OX0],
|
|
tg_tool->trans_info[OY0],
|
|
&tg_tool->trans_info[X0],
|
|
&tg_tool->trans_info[Y0]);
|
|
gimp_matrix3_transform_point (transform,
|
|
tg_tool->trans_info[OX1],
|
|
tg_tool->trans_info[OY1],
|
|
&tg_tool->trans_info[X1],
|
|
&tg_tool->trans_info[Y1]);
|
|
gimp_matrix3_transform_point (transform,
|
|
tg_tool->trans_info[OX2],
|
|
tg_tool->trans_info[OY2],
|
|
&tg_tool->trans_info[X2],
|
|
&tg_tool->trans_info[Y2]);
|
|
gimp_matrix3_transform_point (transform,
|
|
tg_tool->trans_info[OX3],
|
|
tg_tool->trans_info[OY3],
|
|
&tg_tool->trans_info[X3],
|
|
&tg_tool->trans_info[Y3]);
|
|
}
|
|
|
|
static void
|
|
gimp_handle_transform_tool_prepare (GimpTransformGridTool *tg_tool)
|
|
{
|
|
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
|
|
|
|
GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->prepare (tg_tool);
|
|
|
|
tg_tool->trans_info[X0] = (gdouble) tr_tool->x1;
|
|
tg_tool->trans_info[Y0] = (gdouble) tr_tool->y1;
|
|
tg_tool->trans_info[X1] = (gdouble) tr_tool->x2;
|
|
tg_tool->trans_info[Y1] = (gdouble) tr_tool->y1;
|
|
tg_tool->trans_info[X2] = (gdouble) tr_tool->x1;
|
|
tg_tool->trans_info[Y2] = (gdouble) tr_tool->y2;
|
|
tg_tool->trans_info[X3] = (gdouble) tr_tool->x2;
|
|
tg_tool->trans_info[Y3] = (gdouble) tr_tool->y2;
|
|
tg_tool->trans_info[OX0] = (gdouble) tr_tool->x1;
|
|
tg_tool->trans_info[OY0] = (gdouble) tr_tool->y1;
|
|
tg_tool->trans_info[OX1] = (gdouble) tr_tool->x2;
|
|
tg_tool->trans_info[OY1] = (gdouble) tr_tool->y1;
|
|
tg_tool->trans_info[OX2] = (gdouble) tr_tool->x1;
|
|
tg_tool->trans_info[OY2] = (gdouble) tr_tool->y2;
|
|
tg_tool->trans_info[OX3] = (gdouble) tr_tool->x2;
|
|
tg_tool->trans_info[OY3] = (gdouble) tr_tool->y2;
|
|
tg_tool->trans_info[N_HANDLES] = 0;
|
|
}
|
|
|
|
static GimpToolWidget *
|
|
gimp_handle_transform_tool_get_widget (GimpTransformGridTool *tg_tool)
|
|
{
|
|
GimpTool *tool = GIMP_TOOL (tg_tool);
|
|
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
|
|
GimpHandleTransformOptions *options;
|
|
GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
|
|
GimpToolWidget *widget;
|
|
|
|
options = GIMP_HANDLE_TRANSFORM_TOOL_GET_OPTIONS (tg_tool);
|
|
|
|
widget = gimp_tool_handle_grid_new (shell,
|
|
tr_tool->x1,
|
|
tr_tool->y1,
|
|
tr_tool->x2,
|
|
tr_tool->y2);
|
|
|
|
g_object_set (widget,
|
|
"n-handles", (gint) tg_tool->trans_info[N_HANDLES],
|
|
"orig-x1", tg_tool->trans_info[OX0],
|
|
"orig-y1", tg_tool->trans_info[OY0],
|
|
"orig-x2", tg_tool->trans_info[OX1],
|
|
"orig-y2", tg_tool->trans_info[OY1],
|
|
"orig-x3", tg_tool->trans_info[OX2],
|
|
"orig-y3", tg_tool->trans_info[OY2],
|
|
"orig-x4", tg_tool->trans_info[OX3],
|
|
"orig-y4", tg_tool->trans_info[OY3],
|
|
"trans-x1", tg_tool->trans_info[X0],
|
|
"trans-y1", tg_tool->trans_info[Y0],
|
|
"trans-x2", tg_tool->trans_info[X1],
|
|
"trans-y2", tg_tool->trans_info[Y1],
|
|
"trans-x3", tg_tool->trans_info[X2],
|
|
"trans-y3", tg_tool->trans_info[Y2],
|
|
"trans-x4", tg_tool->trans_info[X3],
|
|
"trans-y4", tg_tool->trans_info[Y3],
|
|
NULL);
|
|
|
|
g_object_bind_property (G_OBJECT (options), "handle-mode",
|
|
G_OBJECT (widget), "handle-mode",
|
|
G_BINDING_SYNC_CREATE |
|
|
G_BINDING_BIDIRECTIONAL);
|
|
|
|
return widget;
|
|
}
|
|
|
|
static void
|
|
gimp_handle_transform_tool_update_widget (GimpTransformGridTool *tg_tool)
|
|
{
|
|
GimpMatrix3 transform;
|
|
gboolean transform_valid;
|
|
|
|
GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
|
|
|
|
transform_valid = gimp_transform_grid_tool_info_to_matrix (tg_tool,
|
|
&transform);
|
|
|
|
g_object_set (tg_tool->widget,
|
|
"show-guides", transform_valid,
|
|
"n-handles", (gint) tg_tool->trans_info[N_HANDLES],
|
|
"orig-x1", tg_tool->trans_info[OX0],
|
|
"orig-y1", tg_tool->trans_info[OY0],
|
|
"orig-x2", tg_tool->trans_info[OX1],
|
|
"orig-y2", tg_tool->trans_info[OY1],
|
|
"orig-x3", tg_tool->trans_info[OX2],
|
|
"orig-y3", tg_tool->trans_info[OY2],
|
|
"orig-x4", tg_tool->trans_info[OX3],
|
|
"orig-y4", tg_tool->trans_info[OY3],
|
|
"trans-x1", tg_tool->trans_info[X0],
|
|
"trans-y1", tg_tool->trans_info[Y0],
|
|
"trans-x2", tg_tool->trans_info[X1],
|
|
"trans-y2", tg_tool->trans_info[Y1],
|
|
"trans-x3", tg_tool->trans_info[X2],
|
|
"trans-y3", tg_tool->trans_info[Y2],
|
|
"trans-x4", tg_tool->trans_info[X3],
|
|
"trans-y4", tg_tool->trans_info[Y3],
|
|
NULL);
|
|
}
|
|
|
|
static void
|
|
gimp_handle_transform_tool_widget_changed (GimpTransformGridTool *tg_tool)
|
|
{
|
|
gint n_handles;
|
|
|
|
g_object_get (tg_tool->widget,
|
|
"n-handles", &n_handles,
|
|
"orig-x1", &tg_tool->trans_info[OX0],
|
|
"orig-y1", &tg_tool->trans_info[OY0],
|
|
"orig-x2", &tg_tool->trans_info[OX1],
|
|
"orig-y2", &tg_tool->trans_info[OY1],
|
|
"orig-x3", &tg_tool->trans_info[OX2],
|
|
"orig-y3", &tg_tool->trans_info[OY2],
|
|
"orig-x4", &tg_tool->trans_info[OX3],
|
|
"orig-y4", &tg_tool->trans_info[OY3],
|
|
"trans-x1", &tg_tool->trans_info[X0],
|
|
"trans-y1", &tg_tool->trans_info[Y0],
|
|
"trans-x2", &tg_tool->trans_info[X1],
|
|
"trans-y2", &tg_tool->trans_info[Y1],
|
|
"trans-x3", &tg_tool->trans_info[X2],
|
|
"trans-y3", &tg_tool->trans_info[Y2],
|
|
"trans-x4", &tg_tool->trans_info[X3],
|
|
"trans-y4", &tg_tool->trans_info[Y3],
|
|
NULL);
|
|
|
|
tg_tool->trans_info[N_HANDLES] = n_handles;
|
|
|
|
GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
|
|
}
|
|
|
|
static void
|
|
gimp_handle_transform_tool_info_to_points (GimpGenericTransformTool *generic)
|
|
{
|
|
GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (generic);
|
|
|
|
generic->input_points[0] = (GimpVector2) {tg_tool->trans_info[OX0],
|
|
tg_tool->trans_info[OY0]};
|
|
generic->input_points[1] = (GimpVector2) {tg_tool->trans_info[OX1],
|
|
tg_tool->trans_info[OY1]};
|
|
generic->input_points[2] = (GimpVector2) {tg_tool->trans_info[OX2],
|
|
tg_tool->trans_info[OY2]};
|
|
generic->input_points[3] = (GimpVector2) {tg_tool->trans_info[OX3],
|
|
tg_tool->trans_info[OY3]};
|
|
|
|
generic->output_points[0] = (GimpVector2) {tg_tool->trans_info[X0],
|
|
tg_tool->trans_info[Y0]};
|
|
generic->output_points[1] = (GimpVector2) {tg_tool->trans_info[X1],
|
|
tg_tool->trans_info[Y1]};
|
|
generic->output_points[2] = (GimpVector2) {tg_tool->trans_info[X2],
|
|
tg_tool->trans_info[Y2]};
|
|
generic->output_points[3] = (GimpVector2) {tg_tool->trans_info[X3],
|
|
tg_tool->trans_info[Y3]};
|
|
}
|