[gimp] app: add an arc canvas item class
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: add an arc canvas item class
- Date: Fri, 24 Sep 2010 16:42:18 +0000 (UTC)
commit 4e5d47dcbfaa24898b05f1cc3d5dec100861c54a
Author: Michael Natterer <mitch gimp org>
Date: Fri Sep 24 18:41:57 2010 +0200
app: add an arc canvas item class
app/display/Makefile.am | 2 +
app/display/gimpcanvasarc.c | 325 +++++++++++++++++++++++++++++++++++++++++++
app/display/gimpcanvasarc.h | 61 ++++++++
3 files changed, 388 insertions(+), 0 deletions(-)
---
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index 6463d9e..b08217f 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -19,6 +19,8 @@ libappdisplay_a_sources = \
display-types.h \
gimpcanvas.c \
gimpcanvas.h \
+ gimpcanvasarc.c \
+ gimpcanvasarc.h \
gimpcanvasboundary.c \
gimpcanvasboundary.h \
gimpcanvascorner.c \
diff --git a/app/display/gimpcanvasarc.c b/app/display/gimpcanvasarc.c
new file mode 100644
index 0000000..9623f08
--- /dev/null
+++ b/app/display/gimpcanvasarc.c
@@ -0,0 +1,325 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasarc.c
+ * Copyright (C) 2010 Michael Natterer <mitch gimp org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
+
+#include "display-types.h"
+
+#include "widgets/gimpcairo.h"
+
+#include "gimpcanvasarc.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-transform.h"
+
+
+enum
+{
+ PROP_0,
+ PROP_CENTER_X,
+ PROP_CENTER_Y,
+ PROP_RADIUS_X,
+ PROP_RADIUS_Y,
+ PROP_START_ANGLE,
+ PROP_SLICE_ANGLE,
+ PROP_FILLED
+};
+
+
+typedef struct _GimpCanvasArcPrivate GimpCanvasArcPrivate;
+
+struct _GimpCanvasArcPrivate
+{
+ gdouble center_x;
+ gdouble center_y;
+ gdouble radius_x;
+ gdouble radius_y;
+ gdouble start_angle;
+ gdouble slice_angle;;
+ gboolean filled;
+};
+
+#define GET_PRIVATE(arc) \
+ G_TYPE_INSTANCE_GET_PRIVATE (arc, \
+ GIMP_TYPE_CANVAS_ARC, \
+ GimpCanvasArcPrivate)
+
+
+/* local function prototypes */
+
+static void gimp_canvas_arc_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_canvas_arc_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gimp_canvas_arc_draw (GimpCanvasItem *item,
+ GimpDisplayShell *shell,
+ cairo_t *cr);
+static GdkRegion * gimp_canvas_arc_get_extents (GimpCanvasItem *item,
+ GimpDisplayShell *shell);
+
+
+G_DEFINE_TYPE (GimpCanvasArc, gimp_canvas_arc,
+ GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_arc_parent_class
+
+
+static void
+gimp_canvas_arc_class_init (GimpCanvasArcClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GimpCanvasItemClass *item_class = GIMP_CANVAS_ITEM_CLASS (klass);
+
+ object_class->set_property = gimp_canvas_arc_set_property;
+ object_class->get_property = gimp_canvas_arc_get_property;
+
+ item_class->draw = gimp_canvas_arc_draw;
+ item_class->get_extents = gimp_canvas_arc_get_extents;
+
+ g_object_class_install_property (object_class, PROP_CENTER_X,
+ g_param_spec_double ("center-x", NULL, NULL,
+ -GIMP_MAX_IMAGE_SIZE,
+ GIMP_MAX_IMAGE_SIZE, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_CENTER_Y,
+ g_param_spec_double ("center-y", NULL, NULL,
+ -GIMP_MAX_IMAGE_SIZE,
+ GIMP_MAX_IMAGE_SIZE, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_RADIUS_X,
+ g_param_spec_double ("radius-x", NULL, NULL,
+ 0, GIMP_MAX_IMAGE_SIZE, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_RADIUS_Y,
+ g_param_spec_double ("radius-y", NULL, NULL,
+ 0, GIMP_MAX_IMAGE_SIZE, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_START_ANGLE,
+ g_param_spec_double ("start-angle", NULL, NULL,
+ -1000, 1000, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_SLICE_ANGLE,
+ g_param_spec_double ("slice-angle", NULL, NULL,
+ -1000, 1000, 2 * G_PI,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_FILLED,
+ g_param_spec_boolean ("filled", NULL, NULL,
+ FALSE,
+ GIMP_PARAM_READWRITE));
+
+ g_type_class_add_private (klass, sizeof (GimpCanvasArcPrivate));
+}
+
+static void
+gimp_canvas_arc_init (GimpCanvasArc *arc)
+{
+}
+
+static void
+gimp_canvas_arc_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GimpCanvasArcPrivate *private = GET_PRIVATE (object);
+
+ switch (property_id)
+ {
+ case PROP_CENTER_X:
+ private->center_x = g_value_get_double (value);
+ break;
+ case PROP_CENTER_Y:
+ private->center_y = g_value_get_double (value);
+ break;
+ case PROP_RADIUS_X:
+ private->radius_x = g_value_get_double (value);
+ break;
+ case PROP_RADIUS_Y:
+ private->radius_y = g_value_get_double (value);
+ break;
+ case PROP_START_ANGLE:
+ private->start_angle = g_value_get_double (value);
+ break;
+ case PROP_SLICE_ANGLE:
+ private->slice_angle = g_value_get_double (value);
+ break;
+ case PROP_FILLED:
+ private->filled = g_value_get_boolean (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_canvas_arc_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GimpCanvasArcPrivate *private = GET_PRIVATE (object);
+
+ switch (property_id)
+ {
+ case PROP_CENTER_X:
+ g_value_set_double (value, private->center_x);
+ break;
+ case PROP_CENTER_Y:
+ g_value_set_double (value, private->center_y);
+ break;
+ case PROP_RADIUS_X:
+ g_value_set_double (value, private->radius_x);
+ break;
+ case PROP_RADIUS_Y:
+ g_value_set_double (value, private->radius_y);
+ break;
+ case PROP_START_ANGLE:
+ g_value_set_double (value, private->start_angle);
+ break;
+ case PROP_SLICE_ANGLE:
+ g_value_set_double (value, private->slice_angle);
+ break;
+ case PROP_FILLED:
+ g_value_set_boolean (value, private->filled);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_canvas_arc_transform (GimpCanvasItem *item,
+ GimpDisplayShell *shell,
+ gdouble *center_x,
+ gdouble *center_y,
+ gdouble *radius_x,
+ gdouble *radius_y)
+{
+ GimpCanvasArcPrivate *private = GET_PRIVATE (item);
+ gdouble x1, y1;
+ gdouble x2, y2;
+
+ gimp_display_shell_transform_xy_f (shell,
+ private->center_x,
+ private->center_y,
+ center_x, center_y);
+ gimp_display_shell_transform_xy_f (shell,
+ private->center_x - private->radius_x,
+ private->center_y - private->radius_y,
+ &x1, &y1);
+ gimp_display_shell_transform_xy_f (shell,
+ private->center_x + private->radius_x,
+ private->center_y + private->radius_y,
+ &x2, &y2);
+
+ *radius_x = (x2 - x1) / 2.0;
+ *radius_y = (y2 - y1) / 2.0;
+
+ if (! private->filled)
+ {
+ *radius_x -= 0.5;
+ *radius_y -= 0.5;
+ }
+}
+
+static void
+gimp_canvas_arc_draw (GimpCanvasItem *item,
+ GimpDisplayShell *shell,
+ cairo_t *cr)
+{
+ GimpCanvasArcPrivate *private = GET_PRIVATE (item);
+ gdouble center_x, center_y;
+ gdouble radius_x, radius_y;
+
+ gimp_canvas_arc_transform (item, shell,
+ ¢er_x, ¢er_y,
+ &radius_x, &radius_y);
+
+ cairo_save (cr);
+ cairo_translate (cr, center_x, center_y);
+ cairo_scale (cr, radius_x, radius_y);
+ gimp_cairo_add_arc (cr, 0.0, 0.0, 1.0,
+ private->start_angle, private->slice_angle);
+ cairo_restore (cr);
+
+ if (private->filled)
+ _gimp_canvas_item_fill (item, shell, cr);
+ else
+ _gimp_canvas_item_stroke (item, shell, cr);
+}
+
+static GdkRegion *
+gimp_canvas_arc_get_extents (GimpCanvasItem *item,
+ GimpDisplayShell *shell)
+{
+ GdkRectangle rectangle;
+ gdouble center_x, center_y;
+ gdouble radius_x, radius_y;
+
+ gimp_canvas_arc_transform (item, shell,
+ ¢er_x, ¢er_y,
+ &radius_x, &radius_y);
+
+ rectangle.x = floor (center_x - radius_x - 1.5);
+ rectangle.y = floor (center_y - radius_y - 1.5);
+ rectangle.width = ceil (rectangle.x + 2 * radius_x + 3.0);
+ rectangle.height = ceil (rectangle.y + 2 * radius_y + 3.0);
+
+ return gdk_region_rectangle (&rectangle);
+}
+
+GimpCanvasItem *
+gimp_canvas_arc_new (gdouble center_x,
+ gdouble center_y,
+ gdouble radius_x,
+ gdouble radius_y,
+ gdouble start_angle,
+ gdouble slice_angle,
+ gboolean filled)
+{
+ return g_object_new (GIMP_TYPE_CANVAS_ARC,
+ "center-x", center_x,
+ "center-y", center_y,
+ "radius-x", radius_x,
+ "radius-y", radius_y,
+ "start-angle", start_angle,
+ "slice-angle", slice_angle,
+ "filled", filled,
+ NULL);
+}
diff --git a/app/display/gimpcanvasarc.h b/app/display/gimpcanvasarc.h
new file mode 100644
index 0000000..ef8c283
--- /dev/null
+++ b/app/display/gimpcanvasarc.h
@@ -0,0 +1,61 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasarc.h
+ * Copyright (C) 2010 Michael Natterer <mitch gimp org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_CANVAS_ARC_H__
+#define __GIMP_CANVAS_ARC_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_ARC (gimp_canvas_arc_get_type ())
+#define GIMP_CANVAS_ARC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_ARC, GimpCanvasArc))
+#define GIMP_CANVAS_ARC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_ARC, GimpCanvasArcClass))
+#define GIMP_IS_CANVAS_ARC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_ARC))
+#define GIMP_IS_CANVAS_ARC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_ARC))
+#define GIMP_CANVAS_ARC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_ARC, GimpCanvasArcClass))
+
+
+typedef struct _GimpCanvasArc GimpCanvasArc;
+typedef struct _GimpCanvasArcClass GimpCanvasArcClass;
+
+struct _GimpCanvasArc
+{
+ GimpCanvasItem parent_instance;
+};
+
+struct _GimpCanvasArcClass
+{
+ GimpCanvasItemClass parent_class;
+};
+
+
+GType gimp_canvas_arc_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_arc_new (gdouble center_x,
+ gdouble center_y,
+ gdouble radius_x,
+ gdouble radius_y,
+ gdouble start_angle,
+ gdouble slice_angle,
+ gboolean filled);
+
+
+#endif /* __GIMP_CANVAS_ARC_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
