themes/Default/images/Makefile.am removed ...
2004-08-04 Sven Neumann <sven@gimp.org> * themes/Default/images/Makefile.am * themes/Default/images/stock-brush-generated-*-16.png: removed ... * themes/Default/images/stock-shape-*-16.png: ... and added back with more generic names. * libgimpwidgets/gimpstock.[ch] * app/widgets/gimpbrusheditor.c: changed accordingly. * app/tools/gimpinkoptions-gui.c: use the new stock icons here as well. * app/widgets/Makefile.am * app/widgets/widgets-types.h * app/widgets/gimpblobeditor.[ch]: added a simple blob shape editor widget factored out of app/tools/gimpinkoptions-gui.c.
This commit is contained in:

committed by
Sven Neumann

parent
428c4a8d60
commit
50c962af54
378
app/widgets/gimpblobeditor.c
Normal file
378
app/widgets/gimpblobeditor.c
Normal file
@ -0,0 +1,378 @@
|
||||
/* The GIMP -- an 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 2 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, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "widgets-types.h"
|
||||
|
||||
#include "paint/gimpink-blob.h"
|
||||
|
||||
#include "gimpblobeditor.h"
|
||||
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
PROP_TYPE,
|
||||
PROP_ASPECT,
|
||||
PROP_ANGLE
|
||||
};
|
||||
|
||||
static void gimp_blob_editor_class_init (GimpBlobEditorClass *klass);
|
||||
|
||||
static void gimp_blob_editor_init (GimpBlobEditor *editor);
|
||||
static void gimp_blob_editor_set_property (GObject *object,
|
||||
guint property_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec);
|
||||
static void gimp_blob_editor_get_property (GObject *object,
|
||||
guint property_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec);
|
||||
|
||||
static gboolean gimp_blob_editor_expose (GtkWidget *widget,
|
||||
GdkEventExpose *event);
|
||||
static gboolean gimp_blob_editor_button_press (GtkWidget *widget,
|
||||
GdkEventButton *event);
|
||||
static gboolean gimp_blob_editor_button_release (GtkWidget *widget,
|
||||
GdkEventButton *event);
|
||||
static gboolean gimp_blob_editor_motion_notify (GtkWidget *widget,
|
||||
GdkEventMotion *event);
|
||||
|
||||
static void gimp_blob_editor_get_handle (GimpBlobEditor *editor,
|
||||
GdkRectangle *rect);
|
||||
static void gimp_blob_editor_draw_blob (GimpBlobEditor *editor,
|
||||
gdouble xc,
|
||||
gdouble yc,
|
||||
gdouble radius);
|
||||
|
||||
|
||||
static GtkDrawingAreaClass *parent_class = NULL;
|
||||
|
||||
|
||||
GType
|
||||
gimp_blob_editor_get_type (void)
|
||||
{
|
||||
static GType view_type = 0;
|
||||
|
||||
if (! view_type)
|
||||
{
|
||||
static const GTypeInfo view_info =
|
||||
{
|
||||
sizeof (GimpBlobEditorClass),
|
||||
NULL, /* base_init */
|
||||
NULL, /* base_finalize */
|
||||
(GClassInitFunc) gimp_blob_editor_class_init,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
sizeof (GimpBlobEditor),
|
||||
0, /* n_preallocs */
|
||||
(GInstanceInitFunc) gimp_blob_editor_init
|
||||
};
|
||||
|
||||
view_type = g_type_register_static (GTK_TYPE_DRAWING_AREA,
|
||||
"GimpBlobEditor",
|
||||
&view_info, 0);
|
||||
}
|
||||
|
||||
return view_type;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_blob_editor_class_init (GimpBlobEditorClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
|
||||
|
||||
parent_class = g_type_class_peek_parent (klass);
|
||||
|
||||
object_class->set_property = gimp_blob_editor_set_property;
|
||||
object_class->get_property = gimp_blob_editor_get_property;
|
||||
|
||||
g_object_class_install_property (object_class, PROP_TYPE,
|
||||
g_param_spec_enum ("blob-type",
|
||||
NULL, NULL,
|
||||
GIMP_TYPE_INK_BLOB_TYPE,
|
||||
GIMP_INK_BLOB_TYPE_ELLIPSE,
|
||||
G_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT));
|
||||
g_object_class_install_property (object_class, PROP_ASPECT,
|
||||
g_param_spec_double ("blob-aspect",
|
||||
NULL, NULL,
|
||||
1.0, 10.0, 1.0,
|
||||
G_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT));
|
||||
g_object_class_install_property (object_class, PROP_ANGLE,
|
||||
g_param_spec_double ("blob-angle",
|
||||
NULL, NULL,
|
||||
-90.0, 90.0, 0.0,
|
||||
G_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT));
|
||||
|
||||
widget_class->expose_event = gimp_blob_editor_expose;
|
||||
widget_class->button_press_event = gimp_blob_editor_button_press;
|
||||
widget_class->button_release_event = gimp_blob_editor_button_release;
|
||||
widget_class->motion_notify_event = gimp_blob_editor_motion_notify;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_blob_editor_init (GimpBlobEditor *editor)
|
||||
{
|
||||
editor->active = FALSE;
|
||||
|
||||
gtk_widget_add_events (GTK_WIDGET (editor),
|
||||
GDK_BUTTON_PRESS_MASK |
|
||||
GDK_BUTTON_RELEASE_MASK |
|
||||
GDK_POINTER_MOTION_MASK |
|
||||
GDK_EXPOSURE_MASK);
|
||||
}
|
||||
|
||||
GtkWidget *
|
||||
gimp_blob_editor_new (GimpInkBlobType type,
|
||||
gdouble aspect,
|
||||
gdouble angle)
|
||||
{
|
||||
return g_object_new (GIMP_TYPE_BLOB_EDITOR,
|
||||
"blob-type", type,
|
||||
"blob-aspect", aspect,
|
||||
"blob-angle", angle,
|
||||
NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_blob_editor_set_property (GObject *object,
|
||||
guint property_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GimpBlobEditor *editor = GIMP_BLOB_EDITOR (object);
|
||||
|
||||
switch (property_id)
|
||||
{
|
||||
case PROP_TYPE:
|
||||
editor->type = g_value_get_enum (value);
|
||||
break;
|
||||
case PROP_ASPECT:
|
||||
editor->aspect = g_value_get_double (value);
|
||||
break;
|
||||
case PROP_ANGLE:
|
||||
editor->angle = g_value_get_double (value);
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
}
|
||||
|
||||
gtk_widget_queue_draw (GTK_WIDGET (editor));
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_blob_editor_get_property (GObject *object,
|
||||
guint property_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GimpBlobEditor *editor = GIMP_BLOB_EDITOR (object);
|
||||
|
||||
switch (property_id)
|
||||
{
|
||||
case PROP_TYPE:
|
||||
g_value_set_enum (value, editor->type);
|
||||
break;
|
||||
case PROP_ASPECT:
|
||||
g_value_set_double (value, editor->aspect);
|
||||
break;
|
||||
case PROP_ANGLE:
|
||||
g_value_set_double (value, editor->angle);
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gimp_blob_editor_expose (GtkWidget *widget,
|
||||
GdkEventExpose *event)
|
||||
{
|
||||
GimpBlobEditor *editor = GIMP_BLOB_EDITOR (widget);
|
||||
GdkRectangle rect;
|
||||
gint r0;
|
||||
|
||||
r0 = MIN (widget->allocation.width, widget->allocation.height) / 2;
|
||||
|
||||
if (r0 < 2)
|
||||
return TRUE;
|
||||
|
||||
gimp_blob_editor_draw_blob (editor,
|
||||
widget->allocation.width / 2,
|
||||
widget->allocation.height / 2,
|
||||
0.9 * r0);
|
||||
|
||||
gimp_blob_editor_get_handle (editor, &rect);
|
||||
|
||||
gdk_draw_rectangle (widget->window,
|
||||
widget->style->bg_gc[widget->state],
|
||||
TRUE, /* filled */
|
||||
rect.x, rect.y,
|
||||
rect.width, rect.height);
|
||||
gtk_paint_shadow (widget->style, widget->window, widget->state,
|
||||
GTK_SHADOW_OUT,
|
||||
NULL, widget, NULL,
|
||||
rect.x, rect.y,
|
||||
rect.width, rect.height);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gimp_blob_editor_button_press (GtkWidget *widget,
|
||||
GdkEventButton *event)
|
||||
{
|
||||
GimpBlobEditor *editor = GIMP_BLOB_EDITOR (widget);
|
||||
GdkRectangle rect;
|
||||
|
||||
gimp_blob_editor_get_handle (editor, &rect);
|
||||
|
||||
if ((event->x >= rect.x) && (event->x-rect.x < rect.width) &&
|
||||
(event->y >= rect.y) && (event->y-rect.y < rect.height))
|
||||
{
|
||||
editor->active = TRUE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gimp_blob_editor_button_release (GtkWidget *widget,
|
||||
GdkEventButton *event)
|
||||
{
|
||||
GimpBlobEditor *editor = GIMP_BLOB_EDITOR (widget);
|
||||
|
||||
editor->active = FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gimp_blob_editor_motion_notify (GtkWidget *widget,
|
||||
GdkEventMotion *event)
|
||||
{
|
||||
GimpBlobEditor *editor = GIMP_BLOB_EDITOR (widget);
|
||||
|
||||
if (editor->active)
|
||||
{
|
||||
gint x;
|
||||
gint y;
|
||||
gint rsquare;
|
||||
|
||||
x = event->x - widget->allocation.width / 2;
|
||||
y = event->y - widget->allocation.height / 2;
|
||||
|
||||
rsquare = SQR (x) + SQR (y);
|
||||
|
||||
if (rsquare > 0)
|
||||
{
|
||||
gint r0;
|
||||
gdouble angle;
|
||||
gdouble aspect;
|
||||
|
||||
r0 = MIN (widget->allocation.width, widget->allocation.height) / 2;
|
||||
|
||||
angle = atan2 (y, x);
|
||||
aspect = 10.0 * sqrt ((gdouble) rsquare / (r0 * r0)) / 0.85;
|
||||
|
||||
aspect = CLAMP (aspect, 1.0, 10.0);
|
||||
|
||||
g_object_set (editor,
|
||||
"blob-angle", angle,
|
||||
"blob-aspect", aspect,
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_blob_editor_get_handle (GimpBlobEditor *editor,
|
||||
GdkRectangle *rect)
|
||||
{
|
||||
GtkWidget *widget = GTK_WIDGET (editor);
|
||||
gint x, y;
|
||||
gint r;
|
||||
|
||||
r = MIN (widget->allocation.width, widget->allocation.height) / 2;
|
||||
|
||||
x = (widget->allocation.width / 2 +
|
||||
0.85 * r *editor->aspect / 10.0 * cos (editor->angle));
|
||||
|
||||
y = (widget->allocation.height / 2 +
|
||||
0.85 * r * editor->aspect / 10.0 * sin (editor->angle));
|
||||
|
||||
rect->x = x - 5;
|
||||
rect->y = y - 5;
|
||||
rect->width = 10;
|
||||
rect->height = 10;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_blob_editor_draw_blob (GimpBlobEditor *editor,
|
||||
gdouble xc,
|
||||
gdouble yc,
|
||||
gdouble radius)
|
||||
{
|
||||
GtkWidget *widget = GTK_WIDGET (editor);
|
||||
Blob *blob;
|
||||
BlobFunc function = blob_ellipse;
|
||||
gint i;
|
||||
|
||||
switch (editor->type)
|
||||
{
|
||||
case GIMP_INK_BLOB_TYPE_ELLIPSE:
|
||||
function = blob_ellipse;
|
||||
break;
|
||||
|
||||
case GIMP_INK_BLOB_TYPE_SQUARE:
|
||||
function = blob_square;
|
||||
break;
|
||||
|
||||
case GIMP_INK_BLOB_TYPE_DIAMOND:
|
||||
function = blob_diamond;
|
||||
break;
|
||||
}
|
||||
|
||||
blob = function (xc, yc,
|
||||
radius * cos (editor->angle),
|
||||
radius * sin (editor->angle),
|
||||
(- (radius / editor->aspect) * sin (editor->angle)),
|
||||
( (radius / editor->aspect) * cos (editor->angle)));
|
||||
|
||||
for (i = 0; i < blob->height; i++)
|
||||
if (blob->data[i].left <= blob->data[i].right)
|
||||
gdk_draw_line (widget->window,
|
||||
widget->style->fg_gc[widget->state],
|
||||
blob->data[i].left, i + blob->y,
|
||||
blob->data[i].right + 1, i + blob->y);
|
||||
|
||||
g_free (blob);
|
||||
}
|
Reference in New Issue
Block a user