ca06990828
In GimpTransformGridTool, allow performing simultaneous forward
(normal) and backward (corrective) transforms, by having each
transform direction operate on an independent set of parameters.
In other words, whereas the transform-grid tools previously had a
single transform, which could be applied either normally or
correctively using the "direction" tool-option, they now have two
independent transforms, one applied normally and the other
applied correctively, which are toggled using the "direction"
option. The overall transform is the combination of the backward
transform, followed by the forward transform.
Another way to think about it, is that the tool transforms a source
shape into a destination shape. The source shape is defined by the
backward transform, and the destination shape is defined by the
forward transform. Wherewas previously only one of these shapes
could be controlled (the other shape always being the item bounds),
it's now possible to control both shapes in a single transform.
The next commit will allow modifying both shapes simultaneously,
making this even more useful.
Note that since both transforms start off as the identity, using
only one of the transform directions has the same behavior as
before.
(cherry picked from commit de8e81f81f)
221 lines
7.5 KiB
C
221 lines
7.5 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 "tools-types.h"
|
|
|
|
#include "gimptoolcontrol.h"
|
|
#include "gimptransformgridtool.h"
|
|
#include "gimptransformgridtoolundo.h"
|
|
|
|
|
|
enum
|
|
{
|
|
PROP_0,
|
|
PROP_TRANSFORM_TOOL
|
|
};
|
|
|
|
|
|
static void gimp_transform_grid_tool_undo_constructed (GObject *object);
|
|
static void gimp_transform_grid_tool_undo_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec);
|
|
static void gimp_transform_grid_tool_undo_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec);
|
|
|
|
static void gimp_transform_grid_tool_undo_pop (GimpUndo *undo,
|
|
GimpUndoMode undo_mode,
|
|
GimpUndoAccumulator *accum);
|
|
static void gimp_transform_grid_tool_undo_free (GimpUndo *undo,
|
|
GimpUndoMode undo_mode);
|
|
|
|
|
|
G_DEFINE_TYPE (GimpTransformGridToolUndo, gimp_transform_grid_tool_undo, GIMP_TYPE_UNDO)
|
|
|
|
#define parent_class gimp_transform_grid_tool_undo_parent_class
|
|
|
|
|
|
static void
|
|
gimp_transform_grid_tool_undo_class_init (GimpTransformGridToolUndoClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
GimpUndoClass *undo_class = GIMP_UNDO_CLASS (klass);
|
|
|
|
object_class->constructed = gimp_transform_grid_tool_undo_constructed;
|
|
object_class->set_property = gimp_transform_grid_tool_undo_set_property;
|
|
object_class->get_property = gimp_transform_grid_tool_undo_get_property;
|
|
|
|
undo_class->pop = gimp_transform_grid_tool_undo_pop;
|
|
undo_class->free = gimp_transform_grid_tool_undo_free;
|
|
|
|
g_object_class_install_property (object_class, PROP_TRANSFORM_TOOL,
|
|
g_param_spec_object ("transform-tool",
|
|
NULL, NULL,
|
|
GIMP_TYPE_TRANSFORM_GRID_TOOL,
|
|
GIMP_PARAM_READWRITE |
|
|
G_PARAM_CONSTRUCT_ONLY));
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_tool_undo_init (GimpTransformGridToolUndo *undo)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_tool_undo_constructed (GObject *object)
|
|
{
|
|
GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (object);
|
|
GimpTransformGridTool *tg_tool;
|
|
|
|
G_OBJECT_CLASS (parent_class)->constructed (object);
|
|
|
|
gimp_assert (GIMP_IS_TRANSFORM_GRID_TOOL (tg_tool_undo->tg_tool));
|
|
|
|
tg_tool = tg_tool_undo->tg_tool;
|
|
|
|
memcpy (tg_tool_undo->trans_infos[GIMP_TRANSFORM_FORWARD],
|
|
tg_tool->init_trans_info, sizeof (TransInfo));
|
|
memcpy (tg_tool_undo->trans_infos[GIMP_TRANSFORM_BACKWARD],
|
|
tg_tool->init_trans_info, sizeof (TransInfo));
|
|
|
|
#if 0
|
|
if (tg_tool->original)
|
|
tg_tool_undo->original = tile_manager_ref (tg_tool->original);
|
|
#endif
|
|
|
|
g_object_add_weak_pointer (G_OBJECT (tg_tool_undo->tg_tool),
|
|
(gpointer) &tg_tool_undo->tg_tool);
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_tool_undo_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_TRANSFORM_TOOL:
|
|
tg_tool_undo->tg_tool = g_value_get_object (value);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_tool_undo_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_TRANSFORM_TOOL:
|
|
g_value_set_object (value, tg_tool_undo->tg_tool);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_tool_undo_pop (GimpUndo *undo,
|
|
GimpUndoMode undo_mode,
|
|
GimpUndoAccumulator *accum)
|
|
{
|
|
GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (undo);
|
|
|
|
GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
|
|
|
|
if (tg_tool_undo->tg_tool)
|
|
{
|
|
GimpTransformGridTool *tg_tool;
|
|
#if 0
|
|
TileManager *temp;
|
|
#endif
|
|
TransInfo temp_trans_infos[2];
|
|
|
|
tg_tool = tg_tool_undo->tg_tool;
|
|
|
|
/* swap the transformation information00 arrays */
|
|
memcpy (temp_trans_infos, tg_tool_undo->trans_infos,
|
|
sizeof (tg_tool->trans_infos));
|
|
memcpy (tg_tool_undo->trans_infos, tg_tool->trans_infos,
|
|
sizeof (tg_tool->trans_infos));
|
|
memcpy (tg_tool->trans_infos, temp_trans_infos,
|
|
sizeof (tg_tool->trans_infos));
|
|
|
|
#if 0
|
|
/* swap the original buffer--the source buffer for repeated transform_grids
|
|
*/
|
|
temp = tg_tool_undo->original;
|
|
tg_tool_undo->original = tg_tool->original;
|
|
tg_tool->original = temp;
|
|
#endif
|
|
|
|
#if 0
|
|
/* If we're re-implementing the first transform_grid, reactivate tool */
|
|
if (undo_mode == GIMP_UNDO_MODE_REDO && tg_tool->original)
|
|
{
|
|
gimp_tool_control_activate (GIMP_TOOL (tg_tool)->control);
|
|
|
|
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tg_tool));
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_transform_grid_tool_undo_free (GimpUndo *undo,
|
|
GimpUndoMode undo_mode)
|
|
{
|
|
GimpTransformGridToolUndo *tg_tool_undo = GIMP_TRANSFORM_GRID_TOOL_UNDO (undo);
|
|
|
|
if (tg_tool_undo->tg_tool)
|
|
{
|
|
g_object_remove_weak_pointer (G_OBJECT (tg_tool_undo->tg_tool),
|
|
(gpointer) &tg_tool_undo->tg_tool);
|
|
tg_tool_undo->tg_tool = NULL;
|
|
}
|
|
|
|
#if 0
|
|
if (tg_tool_undo->original)
|
|
{
|
|
tile_manager_unref (tg_tool_undo->original);
|
|
tg_tool_undo->original = NULL;
|
|
}
|
|
#endif
|
|
|
|
GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
|
|
}
|