[gimp/soc-2012-unified-transformation: 39/52] transformtool: Add a draw_gui method to the TransformTool class and remove some hack duplication
- From: Mikael Magnusson <mikachu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2012-unified-transformation: 39/52] transformtool: Add a draw_gui method to the TransformTool class and remove some hack duplication
- Date: Sat, 18 Aug 2012 17:30:51 +0000 (UTC)
commit 01bbacf6d30fb6054d590ef9f949470ecc7e7b56
Author: Mikael Magnusson <mikachu src gnome org>
Date: Sat Jul 21 13:09:16 2012 +0200
transformtool: Add a draw_gui method to the TransformTool class and remove some hack duplication
app/tools/gimptransformtool.c | 190 ++++++++++++++++---------------
app/tools/gimptransformtool.h | 29 +++--
app/tools/gimpunifiedtransformtool.c | 213 ++--------------------------------
3 files changed, 125 insertions(+), 307 deletions(-)
---
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index 9ded675..d975d8e 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -783,132 +783,140 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
gimp_transform_tool_handles_recalc (tr_tool, tool->display,
&handle_w, &handle_h);
- if (tr_tool->use_handles)
+ if (GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->draw_gui)
+ {
+ GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->draw_gui (tr_tool, handle_w, handle_h);
+ }
+ else
{
- /* draw the tool handles */
- tr_tool->handles[TRANSFORM_HANDLE_NW] =
- gimp_draw_tool_add_handle (draw_tool,
- GIMP_HANDLE_SQUARE,
- tr_tool->tx1, tr_tool->ty1,
- handle_w, handle_h,
- GIMP_HANDLE_ANCHOR_CENTER);
-
- tr_tool->handles[TRANSFORM_HANDLE_NE] =
- gimp_draw_tool_add_handle (draw_tool,
- GIMP_HANDLE_SQUARE,
- tr_tool->tx2, tr_tool->ty2,
- handle_w, handle_h,
- GIMP_HANDLE_ANCHOR_CENTER);
-
- tr_tool->handles[TRANSFORM_HANDLE_SW] =
- gimp_draw_tool_add_handle (draw_tool,
- GIMP_HANDLE_SQUARE,
- tr_tool->tx3, tr_tool->ty3,
- handle_w, handle_h,
- GIMP_HANDLE_ANCHOR_CENTER);
-
- tr_tool->handles[TRANSFORM_HANDLE_SE] =
- gimp_draw_tool_add_handle (draw_tool,
- GIMP_HANDLE_SQUARE,
- tr_tool->tx4, tr_tool->ty4,
- handle_w, handle_h,
- GIMP_HANDLE_ANCHOR_CENTER);
- if (tr_tool->use_mid_handles)
+ if (tr_tool->use_handles)
{
- gdouble x, y;
-
- x = (tr_tool->tx1 + tr_tool->tx2) / 2.0;
- y = (tr_tool->ty1 + tr_tool->ty2) / 2.0;
-
- tr_tool->handles[TRANSFORM_HANDLE_N] =
+ /* draw the tool handles */
+ tr_tool->handles[TRANSFORM_HANDLE_NW] =
gimp_draw_tool_add_handle (draw_tool,
GIMP_HANDLE_SQUARE,
- x, y,
+ tr_tool->tx1, tr_tool->ty1,
handle_w, handle_h,
GIMP_HANDLE_ANCHOR_CENTER);
- x = (tr_tool->tx2 + tr_tool->tx4) / 2.0;
- y = (tr_tool->ty2 + tr_tool->ty4) / 2.0;
-
- tr_tool->handles[TRANSFORM_HANDLE_E] =
+ tr_tool->handles[TRANSFORM_HANDLE_NE] =
gimp_draw_tool_add_handle (draw_tool,
GIMP_HANDLE_SQUARE,
- x, y,
+ tr_tool->tx2, tr_tool->ty2,
handle_w, handle_h,
GIMP_HANDLE_ANCHOR_CENTER);
- x = (tr_tool->tx3 + tr_tool->tx4) / 2.0;
- y = (tr_tool->ty3 + tr_tool->ty4) / 2.0;
-
- tr_tool->handles[TRANSFORM_HANDLE_S] =
+ tr_tool->handles[TRANSFORM_HANDLE_SW] =
gimp_draw_tool_add_handle (draw_tool,
GIMP_HANDLE_SQUARE,
- x, y,
+ tr_tool->tx3, tr_tool->ty3,
handle_w, handle_h,
GIMP_HANDLE_ANCHOR_CENTER);
- x = (tr_tool->tx3 + tr_tool->tx1) / 2.0;
- y = (tr_tool->ty3 + tr_tool->ty1) / 2.0;
-
- tr_tool->handles[TRANSFORM_HANDLE_W] =
+ tr_tool->handles[TRANSFORM_HANDLE_SE] =
gimp_draw_tool_add_handle (draw_tool,
GIMP_HANDLE_SQUARE,
- x, y,
+ tr_tool->tx4, tr_tool->ty4,
handle_w, handle_h,
GIMP_HANDLE_ANCHOR_CENTER);
+
+ if (tr_tool->use_mid_handles)
+ {
+ gdouble x, y;
+
+ x = (tr_tool->tx1 + tr_tool->tx2) / 2.0;
+ y = (tr_tool->ty1 + tr_tool->ty2) / 2.0;
+
+ tr_tool->handles[TRANSFORM_HANDLE_N] =
+ gimp_draw_tool_add_handle (draw_tool,
+ GIMP_HANDLE_SQUARE,
+ x, y,
+ handle_w, handle_h,
+ GIMP_HANDLE_ANCHOR_CENTER);
+
+ x = (tr_tool->tx2 + tr_tool->tx4) / 2.0;
+ y = (tr_tool->ty2 + tr_tool->ty4) / 2.0;
+
+ tr_tool->handles[TRANSFORM_HANDLE_E] =
+ gimp_draw_tool_add_handle (draw_tool,
+ GIMP_HANDLE_SQUARE,
+ x, y,
+ handle_w, handle_h,
+ GIMP_HANDLE_ANCHOR_CENTER);
+
+ x = (tr_tool->tx3 + tr_tool->tx4) / 2.0;
+ y = (tr_tool->ty3 + tr_tool->ty4) / 2.0;
+
+ tr_tool->handles[TRANSFORM_HANDLE_S] =
+ gimp_draw_tool_add_handle (draw_tool,
+ GIMP_HANDLE_SQUARE,
+ x, y,
+ handle_w, handle_h,
+ GIMP_HANDLE_ANCHOR_CENTER);
+
+ x = (tr_tool->tx3 + tr_tool->tx1) / 2.0;
+ y = (tr_tool->ty3 + tr_tool->ty1) / 2.0;
+
+ tr_tool->handles[TRANSFORM_HANDLE_W] =
+ gimp_draw_tool_add_handle (draw_tool,
+ GIMP_HANDLE_SQUARE,
+ x, y,
+ handle_w, handle_h,
+ GIMP_HANDLE_ANCHOR_CENTER);
+ }
}
- }
- if (tr_tool->use_pivot)
- {
- GimpCanvasGroup *stroke_group;
- gint d = MIN (handle_w, handle_h) * 2; /* so you can grab it from under the center handle */
+ if (tr_tool->use_pivot)
+ {
+ GimpCanvasGroup *stroke_group;
+ gint d = MIN (handle_w, handle_h) * 2; /* so you can grab it from under the center handle */
- stroke_group = gimp_draw_tool_add_stroke_group (draw_tool);
+ stroke_group = gimp_draw_tool_add_stroke_group (draw_tool);
- tr_tool->handles[TRANSFORM_HANDLE_PIVOT] = GIMP_CANVAS_ITEM (stroke_group);
+ tr_tool->handles[TRANSFORM_HANDLE_PIVOT] = GIMP_CANVAS_ITEM (stroke_group);
- gimp_draw_tool_push_group (draw_tool, stroke_group);
+ gimp_draw_tool_push_group (draw_tool, stroke_group);
- gimp_draw_tool_add_handle (draw_tool,
- GIMP_HANDLE_SQUARE,
- tr_tool->tpx, tr_tool->tpy,
- d, d,
- GIMP_HANDLE_ANCHOR_CENTER);
- gimp_draw_tool_add_handle (draw_tool,
- GIMP_HANDLE_CROSS,
- tr_tool->tpx, tr_tool->tpy,
- d, d,
- GIMP_HANDLE_ANCHOR_CENTER);
+ gimp_draw_tool_add_handle (draw_tool,
+ GIMP_HANDLE_SQUARE,
+ tr_tool->tpx, tr_tool->tpy,
+ d, d,
+ GIMP_HANDLE_ANCHOR_CENTER);
+ gimp_draw_tool_add_handle (draw_tool,
+ GIMP_HANDLE_CROSS,
+ tr_tool->tpx, tr_tool->tpy,
+ d, d,
+ GIMP_HANDLE_ANCHOR_CENTER);
- gimp_draw_tool_pop_group (draw_tool);
- }
+ gimp_draw_tool_pop_group (draw_tool);
+ }
- /* draw the center */
- if (tr_tool->use_center)
- {
- GimpCanvasGroup *stroke_group;
- gint d = MIN (handle_w, handle_h);
+ /* draw the center */
+ if (tr_tool->use_center)
+ {
+ GimpCanvasGroup *stroke_group;
+ gint d = MIN (handle_w, handle_h);
- stroke_group = gimp_draw_tool_add_stroke_group (draw_tool);
+ stroke_group = gimp_draw_tool_add_stroke_group (draw_tool);
- tr_tool->handles[TRANSFORM_HANDLE_CENTER] = GIMP_CANVAS_ITEM (stroke_group);
+ tr_tool->handles[TRANSFORM_HANDLE_CENTER] = GIMP_CANVAS_ITEM (stroke_group);
- gimp_draw_tool_push_group (draw_tool, stroke_group);
+ gimp_draw_tool_push_group (draw_tool, stroke_group);
- gimp_draw_tool_add_handle (draw_tool,
- GIMP_HANDLE_CIRCLE,
- tr_tool->tcx, tr_tool->tcy,
- d, d,
- GIMP_HANDLE_ANCHOR_CENTER);
- gimp_draw_tool_add_handle (draw_tool,
- GIMP_HANDLE_CROSS,
- tr_tool->tcx, tr_tool->tcy,
- d, d,
- GIMP_HANDLE_ANCHOR_CENTER);
+ gimp_draw_tool_add_handle (draw_tool,
+ GIMP_HANDLE_CIRCLE,
+ tr_tool->tcx, tr_tool->tcy,
+ d, d,
+ GIMP_HANDLE_ANCHOR_CENTER);
+ gimp_draw_tool_add_handle (draw_tool,
+ GIMP_HANDLE_CROSS,
+ tr_tool->tcx, tr_tool->tcy,
+ d, d,
+ GIMP_HANDLE_ANCHOR_CENTER);
- gimp_draw_tool_pop_group (draw_tool);
+ gimp_draw_tool_pop_group (draw_tool);
+ }
}
if (tr_tool->handles[tr_tool->function])
diff --git a/app/tools/gimptransformtool.h b/app/tools/gimptransformtool.h
index a4bbbef..2fdaa06 100644
--- a/app/tools/gimptransformtool.h
+++ b/app/tools/gimptransformtool.h
@@ -128,19 +128,22 @@ struct _GimpTransformToolClass
GimpDrawToolClass parent_class;
/* virtual functions */
- void (* dialog) (GimpTransformTool *tool);
- void (* dialog_update) (GimpTransformTool *tool);
- void (* prepare) (GimpTransformTool *tool);
- void (* motion) (GimpTransformTool *tool);
- void (* recalc_matrix) (GimpTransformTool *tool);
- gchar * (* get_undo_desc) (GimpTransformTool *tool);
- GeglBuffer * (* transform) (GimpTransformTool *tool,
- GimpItem *item,
- GeglBuffer *orig_buffer,
- gint orig_offset_x,
- gint orig_offset_y,
- gint *new_offset_x,
- gint *new_offset_y);
+ void (* dialog) (GimpTransformTool *tool);
+ void (* dialog_update) (GimpTransformTool *tool);
+ void (* prepare) (GimpTransformTool *tool);
+ void (* motion) (GimpTransformTool *tool);
+ void (* recalc_matrix) (GimpTransformTool *tool);
+ gchar * (* get_undo_desc) (GimpTransformTool *tool);
+ void (* draw_gui) (GimpTransformTool *tool,
+ gint handle_w,
+ gint handle_h);
+ GeglBuffer * (* transform) (GimpTransformTool *tool,
+ GimpItem *item,
+ GeglBuffer *orig_buffer,
+ gint orig_offset_x,
+ gint orig_offset_y,
+ gint *new_offset_x,
+ gint *new_offset_y);
};
diff --git a/app/tools/gimpunifiedtransformtool.c b/app/tools/gimpunifiedtransformtool.c
index 8267b5b..3c6c900 100644
--- a/app/tools/gimpunifiedtransformtool.c
+++ b/app/tools/gimpunifiedtransformtool.c
@@ -27,8 +27,6 @@
#include "tools-types.h"
-
-#include "core/gimpboundary.h"
#include "core/gimpchannel.h"
#include "core/gimp-transform-utils.h"
#include "core/gimpimage.h"
@@ -75,13 +73,15 @@ static void gimp_transform_tool_oper_update (GimpTool
GdkModifierType state,
gboolean proximity,
GimpDisplay *display);
-static void gimp_unified_transform_tool_draw (GimpDrawTool *draw_tool);
static void gimp_unified_transform_tool_dialog (GimpTransformTool *tr_tool);
static void gimp_unified_transform_tool_dialog_update (GimpTransformTool *tr_tool);
static void gimp_unified_transform_tool_prepare (GimpTransformTool *tr_tool);
static void gimp_unified_transform_tool_motion (GimpTransformTool *tr_tool);
static void gimp_unified_transform_tool_recalc_matrix (GimpTransformTool *tr_tool);
static gchar * gimp_unified_transform_tool_get_undo_desc (GimpTransformTool *tr_tool);
+static void gimp_unified_transform_tool_draw_gui (GimpTransformTool *draw_tool,
+ gint handle_w,
+ gint handle_h);
G_DEFINE_TYPE (GimpUnifiedTransformTool, gimp_unified_transform_tool,
@@ -111,7 +111,6 @@ gimp_unified_transform_tool_class_init (GimpUnifiedTransformToolClass *klass)
{
GimpTransformToolClass *trans_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
- GimpDrawToolClass *draw_class = GIMP_DRAW_TOOL_CLASS (klass);
trans_class->dialog = gimp_unified_transform_tool_dialog;
trans_class->dialog_update = gimp_unified_transform_tool_dialog_update;
@@ -119,10 +118,9 @@ gimp_unified_transform_tool_class_init (GimpUnifiedTransformToolClass *klass)
trans_class->motion = gimp_unified_transform_tool_motion;
trans_class->recalc_matrix = gimp_unified_transform_tool_recalc_matrix;
trans_class->get_undo_desc = gimp_unified_transform_tool_get_undo_desc;
+ trans_class->draw_gui = gimp_unified_transform_tool_draw_gui;
tool_class->oper_update = gimp_transform_tool_oper_update;
-
- draw_class->draw = gimp_unified_transform_tool_draw;
}
static void
@@ -198,86 +196,17 @@ gimp_transform_tool_oper_update (GimpTool *tool,
gimp_transform_tool_set_function (tr_tool, function);
}
-/* hack */
-static void
-gimp_transform_tool_handles_recalc (GimpTransformTool *tr_tool,
- GimpDisplay *display,
- gint *handle_w,
- gint *handle_h)
-{
- gint dx1, dy1;
- gint dx2, dy2;
- gint dx3, dy3;
- gint dx4, dy4;
- gint x1, y1;
- gint x2, y2;
-
- gimp_display_shell_transform_xy (gimp_display_get_shell (display),
- tr_tool->tx1, tr_tool->ty1,
- &dx1, &dy1);
- gimp_display_shell_transform_xy (gimp_display_get_shell (display),
- tr_tool->tx2, tr_tool->ty2,
- &dx2, &dy2);
- gimp_display_shell_transform_xy (gimp_display_get_shell (display),
- tr_tool->tx3, tr_tool->ty3,
- &dx3, &dy3);
- gimp_display_shell_transform_xy (gimp_display_get_shell (display),
- tr_tool->tx4, tr_tool->ty4,
- &dx4, &dy4);
-
- x1 = MIN4 (dx1, dx2, dx3, dx4);
- y1 = MIN4 (dy1, dy2, dy3, dy4);
- x2 = MAX4 (dx1, dx2, dx3, dx4);
- y2 = MAX4 (dy1, dy2, dy3, dy4);
-
- *handle_w = CLAMP ((x2 - x1) / 3,
- 6, GIMP_TOOL_HANDLE_SIZE_LARGE);
- *handle_h = CLAMP ((y2 - y1) / 3,
- 6, GIMP_TOOL_HANDLE_SIZE_LARGE);
-}
+
static void
-gimp_unified_transform_tool_draw (GimpDrawTool *draw_tool)
+gimp_unified_transform_tool_draw_gui (GimpTransformTool *tr_tool,
+ gint handle_w,
+ gint handle_h)
{
- GimpTool *tool = GIMP_TOOL (draw_tool);
- GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (draw_tool);
- GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tool);
- GimpImage *image = gimp_display_get_image (tool->display);
+ GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tr_tool);
GimpCanvasGroup *stroke_group;
- gint handle_w, handle_h;
- gint i, d;
+ gint d;
gdouble x, y;
- for (i = 0; i < G_N_ELEMENTS (tr_tool->handles); i++)
- tr_tool->handles[i] = NULL;
-
- if (tr_tool->use_grid)
- {
- if (gimp_transform_options_show_preview (options))
- {
- gimp_draw_tool_add_transform_preview (draw_tool,
- tool->drawable,
- &tr_tool->transform,
- tr_tool->x1,
- tr_tool->y1,
- tr_tool->x2,
- tr_tool->y2,
- TRUE,
- options->preview_opacity);
- }
-
- gimp_draw_tool_add_transform_guides (draw_tool,
- &tr_tool->transform,
- options->grid_type,
- options->grid_size,
- tr_tool->x1,
- tr_tool->y1,
- tr_tool->x2,
- tr_tool->y2);
- }
-
- gimp_transform_tool_handles_recalc (tr_tool, tool->display,
- &handle_w, &handle_h);
-
/* draw the scale handles */
tr_tool->handles[TRANSFORM_HANDLE_NW] =
gimp_draw_tool_add_handle (draw_tool,
@@ -483,128 +412,6 @@ gimp_unified_transform_tool_draw (GimpDrawTool *draw_tool)
// GIMP_HANDLE_ANCHOR_CENTER);
gimp_draw_tool_pop_group (draw_tool);
-
- if (tr_tool->handles[tr_tool->function])
- {
- gimp_canvas_item_set_highlight (tr_tool->handles[tr_tool->function],
- TRUE);
- }
-
- /* the rest of the function is the same as in the parent class */
- if (options->type == GIMP_TRANSFORM_TYPE_SELECTION)
- {
- GimpMatrix3 matrix = tr_tool->transform;
- const GimpBoundSeg *orig_in;
- const GimpBoundSeg *orig_out;
- GimpBoundSeg *segs_in;
- GimpBoundSeg *segs_out;
- gint num_segs_in;
- gint num_segs_out;
-
- gimp_channel_boundary (gimp_image_get_mask (image),
- &orig_in, &orig_out,
- &num_segs_in, &num_segs_out,
- 0, 0, 0, 0);
-
- segs_in = g_memdup (orig_in, num_segs_in * sizeof (GimpBoundSeg));
- segs_out = g_memdup (orig_out, num_segs_out * sizeof (GimpBoundSeg));
-
- if (segs_in)
- {
- for (i = 0; i < num_segs_in; i++)
- {
- gdouble tx, ty;
-
- gimp_matrix3_transform_point (&matrix,
- segs_in[i].x1, segs_in[i].y1,
- &tx, &ty);
- segs_in[i].x1 = RINT (tx);
- segs_in[i].y1 = RINT (ty);
-
- gimp_matrix3_transform_point (&matrix,
- segs_in[i].x2, segs_in[i].y2,
- &tx, &ty);
- segs_in[i].x2 = RINT (tx);
- segs_in[i].y2 = RINT (ty);
- }
-
- gimp_draw_tool_add_boundary (draw_tool,
- segs_in, num_segs_in,
- NULL,
- 0, 0);
- g_free (segs_in);
- }
-
- if (segs_out)
- {
- for (i = 0; i < num_segs_out; i++)
- {
- gdouble tx, ty;
-
- gimp_matrix3_transform_point (&matrix,
- segs_out[i].x1, segs_out[i].y1,
- &tx, &ty);
- segs_out[i].x1 = RINT (tx);
- segs_out[i].y1 = RINT (ty);
-
- gimp_matrix3_transform_point (&matrix,
- segs_out[i].x2, segs_out[i].y2,
- &tx, &ty);
- segs_out[i].x2 = RINT (tx);
- segs_out[i].y2 = RINT (ty);
- }
-
- gimp_draw_tool_add_boundary (draw_tool,
- segs_out, num_segs_out,
- NULL,
- 0, 0);
- g_free (segs_out);
- }
- }
- else if (options->type == GIMP_TRANSFORM_TYPE_PATH)
- {
- GimpVectors *vectors;
- GimpStroke *stroke = NULL;
- GimpMatrix3 matrix = tr_tool->transform;
-
- vectors = gimp_image_get_active_vectors (image);
-
- if (vectors)
- {
- if (options->direction == GIMP_TRANSFORM_BACKWARD)
- gimp_matrix3_invert (&matrix);
-
- while ((stroke = gimp_vectors_stroke_get_next (vectors, stroke)))
- {
- GArray *coords;
- gboolean closed;
-
- coords = gimp_stroke_interpolate (stroke, 1.0, &closed);
-
- if (coords && coords->len)
- {
- gint i;
-
- 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,
- &g_array_index (coords,
- GimpCoords, 0),
- coords->len, FALSE);
- }
-
- if (coords)
- g_array_free (coords, TRUE);
- }
- }
- }
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
