dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Gimp/app/tools/gimpunifiedtransformtool.c

277 lines
11 KiB
C
Raw Normal View History

transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
/* 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
Change the license URL from http://www.gnu.org/licenses/ to https://
2018-07-11 14:47:19 -07:00
* along with this program. If not, see <https://www.gnu.org/licenses/>.
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
*/
#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 "display/gimpdisplay.h"
app: use a GimpToolGui in GimpTransformTool
2013-06-07 02:52:48 -07:00
#include "display/gimptoolgui.h"
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
#include "display/gimptooltransformgrid.h"
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
#include "gimptoolcontrol.h"
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
#include "gimptransformgridoptions.h"
app: some cleanup in GimpTransformTool and subclasses - formatting - rename some GimpTransformTool members - add member "does_persoective" and don't include subclasses - handle drawing cleanup
2015-03-23 15:18:28 -07:00
#include "gimpunifiedtransformtool.h"
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
#include "gimp-intl.h"
/* index into trans_info array */
enum
{
X0,
Y0,
X1,
Y1,
X2,
Y2,
X3,
Y3,
PIVOT_X,
PIVOT_Y,
};
/* local function prototypes */
app: in GimpTransformGridTool, allow linking forward/backward transforms 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 39e23267f7ac76030f02e5f68bf7994a02bb81a1)
2019-02-04 12:33:44 -08:00
static void gimp_unified_transform_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
const GimpMatrix3 *transform);
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
static void gimp_unified_transform_tool_prepare (GimpTransformGridTool *tg_tool);
static GimpToolWidget * gimp_unified_transform_tool_get_widget (GimpTransformGridTool *tg_tool);
app: clean up GimpTransformGridTool; adapt subclasses Get rid of GimpTransformGridTool::recalc_matrix() and gimp_transform_grid_tool_recalc_matrix(), and have GimpTransformGridTool and its subclasses use GimpTransformTool::recalc_matrix() and gimp_transform_tool_recalc_matrix() directly instead. In order to break the GimpToolWidget::changed/ GimpTransformTool::recalc_matrix() loop, add a GimpTransformGridTool::update_widget() vfunc, which subclasses should override to update their tool-widget (instead of doing this in ::recalc_matrix()), and ::widget_changed(), which is called when the tool-widget changes (and which subclasses should override instead of connecting to the tool-widget's "changed" signal directly.) GimpTransformGridTool calls these functions as necessary, instead of relying on extra parameters passed to recalc_matrix(). Adapt all the direct and indirect subclasses of GimpTransformGridTool to the change. (cherry picked from commit 6a3fc6c1b932d552443e8fd4ff5c0ca71fdf95ce)
2018-06-15 12:42:19 -07:00
static void gimp_unified_transform_tool_update_widget (GimpTransformGridTool *tg_tool);
static void gimp_unified_transform_tool_widget_changed (GimpTransformGridTool *tg_tool);
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
app: in GimpTransformGridTool, allow simultaneous forward and backward transforms 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 de8e81f81f356a704aba345e87c460e542570155)
2019-02-04 07:30:18 -08:00
static void gimp_unified_transform_tool_info_to_points (GimpGenericTransformTool *generic);
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
transformtool: temp hack to fiddle with drawing interface
2012-06-12 16:43:24 -07:00
G_DEFINE_TYPE (GimpUnifiedTransformTool, gimp_unified_transform_tool,
app: port relevant transform tools to GimpGenericTransformTool Derive GimpUnifiedTransformTool, GimpPerspectiveTool, and GimpHandleTransformTool from GimpGenericTransformTool, eliminating their common logic. Remove gimp_transform_matrix_handles(), which is no longer used.
2018-01-27 04:21:39 -08:00
GIMP_TYPE_GENERIC_TRANSFORM_TOOL)
#define parent_class gimp_unified_transform_tool_parent_class
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
void
gimp_unified_transform_tool_register (GimpToolRegisterCallback callback,
gpointer data)
{
(* callback) (GIMP_TYPE_UNIFIED_TRANSFORM_TOOL,
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
GIMP_TYPE_TRANSFORM_GRID_OPTIONS,
gimp_transform_grid_options_gui,
app: rename all values of enum GimpContextPropMask from GIMP_CONTEXT_FOO_MASK to GIMP_CONTEXT_PROP_MASK_FOO. Also rename the FIRST and LAST values of enum GimpContextPropType.
2015-09-08 12:18:49 -07:00
GIMP_CONTEXT_PROP_MASK_BACKGROUND,
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
"gimp-unified-transform-tool",
transformtool: temp hack to fiddle with drawing interface
2012-06-12 16:43:24 -07:00
_("Unified Transform"),
_("Unified Transform Tool: "
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
"Transform the layer, selection or path"),
Bug 791949 - Please ind Shift+T to the Unified Transform Tool Clean up transform tool keyboard shortcuts (things move around by stealing Shift+t from the scale tool): Shift+T Unified Transform (was Shift+L) Shift+S Scale (was Shift+T) Shift+H Shear (was Shift+S) Shift+L Handle Transform (was Ctrl+Shift+H)
2018-01-03 09:02:28 -08:00
N_("_Unified Transform"), "<shift>T",
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
NULL, GIMP_HELP_TOOL_UNIFIED_TRANSFORM,
libgimpwidgets, *: deprecating stock IDs for good, part one... Remove all stock items added since 2.8, restore accidentially removed ones, and rename the newly added GIMP_STOCK_* defines to GIMP_ICON_*. (will move to having GIMP_ICON_* defines instead of magic hardcoded strings for all icons).
2017-02-28 10:31:27 -08:00
GIMP_ICON_TOOL_UNIFIED_TRANSFORM,
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
data);
}
static void
transformtool: temp hack to fiddle with drawing interface
2012-06-12 16:43:24 -07:00
gimp_unified_transform_tool_class_init (GimpUnifiedTransformToolClass *klass)
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
{
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
GimpTransformToolClass *tr_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
GimpTransformGridToolClass *tg_class = GIMP_TRANSFORM_GRID_TOOL_CLASS (klass);
app: port relevant transform tools to GimpGenericTransformTool Derive GimpUnifiedTransformTool, GimpPerspectiveTool, and GimpHandleTransformTool from GimpGenericTransformTool, eliminating their common logic. Remove gimp_transform_matrix_handles(), which is no longer used.
2018-01-27 04:21:39 -08:00
GimpGenericTransformToolClass *generic_class = GIMP_GENERIC_TRANSFORM_TOOL_CLASS (klass);
app: in GimpTransformGridTool, allow linking forward/backward transforms 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 39e23267f7ac76030f02e5f68bf7994a02bb81a1)
2019-02-04 12:33:44 -08:00
tg_class->matrix_to_info = gimp_unified_transform_tool_matrix_to_info;
app: in GimpTransformGridTool, allow simultaneous forward and backward transforms 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 de8e81f81f356a704aba345e87c460e542570155)
2019-02-04 07:30:18 -08:00
tg_class->prepare = gimp_unified_transform_tool_prepare;
tg_class->get_widget = gimp_unified_transform_tool_get_widget;
tg_class->update_widget = gimp_unified_transform_tool_update_widget;
tg_class->widget_changed = gimp_unified_transform_tool_widget_changed;
app: port relevant transform tools to GimpGenericTransformTool Derive GimpUnifiedTransformTool, GimpPerspectiveTool, and GimpHandleTransformTool from GimpGenericTransformTool, eliminating their common logic. Remove gimp_transform_matrix_handles(), which is no longer used.
2018-01-27 04:21:39 -08:00
app: in GimpTransformGridTool, allow simultaneous forward and backward transforms 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 de8e81f81f356a704aba345e87c460e542570155)
2019-02-04 07:30:18 -08:00
generic_class->info_to_points = gimp_unified_transform_tool_info_to_points;
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
app: in GimpTransformGridTool, allow simultaneous forward and backward transforms 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 de8e81f81f356a704aba345e87c460e542570155)
2019-02-04 07:30:18 -08:00
tr_class->undo_desc = C_("undo-type", "Unified Transform");
tr_class->progress_text = _("Unified transform");
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
}
static void
transformtool: temp hack to fiddle with drawing interface
2012-06-12 16:43:24 -07:00
gimp_unified_transform_tool_init (GimpUnifiedTransformTool *unified_tool)
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
{
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
}
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
app: in GimpTransformGridTool, allow linking forward/backward transforms 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 39e23267f7ac76030f02e5f68bf7994a02bb81a1)
2019-02-04 12:33:44 -08:00
static void
gimp_unified_transform_tool_matrix_to_info (GimpTransformGridTool *tg_tool,
const GimpMatrix3 *transform)
{
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
GimpMatrix3 transfer;
gimp_transform_grid_tool_info_to_matrix (tg_tool, &transfer);
gimp_matrix3_invert (&transfer);
gimp_matrix3_mult (transform, &transfer);
gimp_matrix3_transform_point (&transfer,
tg_tool->trans_info[PIVOT_X],
tg_tool->trans_info[PIVOT_Y],
&tg_tool->trans_info[PIVOT_X],
&tg_tool->trans_info[PIVOT_Y]);
gimp_matrix3_transform_point (transform,
tr_tool->x1,
tr_tool->y1,
&tg_tool->trans_info[X0],
&tg_tool->trans_info[Y0]);
gimp_matrix3_transform_point (transform,
tr_tool->x2,
tr_tool->y1,
&tg_tool->trans_info[X1],
&tg_tool->trans_info[Y1]);
gimp_matrix3_transform_point (transform,
tr_tool->x1,
tr_tool->y2,
&tg_tool->trans_info[X2],
&tg_tool->trans_info[Y2]);
gimp_matrix3_transform_point (transform,
tr_tool->x2,
tr_tool->y2,
&tg_tool->trans_info[X3],
&tg_tool->trans_info[Y3]);
}
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
static void
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
gimp_unified_transform_tool_prepare (GimpTransformGridTool *tg_tool)
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
{
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->prepare (tg_tool);
tg_tool->trans_info[PIVOT_X] = (gdouble) (tr_tool->x1 + tr_tool->x2) / 2.0;
tg_tool->trans_info[PIVOT_Y] = (gdouble) (tr_tool->y1 + tr_tool->y2) / 2.0;
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;
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
}
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
static GimpToolWidget *
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
gimp_unified_transform_tool_get_widget (GimpTransformGridTool *tg_tool)
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
{
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
GimpTool *tool = GIMP_TOOL (tg_tool);
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
GimpToolWidget *widget;
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
widget = gimp_tool_transform_grid_new (shell,
&tr_tool->transform,
tr_tool->x1,
tr_tool->y1,
tr_tool->x2,
app: manage the transform tools' grid properties in GimpTransformTool Simply use g_object_bind_property() to connect the grid properties of GimpTransformOoptions and GimpToolTransformGrid and remove all other grid property setting code.
2017-06-19 14:06:39 -07:00
tr_tool->y2);
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
g_object_set (widget,
"pivot-x", (tr_tool->x1 + tr_tool->x2) / 2.0,
"pivot-y", (tr_tool->y1 + tr_tool->y2) / 2.0,
"inside-function", GIMP_TRANSFORM_FUNCTION_MOVE,
"outside-function", GIMP_TRANSFORM_FUNCTION_ROTATE,
"use-corner-handles", TRUE,
"use-perspective-handles", TRUE,
"use-side-handles", TRUE,
"use-shear-handles", TRUE,
"use-pivot-handle", TRUE,
NULL);
return widget;
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
}
static void
app: clean up GimpTransformGridTool; adapt subclasses Get rid of GimpTransformGridTool::recalc_matrix() and gimp_transform_grid_tool_recalc_matrix(), and have GimpTransformGridTool and its subclasses use GimpTransformTool::recalc_matrix() and gimp_transform_tool_recalc_matrix() directly instead. In order to break the GimpToolWidget::changed/ GimpTransformTool::recalc_matrix() loop, add a GimpTransformGridTool::update_widget() vfunc, which subclasses should override to update their tool-widget (instead of doing this in ::recalc_matrix()), and ::widget_changed(), which is called when the tool-widget changes (and which subclasses should override instead of connecting to the tool-widget's "changed" signal directly.) GimpTransformGridTool calls these functions as necessary, instead of relying on extra parameters passed to recalc_matrix(). Adapt all the direct and indirect subclasses of GimpTransformGridTool to the change. (cherry picked from commit 6a3fc6c1b932d552443e8fd4ff5c0ca71fdf95ce)
2018-06-15 12:42:19 -07:00
gimp_unified_transform_tool_update_widget (GimpTransformGridTool *tg_tool)
transformtool: add old "new" unified transformation tool This is the proof of concept code I wrote before gsoc, with very naive behaviour and simple interface.
2011-08-05 15:00:35 -07:00
{
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
app: in GimpTransformGridTool, allow simultaneous forward and backward transforms 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 de8e81f81f356a704aba345e87c460e542570155)
2019-02-04 07:30:18 -08:00
GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->update_widget (tg_tool);
app: clean up GimpTransformGridTool; adapt subclasses Get rid of GimpTransformGridTool::recalc_matrix() and gimp_transform_grid_tool_recalc_matrix(), and have GimpTransformGridTool and its subclasses use GimpTransformTool::recalc_matrix() and gimp_transform_tool_recalc_matrix() directly instead. In order to break the GimpToolWidget::changed/ GimpTransformTool::recalc_matrix() loop, add a GimpTransformGridTool::update_widget() vfunc, which subclasses should override to update their tool-widget (instead of doing this in ::recalc_matrix()), and ::widget_changed(), which is called when the tool-widget changes (and which subclasses should override instead of connecting to the tool-widget's "changed" signal directly.) GimpTransformGridTool calls these functions as necessary, instead of relying on extra parameters passed to recalc_matrix(). Adapt all the direct and indirect subclasses of GimpTransformGridTool to the change. (cherry picked from commit 6a3fc6c1b932d552443e8fd4ff5c0ca71fdf95ce)
2018-06-15 12:42:19 -07:00
g_object_set (tg_tool->widget,
app: in GimpTransformGridTool, allow simultaneous forward and backward transforms 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 de8e81f81f356a704aba345e87c460e542570155)
2019-02-04 07:30:18 -08:00
"x1", (gdouble) tr_tool->x1,
"y1", (gdouble) tr_tool->y1,
"x2", (gdouble) tr_tool->x2,
"y2", (gdouble) tr_tool->y2,
"pivot-x", tg_tool->trans_info[PIVOT_X],
"pivot-y", tg_tool->trans_info[PIVOT_Y],
app: clean up GimpTransformGridTool; adapt subclasses Get rid of GimpTransformGridTool::recalc_matrix() and gimp_transform_grid_tool_recalc_matrix(), and have GimpTransformGridTool and its subclasses use GimpTransformTool::recalc_matrix() and gimp_transform_tool_recalc_matrix() directly instead. In order to break the GimpToolWidget::changed/ GimpTransformTool::recalc_matrix() loop, add a GimpTransformGridTool::update_widget() vfunc, which subclasses should override to update their tool-widget (instead of doing this in ::recalc_matrix()), and ::widget_changed(), which is called when the tool-widget changes (and which subclasses should override instead of connecting to the tool-widget's "changed" signal directly.) GimpTransformGridTool calls these functions as necessary, instead of relying on extra parameters passed to recalc_matrix(). Adapt all the direct and indirect subclasses of GimpTransformGridTool to the change. (cherry picked from commit 6a3fc6c1b932d552443e8fd4ff5c0ca71fdf95ce)
2018-06-15 12:42:19 -07:00
NULL);
app: port relevant transform tools to GimpGenericTransformTool Derive GimpUnifiedTransformTool, GimpPerspectiveTool, and GimpHandleTransformTool from GimpGenericTransformTool, eliminating their common logic. Remove gimp_transform_matrix_handles(), which is no longer used.
2018-01-27 04:21:39 -08:00
}
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
static void
app: clean up GimpTransformGridTool; adapt subclasses Get rid of GimpTransformGridTool::recalc_matrix() and gimp_transform_grid_tool_recalc_matrix(), and have GimpTransformGridTool and its subclasses use GimpTransformTool::recalc_matrix() and gimp_transform_tool_recalc_matrix() directly instead. In order to break the GimpToolWidget::changed/ GimpTransformTool::recalc_matrix() loop, add a GimpTransformGridTool::update_widget() vfunc, which subclasses should override to update their tool-widget (instead of doing this in ::recalc_matrix()), and ::widget_changed(), which is called when the tool-widget changes (and which subclasses should override instead of connecting to the tool-widget's "changed" signal directly.) GimpTransformGridTool calls these functions as necessary, instead of relying on extra parameters passed to recalc_matrix(). Adapt all the direct and indirect subclasses of GimpTransformGridTool to the change. (cherry picked from commit 6a3fc6c1b932d552443e8fd4ff5c0ca71fdf95ce)
2018-06-15 12:42:19 -07:00
gimp_unified_transform_tool_widget_changed (GimpTransformGridTool *tg_tool)
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
{
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tg_tool);
GimpMatrix3 *transform;
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
app: clean up GimpTransformGridTool; adapt subclasses Get rid of GimpTransformGridTool::recalc_matrix() and gimp_transform_grid_tool_recalc_matrix(), and have GimpTransformGridTool and its subclasses use GimpTransformTool::recalc_matrix() and gimp_transform_tool_recalc_matrix() directly instead. In order to break the GimpToolWidget::changed/ GimpTransformTool::recalc_matrix() loop, add a GimpTransformGridTool::update_widget() vfunc, which subclasses should override to update their tool-widget (instead of doing this in ::recalc_matrix()), and ::widget_changed(), which is called when the tool-widget changes (and which subclasses should override instead of connecting to the tool-widget's "changed" signal directly.) GimpTransformGridTool calls these functions as necessary, instead of relying on extra parameters passed to recalc_matrix(). Adapt all the direct and indirect subclasses of GimpTransformGridTool to the change. (cherry picked from commit 6a3fc6c1b932d552443e8fd4ff5c0ca71fdf95ce)
2018-06-15 12:42:19 -07:00
g_object_get (tg_tool->widget,
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
"transform", &transform,
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
"pivot-x", &tg_tool->trans_info[PIVOT_X],
"pivot-y", &tg_tool->trans_info[PIVOT_Y],
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
NULL);
gimp_matrix3_transform_point (transform,
tr_tool->x1, tr_tool->y1,
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
&tg_tool->trans_info[X0],
&tg_tool->trans_info[Y0]);
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
gimp_matrix3_transform_point (transform,
tr_tool->x2, tr_tool->y1,
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
&tg_tool->trans_info[X1],
&tg_tool->trans_info[Y1]);
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
gimp_matrix3_transform_point (transform,
tr_tool->x1, tr_tool->y2,
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
&tg_tool->trans_info[X2],
&tg_tool->trans_info[Y2]);
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
gimp_matrix3_transform_point (transform,
tr_tool->x2, tr_tool->y2,
app: add GimpTransformGridTool; derive most transform tools from it While most of our transform tools use an interactive transform grid, and have similar behavior, the flip tool is an odd one out. The new "auto straighten" function of the measure tool introduces another tool that performs transformations, while not behaving like the rest of the transform tools. Factor out the parts of GimpTransformTool that handle user interaction into GimpTransformGridTool (with corresponding GimpTransformGridOptions, and GimpTransformGridToolUndo), and only leave the basic transform functionality and options in GimpTransformTool (and GimpTransformOptions). Derive all the transform tools (and transform-tool base classes) that previously derived from GimpTransformTool, from GimpTransformGridTool. The one exception is GimpFlipTool, which still derives from GimpTransformTool directly. The next commit will derive GimpMeasureTool from GimpTransformTool as well.
2018-06-09 13:25:03 -07:00
&tg_tool->trans_info[X3],
&tg_tool->trans_info[Y3]);
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
g_free (transform);
app: clean up GimpTransformGridTool; adapt subclasses Get rid of GimpTransformGridTool::recalc_matrix() and gimp_transform_grid_tool_recalc_matrix(), and have GimpTransformGridTool and its subclasses use GimpTransformTool::recalc_matrix() and gimp_transform_tool_recalc_matrix() directly instead. In order to break the GimpToolWidget::changed/ GimpTransformTool::recalc_matrix() loop, add a GimpTransformGridTool::update_widget() vfunc, which subclasses should override to update their tool-widget (instead of doing this in ::recalc_matrix()), and ::widget_changed(), which is called when the tool-widget changes (and which subclasses should override instead of connecting to the tool-widget's "changed" signal directly.) GimpTransformGridTool calls these functions as necessary, instead of relying on extra parameters passed to recalc_matrix(). Adapt all the direct and indirect subclasses of GimpTransformGridTool to the change. (cherry picked from commit 6a3fc6c1b932d552443e8fd4ff5c0ca71fdf95ce)
2018-06-15 12:42:19 -07:00
GIMP_TRANSFORM_GRID_TOOL_CLASS (parent_class)->widget_changed (tg_tool);
}
static void
app: in GimpTransformGridTool, allow simultaneous forward and backward transforms 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 de8e81f81f356a704aba345e87c460e542570155)
2019-02-04 07:30:18 -08:00
gimp_unified_transform_tool_info_to_points (GimpGenericTransformTool *generic)
app: clean up GimpTransformGridTool; adapt subclasses Get rid of GimpTransformGridTool::recalc_matrix() and gimp_transform_grid_tool_recalc_matrix(), and have GimpTransformGridTool and its subclasses use GimpTransformTool::recalc_matrix() and gimp_transform_tool_recalc_matrix() directly instead. In order to break the GimpToolWidget::changed/ GimpTransformTool::recalc_matrix() loop, add a GimpTransformGridTool::update_widget() vfunc, which subclasses should override to update their tool-widget (instead of doing this in ::recalc_matrix()), and ::widget_changed(), which is called when the tool-widget changes (and which subclasses should override instead of connecting to the tool-widget's "changed" signal directly.) GimpTransformGridTool calls these functions as necessary, instead of relying on extra parameters passed to recalc_matrix(). Adapt all the direct and indirect subclasses of GimpTransformGridTool to the change. (cherry picked from commit 6a3fc6c1b932d552443e8fd4ff5c0ca71fdf95ce)
2018-06-15 12:42:19 -07:00
{
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (generic);
GimpTransformGridTool *tg_tool = GIMP_TRANSFORM_GRID_TOOL (generic);
generic->input_points[0] = (GimpVector2) {tr_tool->x1, tr_tool->y1};
generic->input_points[1] = (GimpVector2) {tr_tool->x2, tr_tool->y1};
generic->input_points[2] = (GimpVector2) {tr_tool->x1, tr_tool->y2};
generic->input_points[3] = (GimpVector2) {tr_tool->x2, tr_tool->y2};
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]};
app: use the newly added tool widgets in the transform tools
2017-06-16 18:02:01 -07:00
}
Reference in a new issue Copy permalink