[gimp] app: add a canvas line class
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: add a canvas line class
- Date: Sun, 19 Sep 2010 21:47:16 +0000 (UTC)
commit 46836d950de7730945e7ede95a4f5fa92c4062a4
Author: Michael Natterer <mitch gimp org>
Date: Sun Sep 19 23:46:52 2010 +0200
app: add a canvas line class
app/display/Makefile.am | 2 +
app/display/gimpcanvasline.c | 253 ++++++++++++++++++++++++++++++++++++++++++
app/display/gimpcanvasline.h | 58 ++++++++++
3 files changed, 313 insertions(+), 0 deletions(-)
---
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index 8aba517..2b78616 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -21,6 +21,8 @@ libappdisplay_a_sources = \
gimpcanvas.h \
gimpcanvasitem.c \
gimpcanvasitem.h \
+ gimpcanvasline.c \
+ gimpcanvasline.h \
gimpcanvasrectangle.c \
gimpcanvasrectangle.h \
gimpcursorview.c \
diff --git a/app/display/gimpcanvasline.c b/app/display/gimpcanvasline.c
new file mode 100644
index 0000000..70018d5
--- /dev/null
+++ b/app/display/gimpcanvasline.c
@@ -0,0 +1,253 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasline.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 "gimpcanvasline.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-transform.h"
+
+
+enum
+{
+ PROP_0,
+ PROP_X1,
+ PROP_Y1,
+ PROP_X2,
+ PROP_Y2
+};
+
+
+typedef struct _GimpCanvasLinePrivate GimpCanvasLinePrivate;
+
+struct _GimpCanvasLinePrivate
+{
+ gdouble x1;
+ gdouble y1;
+ gdouble x2;
+ gdouble y2;
+};
+
+#define GET_PRIVATE(line) \
+ G_TYPE_INSTANCE_GET_PRIVATE (line, \
+ GIMP_TYPE_CANVAS_LINE, \
+ GimpCanvasLinePrivate)
+
+
+/* local function prototypes */
+
+static void gimp_canvas_line_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_canvas_line_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gimp_canvas_line_draw (GimpCanvasItem *item,
+ GimpDisplayShell *shell,
+ cairo_t *cr);
+static GdkRegion * gimp_canvas_line_get_extents (GimpCanvasItem *item,
+ GimpDisplayShell *shell);
+
+
+G_DEFINE_TYPE (GimpCanvasLine, gimp_canvas_line,
+ GIMP_TYPE_CANVAS_ITEM)
+
+#define parent_class gimp_canvas_line_parent_class
+
+
+static void
+gimp_canvas_line_class_init (GimpCanvasLineClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GimpCanvasItemClass *item_class = GIMP_CANVAS_ITEM_CLASS (klass);
+
+ object_class->set_property = gimp_canvas_line_set_property;
+ object_class->get_property = gimp_canvas_line_get_property;
+
+ item_class->draw = gimp_canvas_line_draw;
+ item_class->get_extents = gimp_canvas_line_get_extents;
+
+ g_object_class_install_property (object_class, PROP_X1,
+ g_param_spec_double ("x1", NULL, NULL,
+ -GIMP_MAX_IMAGE_SIZE,
+ GIMP_MAX_IMAGE_SIZE, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_Y1,
+ g_param_spec_double ("y1", NULL, NULL,
+ -GIMP_MAX_IMAGE_SIZE,
+ GIMP_MAX_IMAGE_SIZE, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_X2,
+ g_param_spec_double ("x2", NULL, NULL,
+ -GIMP_MAX_IMAGE_SIZE,
+ GIMP_MAX_IMAGE_SIZE, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_Y2,
+ g_param_spec_double ("y2", NULL, NULL,
+ -GIMP_MAX_IMAGE_SIZE,
+ GIMP_MAX_IMAGE_SIZE, 0,
+ GIMP_PARAM_READWRITE));
+
+ g_type_class_add_private (klass, sizeof (GimpCanvasLinePrivate));
+}
+
+static void
+gimp_canvas_line_init (GimpCanvasLine *line)
+{
+}
+
+static void
+gimp_canvas_line_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GimpCanvasLinePrivate *private = GET_PRIVATE (object);
+
+ switch (property_id)
+ {
+ case PROP_X1:
+ private->x1 = g_value_get_double (value);
+ break;
+ case PROP_Y1:
+ private->y1 = g_value_get_double (value);
+ break;
+ case PROP_X2:
+ private->x2 = g_value_get_double (value);
+ break;
+ case PROP_Y2:
+ private->y2 = g_value_get_double (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_canvas_line_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GimpCanvasLinePrivate *private = GET_PRIVATE (object);
+
+ switch (property_id)
+ {
+ case PROP_X1:
+ g_value_set_double (value, private->x1);
+ break;
+ case PROP_Y1:
+ g_value_set_double (value, private->y1);
+ break;
+ case PROP_X2:
+ g_value_set_double (value, private->x2);
+ break;
+ case PROP_Y2:
+ g_value_set_double (value, private->y2);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_canvas_line_transform (GimpCanvasItem *item,
+ GimpDisplayShell *shell,
+ gdouble *x1,
+ gdouble *y1,
+ gdouble *x2,
+ gdouble *y2)
+{
+ GimpCanvasLinePrivate *private = GET_PRIVATE (item);
+
+ gimp_display_shell_transform_xy_f (shell,
+ private->x1, private->y1,
+ x1, y1,
+ FALSE);
+ gimp_display_shell_transform_xy_f (shell,
+ private->x2, private->y2,
+ x2, y2,
+ FALSE);
+
+ *x1 = PROJ_ROUND (*x1) + 0.5;
+ *y1 = PROJ_ROUND (*y1) + 0.5;
+ *x2 = PROJ_ROUND (*x2) + 0.5;
+ *y2 = PROJ_ROUND (*y2) + 0.5;
+}
+
+static void
+gimp_canvas_line_draw (GimpCanvasItem *item,
+ GimpDisplayShell *shell,
+ cairo_t *cr)
+{
+ gdouble x1, y1;
+ gdouble x2, y2;
+
+ gimp_canvas_line_transform (item, shell, &x1, &y1, &x2, &y2);
+
+ cairo_move_to (cr, x1, y1);
+ cairo_line_to (cr, x2, y2);
+
+ _gimp_canvas_item_set_extents (item,
+ MIN (x1, x2) - 0.5,
+ MIN (y1, y2) - 0.5,
+ ABS (x2 - x1) + 1.0,
+ ABS (y2 - y1) + 1.0);
+
+ _gimp_canvas_item_stroke (item, shell, cr);
+}
+
+static GdkRegion *
+gimp_canvas_line_get_extents (GimpCanvasItem *item,
+ GimpDisplayShell *shell)
+{
+ return GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item, shell);
+}
+
+GimpCanvasItem *
+gimp_canvas_line_new (gdouble x1,
+ gdouble y1,
+ gdouble x2,
+ gdouble y2)
+{
+ return g_object_new (GIMP_TYPE_CANVAS_LINE,
+ "x1", x1,
+ "y1", y1,
+ "x2", x2,
+ "y2", y2,
+ NULL);
+}
diff --git a/app/display/gimpcanvasline.h b/app/display/gimpcanvasline.h
new file mode 100644
index 0000000..d5a5f55
--- /dev/null
+++ b/app/display/gimpcanvasline.h
@@ -0,0 +1,58 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpcanvasline.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_LINE_H__
+#define __GIMP_CANVAS_LINE_H__
+
+
+#include "gimpcanvasitem.h"
+
+
+#define GIMP_TYPE_CANVAS_LINE (gimp_canvas_line_get_type ())
+#define GIMP_CANVAS_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_LINE, GimpCanvasLine))
+#define GIMP_CANVAS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_LINE, GimpCanvasLineClass))
+#define GIMP_IS_CANVAS_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CANVAS_LINE))
+#define GIMP_IS_CANVAS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CANVAS_LINE))
+#define GIMP_CANVAS_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CANVAS_LINE, GimpCanvasLineClass))
+
+
+typedef struct _GimpCanvasLine GimpCanvasLine;
+typedef struct _GimpCanvasLineClass GimpCanvasLineClass;
+
+struct _GimpCanvasLine
+{
+ GimpCanvasItem parent_instance;
+};
+
+struct _GimpCanvasLineClass
+{
+ GimpCanvasItemClass parent_class;
+};
+
+
+GType gimp_canvas_line_get_type (void) G_GNUC_CONST;
+
+GimpCanvasItem * gimp_canvas_line_new (gdouble x1,
+ gdouble y1,
+ gdouble x2,
+ gdouble y2);
+
+
+#endif /* __GIMP_CANVAS_LINE_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
