callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: bring back the live transformed path in GimpTransformTool

Browse Source
This commit is contained in:
Michael Natterer
2017-06-19 22:13:50 +02:00
parent 546bbe1e14
commit 8ab11e7c18
2 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/tools/gimptransformtool.c
View File

@ -232,6 +232,8 @@ gimp_transform_tool_init (GimpTransformTool *tr_tool)
tr_tool->progress_text = _("Transforming"); tr_tool->progress_text = _("Transforming");
gimp_matrix3_identity (&tr_tool->transform); gimp_matrix3_identity (&tr_tool->transform);
tr_tool->strokes = g_ptr_array_new ();
} }
static void static void
@ -245,6 +247,12 @@ gimp_transform_tool_finalize (GObject *object)
tr_tool->gui = NULL; tr_tool->gui = NULL;
} }
if (tr_tool->strokes)
{
g_ptr_array_unref (tr_tool->strokes);
tr_tool->strokes = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -788,16 +796,14 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool); GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
GimpImage *image = gimp_display_get_image (tool->display); GimpImage *image = gimp_display_get_image (tool->display);
GimpMatrix3 matrix = tr_tool->transform; GimpMatrix3 matrix = tr_tool->transform;
GimpCanvasItem *item;
if (options->direction == GIMP_TRANSFORM_BACKWARD) if (options->direction == GIMP_TRANSFORM_BACKWARD)
gimp_matrix3_invert (&matrix); gimp_matrix3_invert (&matrix);
if (tr_tool->widget) if (tr_tool->widget)
{ {
GimpCanvasItem *item; gboolean show_preview = gimp_transform_options_show_preview (options);
gboolean show_preview;
show_preview = gimp_transform_options_show_preview (options);
tr_tool->preview = tr_tool->preview =
gimp_draw_tool_add_transform_preview (draw_tool, gimp_draw_tool_add_transform_preview (draw_tool,
@ -855,16 +861,12 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
} }
else if (options->type == GIMP_TRANSFORM_TYPE_PATH) else if (options->type == GIMP_TRANSFORM_TYPE_PATH)
{ {
GimpVectors *vectors; GimpVectors *vectors = gimp_image_get_active_vectors (image);
GimpStroke *stroke = NULL;
/* FIXME */
return;
vectors = gimp_image_get_active_vectors (image);
if (vectors) if (vectors)
{ {
GimpStroke *stroke = NULL;
while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke))) while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
{ {
GArray *coords; GArray *coords;
@ -874,21 +876,16 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
if (coords && coords->len) if (coords && coords->len)
{ {
gint i; item =
for (i = 0; i < coords->len; i++)
{
GimpCoords *curr = &g_array_index (coords, GimpCoords, i);
gimp_matrix3_transform_point (&matrix,
curr->x, curr->y,
&curr->x, &curr->y);
}
gimp_draw_tool_add_strokes (draw_tool, gimp_draw_tool_add_strokes (draw_tool,
&g_array_index (coords, &g_array_index (coords,
GimpCoords, 0), GimpCoords, 0),
coords->len, NULL, FALSE); coords->len, &matrix, FALSE);
g_ptr_array_add (tr_tool->strokes, item);
g_object_weak_ref (G_OBJECT (item),
(GWeakNotify) g_ptr_array_remove,
tr_tool->strokes);
} }
if (coords) if (coords)
@ -1127,6 +1124,7 @@ gimp_transform_tool_widget_changed (GimpToolWidget *widget,
{ {
GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool); GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
GimpMatrix3 matrix = tr_tool->transform; GimpMatrix3 matrix = tr_tool->transform;
gint i;
if (options->direction == GIMP_TRANSFORM_BACKWARD) if (options->direction == GIMP_TRANSFORM_BACKWARD)
gimp_matrix3_invert (&matrix); gimp_matrix3_invert (&matrix);
@ -1157,6 +1155,17 @@ gimp_transform_tool_widget_changed (GimpToolWidget *widget,
NULL); NULL);
gimp_canvas_item_end_change (tr_tool->boundary_out); gimp_canvas_item_end_change (tr_tool->boundary_out);
} }
for (i = 0; i < tr_tool->strokes->len; i++)
{
GimpCanvasItem *item = g_ptr_array_index (tr_tool->strokes, i);
gimp_canvas_item_begin_change (item);
g_object_set (item,
"transform", &matrix,
NULL);
gimp_canvas_item_end_change (item);
}
} }
static void static void

1
app/tools/gimptransformtool.h
View File

@ -72,6 +72,7 @@ struct _GimpTransformTool
GimpCanvasItem *preview; GimpCanvasItem *preview;
GimpCanvasItem *boundary_in; GimpCanvasItem *boundary_in;
GimpCanvasItem *boundary_out; GimpCanvasItem *boundary_out;
GPtrArray *strokes;
const gchar *progress_text; const gchar *progress_text;