mirror of https://github.com/GNOME/gimp.git
preliminary cleanups: removed all trailing spaces.
* plug-ins/gfig/*[ch]: preliminary cleanups: removed all trailing spaces.
This commit is contained in:
parent
7c6a0026e4
commit
60a9853c16
|
@ -1,3 +1,8 @@
|
|||
2004-10-27 DindinX <dindinx@gimp.org>
|
||||
|
||||
* plug-ins/gfig/*[ch]: preliminary cleanups: removed all trailing
|
||||
spaces.
|
||||
|
||||
2004-10-26 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* tools/pdbgen/pdb/drawable_transform.pdb: removed abuse of init,
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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"
|
||||
|
@ -122,8 +122,8 @@ line_definition (gdouble x1,
|
|||
*lconst = line_cons (midx, midy,*lgrad);
|
||||
}
|
||||
|
||||
/* Arch details
|
||||
* Given three points get arc radius and the co-ords
|
||||
/* Arch details
|
||||
* Given three points get arc radius and the co-ords
|
||||
* of center point.
|
||||
*/
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_ARC_H__
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_BEZIER_H__
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_CIRCLE_H__
|
||||
|
|
|
@ -70,7 +70,7 @@ d_save_object (Dobject *obj,
|
|||
GString *string)
|
||||
{
|
||||
do_save_obj (obj, string);
|
||||
|
||||
|
||||
switch (obj->type)
|
||||
{
|
||||
case BEZIER:
|
||||
|
@ -151,7 +151,7 @@ d_load_object (gchar *desc,
|
|||
/* Go around and read the last line */
|
||||
continue;
|
||||
}
|
||||
else
|
||||
else
|
||||
return new_obj;
|
||||
}
|
||||
|
||||
|
@ -193,7 +193,7 @@ d_new_object (DobjType type,
|
|||
{
|
||||
nobj->type_data = 3; /* default to 3 sides 6 points */
|
||||
}
|
||||
|
||||
|
||||
return nobj;
|
||||
}
|
||||
|
||||
|
@ -232,7 +232,7 @@ new_dobjpoint (gint x, gint y)
|
|||
|
||||
npnt->pnt.x = x;
|
||||
npnt->pnt.y = y;
|
||||
|
||||
|
||||
return npnt;
|
||||
}
|
||||
|
||||
|
@ -384,7 +384,7 @@ object_operation_start (GdkPoint *pnt,
|
|||
d_draw_bezier (operation_obj);
|
||||
}
|
||||
/* If shift is down the break into sep lines */
|
||||
if ((operation_obj->type == POLY
|
||||
if ((operation_obj->type == POLY
|
||||
|| operation_obj->type == STAR)
|
||||
&& shift_down)
|
||||
{
|
||||
|
@ -436,7 +436,7 @@ void
|
|||
object_operation_end (GdkPoint *pnt,
|
||||
gint shift_down)
|
||||
{
|
||||
if (selvals.otype != DEL_OBJ && operation_obj &&
|
||||
if (selvals.otype != DEL_OBJ && operation_obj &&
|
||||
operation_obj->type == BEZIER)
|
||||
{
|
||||
d_draw_bezier (operation_obj);
|
||||
|
@ -553,7 +553,7 @@ remove_obj_from_list (GFigObj *obj,
|
|||
/* Nearest object to given point or NULL */
|
||||
DAllObjs *entry;
|
||||
DAllObjs *prev_entry = NULL;
|
||||
|
||||
|
||||
g_assert (del_obj != NULL);
|
||||
|
||||
entry = obj->obj_list;
|
||||
|
@ -595,30 +595,30 @@ do_move_all_obj (GdkPoint *to_pnt)
|
|||
/* Undraw/then draw in new pos */
|
||||
gint xdiff = move_all_pnt->x - to_pnt->x;
|
||||
gint ydiff = move_all_pnt->y - to_pnt->y;
|
||||
|
||||
|
||||
if (xdiff || ydiff)
|
||||
{
|
||||
DAllObjs *all;
|
||||
|
||||
|
||||
for (all = gfig_context->current_obj->obj_list; all; all = all->next)
|
||||
{
|
||||
Dobject *obj = all->obj;
|
||||
|
||||
|
||||
/* undraw ! */
|
||||
draw_one_obj (obj);
|
||||
|
||||
|
||||
update_pnts (obj, xdiff, ydiff);
|
||||
|
||||
|
||||
/* Draw in new pos */
|
||||
draw_one_obj (obj);
|
||||
}
|
||||
|
||||
|
||||
*move_all_pnt = *to_pnt;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
do_save_obj (Dobject *obj,
|
||||
do_save_obj (Dobject *obj,
|
||||
GString *string)
|
||||
{
|
||||
DobjPoints *spnt;
|
||||
|
@ -637,16 +637,16 @@ do_move_obj (Dobject *obj,
|
|||
/* Then draw in new pos */
|
||||
gint xdiff = 0;
|
||||
gint ydiff = 0;
|
||||
|
||||
|
||||
get_diffs (obj, &xdiff, &ydiff, to_pnt);
|
||||
|
||||
|
||||
if (xdiff || ydiff)
|
||||
{
|
||||
{
|
||||
/* undraw ! */
|
||||
draw_one_obj (obj);
|
||||
|
||||
|
||||
update_pnts (obj, xdiff, ydiff);
|
||||
|
||||
|
||||
/* Draw in new pos */
|
||||
draw_one_obj (obj);
|
||||
}
|
||||
|
@ -661,18 +661,18 @@ do_move_obj_pnt (Dobject *obj,
|
|||
DobjPoints *spnt;
|
||||
gint xdiff = 0;
|
||||
gint ydiff = 0;
|
||||
|
||||
|
||||
spnt = get_diffs (obj, &xdiff, &ydiff, to_pnt);
|
||||
|
||||
|
||||
if ((!xdiff && !ydiff) || !spnt)
|
||||
return;
|
||||
|
||||
|
||||
/* undraw ! */
|
||||
draw_one_obj (obj);
|
||||
|
||||
spnt->pnt.x = spnt->pnt.x - xdiff;
|
||||
spnt->pnt.y = spnt->pnt.y - ydiff;
|
||||
|
||||
|
||||
/* Draw in new pos */
|
||||
draw_one_obj (obj);
|
||||
}
|
||||
|
@ -718,7 +718,7 @@ void
|
|||
draw_objects (DAllObjs *objs,
|
||||
gint show_single)
|
||||
{
|
||||
/* Show_single - only one object to draw Unless shift
|
||||
/* Show_single - only one object to draw Unless shift
|
||||
* is down in which case show all.
|
||||
*/
|
||||
|
||||
|
@ -728,7 +728,7 @@ draw_objects (DAllObjs *objs,
|
|||
{
|
||||
if (!show_single || count == obj_show_single || obj_show_single == -1)
|
||||
draw_one_obj (objs->obj);
|
||||
|
||||
|
||||
objs = objs->next;
|
||||
count++;
|
||||
}
|
||||
|
@ -776,7 +776,7 @@ add_to_all_obj (GFigObj *fobj,
|
|||
Dobject *obj)
|
||||
{
|
||||
DAllObjs *nobj;
|
||||
|
||||
|
||||
nobj = g_new0 (DAllObjs, 1);
|
||||
|
||||
nobj->obj = obj;
|
||||
|
@ -797,7 +797,7 @@ add_to_all_obj (GFigObj *fobj,
|
|||
* button panel. It is activated by a button press, and causes
|
||||
* a small square to be drawn at the initial point. The style of
|
||||
* the new object is set to values taken from the style control
|
||||
* widgets.
|
||||
* widgets.
|
||||
*/
|
||||
void
|
||||
object_start (GdkPoint *pnt,
|
||||
|
@ -864,7 +864,7 @@ object_start (GdkPoint *pnt,
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
object_end (GdkPoint *pnt,
|
||||
gint shift_down)
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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"
|
||||
|
@ -73,7 +73,7 @@ d_draw_ellipse (Dobject * obj)
|
|||
top_x = 2 * center_pnt->pnt.x - edge_pnt->pnt.x;
|
||||
else
|
||||
top_x = edge_pnt->pnt.x;
|
||||
|
||||
|
||||
if (edge_pnt->pnt.y > center_pnt->pnt.y)
|
||||
top_y = 2 * center_pnt->pnt.y - edge_pnt->pnt.y;
|
||||
else
|
||||
|
@ -218,7 +218,7 @@ d_paint_ellipse (Dobject *obj)
|
|||
{
|
||||
d_paint_approx_ellipse (obj);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
center_pnt = obj->points;
|
||||
|
||||
|
@ -239,7 +239,7 @@ d_paint_ellipse (Dobject *obj)
|
|||
top_x = 2*center_pnt->pnt.x - edge_pnt->pnt.x;
|
||||
else
|
||||
top_x = edge_pnt->pnt.x;
|
||||
|
||||
|
||||
if (edge_pnt->pnt.y > center_pnt->pnt.y)
|
||||
top_y = 2*center_pnt->pnt.y - edge_pnt->pnt.y;
|
||||
else
|
||||
|
@ -265,7 +265,7 @@ d_paint_ellipse (Dobject *obj)
|
|||
selopt.feather_radius);
|
||||
|
||||
paint_layer_fill ();
|
||||
|
||||
|
||||
gimp_edit_stroke (gfig_context->drawable_id);
|
||||
}
|
||||
|
||||
|
@ -305,29 +305,28 @@ d_update_ellipse (GdkPoint *pnt)
|
|||
|
||||
/* Undraw last one then draw new one */
|
||||
center_pnt = obj_creating->points;
|
||||
|
||||
|
||||
if (!center_pnt)
|
||||
return; /* No points */
|
||||
|
||||
|
||||
if ((edge_pnt = center_pnt->next))
|
||||
{
|
||||
/* Undraw current */
|
||||
bound_wx = abs (center_pnt->pnt.x - edge_pnt->pnt.x)*2;
|
||||
bound_wy = abs (center_pnt->pnt.y - edge_pnt->pnt.y)*2;
|
||||
|
||||
|
||||
if (edge_pnt->pnt.x > center_pnt->pnt.x)
|
||||
top_x = 2*center_pnt->pnt.x - edge_pnt->pnt.x;
|
||||
else
|
||||
top_x = edge_pnt->pnt.x;
|
||||
|
||||
|
||||
if (edge_pnt->pnt.y > center_pnt->pnt.y)
|
||||
top_y = 2*center_pnt->pnt.y - edge_pnt->pnt.y;
|
||||
else
|
||||
top_y = edge_pnt->pnt.y;
|
||||
|
||||
draw_circle (&edge_pnt->pnt);
|
||||
|
||||
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gfig_gc,
|
||||
0,
|
||||
|
@ -350,12 +349,12 @@ d_update_ellipse (GdkPoint *pnt)
|
|||
top_x = 2*center_pnt->pnt.x - edge_pnt->pnt.x;
|
||||
else
|
||||
top_x = edge_pnt->pnt.x;
|
||||
|
||||
|
||||
if (edge_pnt->pnt.y > center_pnt->pnt.y)
|
||||
top_y = 2* center_pnt->pnt.y - edge_pnt->pnt.y;
|
||||
else
|
||||
top_y = edge_pnt->pnt.y;
|
||||
|
||||
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gfig_gc,
|
||||
0,
|
||||
|
@ -365,7 +364,7 @@ d_update_ellipse (GdkPoint *pnt)
|
|||
bound_wy,
|
||||
0,
|
||||
360*64);
|
||||
|
||||
|
||||
center_pnt->next = edge_pnt;
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_ELLIPSE_H__
|
||||
|
|
|
@ -105,15 +105,15 @@ find_grid_pos (GdkPoint *p,
|
|||
static gdouble cons_radius;
|
||||
static gdouble cons_ang;
|
||||
static gboolean cons_center;
|
||||
|
||||
|
||||
if (selvals.opts.gridtype == RECT_GRID)
|
||||
{
|
||||
if (p->x % selvals.opts.gridspacing > selvals.opts.gridspacing/2)
|
||||
x += selvals.opts.gridspacing;
|
||||
|
||||
|
||||
if (p->y % selvals.opts.gridspacing > selvals.opts.gridspacing/2)
|
||||
y += selvals.opts.gridspacing;
|
||||
|
||||
|
||||
gp->x = (x/selvals.opts.gridspacing)*selvals.opts.gridspacing;
|
||||
gp->y = (y/selvals.opts.gridspacing)*selvals.opts.gridspacing;
|
||||
|
||||
|
@ -131,7 +131,7 @@ find_grid_pos (GdkPoint *p,
|
|||
}
|
||||
}
|
||||
else if (selvals.opts.gridtype == POLAR_GRID)
|
||||
{
|
||||
{
|
||||
gdouble ang_grid;
|
||||
gdouble ang_radius;
|
||||
gdouble real_radius;
|
||||
|
@ -203,10 +203,10 @@ find_grid_pos (GdkPoint *p,
|
|||
/*
|
||||
* This really needs a picture to show the math...
|
||||
*
|
||||
* Consider an isometric grid with one of the sets of lines parallel to the
|
||||
* y axis (vertical alignment). Further define that the origin of a Cartesian
|
||||
* Consider an isometric grid with one of the sets of lines parallel to the
|
||||
* y axis (vertical alignment). Further define that the origin of a Cartesian
|
||||
* grid is at a isometric vertex. For simplicity consider the first quadrant only.
|
||||
*
|
||||
*
|
||||
* - Let one line segment between vertices be r
|
||||
* - Define the value of r as the grid spacing
|
||||
* - Assign an integer n identifier to each vertical grid line along the x axis.
|
||||
|
@ -214,7 +214,7 @@ find_grid_pos (GdkPoint *p,
|
|||
* - Let m to be any integer
|
||||
* - Let h be the spacing between vertical grid lines measured along the x axis.
|
||||
* It follows from the isometric grid that h has a value of r * COS(1/6 Pi Rad)
|
||||
*
|
||||
*
|
||||
* Consider a Vertex V at the Cartesian location [Xv, Yv]
|
||||
*
|
||||
* It follows that vertices belong to the set...
|
||||
|
@ -226,13 +226,13 @@ find_grid_pos (GdkPoint *p,
|
|||
* Consider an arbitrary point P[Xp,Yp], find the closest vertex in the set V.
|
||||
*
|
||||
* Restated this problem is "find values for m and n that are drive V closest to P"
|
||||
*
|
||||
*
|
||||
* A Solution method (there may be a better one?):
|
||||
*
|
||||
*
|
||||
* Step 1) bound n to the two closest values for Xp
|
||||
* n_lo = (int) (Xp / h)
|
||||
* n_lo = (int) (Xp / h)
|
||||
* n_hi = n_lo + 1
|
||||
*
|
||||
*
|
||||
* Step 2) Consider the two closes vertices for each n_lo and n_hi. The further of
|
||||
* the vertices in each pair can readily be discarded.
|
||||
* m_lo_n_lo = (int) ( (Yp / r) - 0.5 (n_lo % 2) )
|
||||
|
@ -240,7 +240,7 @@ find_grid_pos (GdkPoint *p,
|
|||
*
|
||||
* m_lo_n_hi = (int) ( (Yp / r) - 0.5 (n_hi % 2) )
|
||||
* m_hi_n_hi = m_hi_n_hi
|
||||
*
|
||||
*
|
||||
* Step 3) compute the distance from P to V1 and V2. Snap to the closer point.
|
||||
*/
|
||||
gint n_lo;
|
||||
|
@ -257,13 +257,13 @@ find_grid_pos (GdkPoint *p,
|
|||
gint x2;
|
||||
gint y1;
|
||||
gint y2;
|
||||
|
||||
|
||||
r = selvals.opts.gridspacing;
|
||||
h = COS_1o6PI_RAD * r;
|
||||
|
||||
|
||||
n_lo = (gint) x / h;
|
||||
n_hi = n_lo + 1;
|
||||
|
||||
|
||||
/* evaluate m candidates for n_lo */
|
||||
m_lo_n_lo = (gint) ( (y / r) - 0.5 * (n_lo % 2) );
|
||||
m_hi_n_lo = m_lo_n_lo + 1;
|
||||
|
@ -275,7 +275,7 @@ find_grid_pos (GdkPoint *p,
|
|||
else {
|
||||
m_n_lo = m_hi_n_lo;
|
||||
}
|
||||
|
||||
|
||||
/* evaluate m candidates for n_hi */
|
||||
m_lo_n_hi = (gint) ( (y / r) - 0.5 * (n_hi % 2) );
|
||||
m_hi_n_hi = m_lo_n_hi + 1;
|
||||
|
@ -287,16 +287,16 @@ find_grid_pos (GdkPoint *p,
|
|||
else {
|
||||
m_n_hi = m_hi_n_hi;
|
||||
}
|
||||
|
||||
/* Now, which is closer to [x,y]? we can use a somewhat abbreviated form of the
|
||||
|
||||
/* Now, which is closer to [x,y]? we can use a somewhat abbreviated form of the
|
||||
* distance formula since we only care about relative values. */
|
||||
|
||||
x1 = (gint) (n_lo * h);
|
||||
y1 = (gint) (m_n_lo * r + (0.5 * r * (n_lo % 2)));
|
||||
x2 = (gint) (n_hi * h);
|
||||
y2 = (gint) (m_n_hi * r + (0.5 * r * (n_hi % 2)));
|
||||
|
||||
if (((x - x1) * (x - x1) + (y - y1) * (y - y1)) <
|
||||
|
||||
if (((x - x1) * (x - x1) + (y - y1) * (y - y1)) <
|
||||
((x - x2) * (x - x2) + (y - y2) * (y - y2))) {
|
||||
gp->x = x1;
|
||||
gp->y = y1;
|
||||
|
@ -305,7 +305,7 @@ find_grid_pos (GdkPoint *p,
|
|||
gp->x = x2;
|
||||
gp->y = y2;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -353,7 +353,7 @@ draw_grid_polar (GdkGC *drawgc)
|
|||
gint lx, ly;
|
||||
|
||||
ang_loop = loop * ang_grid;
|
||||
|
||||
|
||||
lx = RINT (ang_radius * cos (ang_loop));
|
||||
ly = RINT (ang_radius * sin (ang_loop));
|
||||
|
||||
|
@ -402,18 +402,18 @@ static void
|
|||
draw_grid_iso (GdkGC *drawgc)
|
||||
{
|
||||
/* vstep is an int since it's defined from grid size */
|
||||
gint vstep;
|
||||
gint vstep;
|
||||
gdouble loop;
|
||||
gdouble hstep;
|
||||
|
||||
|
||||
gdouble diagonal_start;
|
||||
gdouble diagonal_end;
|
||||
gdouble diagonal_width;
|
||||
gdouble diagonal_height;
|
||||
|
||||
|
||||
vstep = selvals.opts.gridspacing;
|
||||
hstep = selvals.opts.gridspacing * COS_1o6PI_RAD;
|
||||
|
||||
|
||||
/* Draw the vertical lines - These are easy */
|
||||
for (loop = 0 ; loop < preview_width ; loop += hstep){
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
|
@ -423,17 +423,17 @@ draw_grid_iso (GdkGC *drawgc)
|
|||
(gint)loop,
|
||||
(gint)preview_height);
|
||||
}
|
||||
|
||||
|
||||
/* draw diag lines at a Theta of +/- 1/6 Pi Rad */
|
||||
|
||||
|
||||
diagonal_start = -(((int)preview_width * TAN_1o6PI_RAD) - (((int)(preview_width * TAN_1o6PI_RAD)) % vstep));
|
||||
|
||||
|
||||
diagonal_end = preview_height + (preview_width * TAN_1o6PI_RAD);
|
||||
diagonal_end -= ((int)diagonal_end) % vstep;
|
||||
|
||||
|
||||
diagonal_width = preview_width;
|
||||
diagonal_height = preview_width * TAN_1o6PI_RAD;
|
||||
|
||||
|
||||
/* Draw diag lines */
|
||||
for (loop = diagonal_start ; loop < diagonal_end ; loop += vstep)
|
||||
{
|
||||
|
@ -443,7 +443,7 @@ draw_grid_iso (GdkGC *drawgc)
|
|||
(gint)loop,
|
||||
(gint)diagonal_width,
|
||||
(gint)loop + diagonal_height);
|
||||
|
||||
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
drawgc,
|
||||
(gint)0,
|
||||
|
@ -509,7 +509,7 @@ draw_grid (void)
|
|||
draw_grid_iso (drawgc);
|
||||
}
|
||||
|
||||
static gint
|
||||
static gint
|
||||
get_num_radials (void)
|
||||
{
|
||||
gint gridsp = MAX_GRID + MIN_GRID;
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_GRID_H__
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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"
|
||||
|
@ -46,7 +46,7 @@ d_copy_line (Dobject *obj)
|
|||
|
||||
g_assert (obj->type == LINE);
|
||||
|
||||
nl = d_new_object (LINE, obj->points->pnt.x, obj->points->pnt.y);
|
||||
nl = d_new_object (LINE, obj->points->pnt.x, obj->points->pnt.y);
|
||||
nl->points->next = d_copy_dobjpoints (obj->points->next);
|
||||
|
||||
return nl;
|
||||
|
@ -76,7 +76,7 @@ d_draw_line (Dobject *obj)
|
|||
draw_sqr (&spnt->pnt);
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
d_paint_line (Dobject *obj)
|
||||
{
|
||||
DobjPoints * spnt;
|
||||
|
@ -91,7 +91,7 @@ d_paint_line (Dobject *obj)
|
|||
return; /* no-line */
|
||||
|
||||
line_pnts = g_new0 (gdouble, 2 * seg_count + 1);
|
||||
|
||||
|
||||
/* Go around all the points drawing a line from one to the next */
|
||||
for (spnt = obj->points; spnt; spnt = spnt->next)
|
||||
{
|
||||
|
@ -116,7 +116,7 @@ d_paint_line (Dobject *obj)
|
|||
gfig_context->drawable_id,
|
||||
seg_count * 2, line_pnts);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
gimp_free_select (gfig_context->image_id,
|
||||
seg_count * 2, line_pnts,
|
||||
|
@ -129,7 +129,7 @@ d_paint_line (Dobject *obj)
|
|||
g_free (line_pnts);
|
||||
}
|
||||
|
||||
/* Create a new line object. starting at the x, y point might add styles
|
||||
/* Create a new line object. starting at the x, y point might add styles
|
||||
* later.
|
||||
*/
|
||||
|
||||
|
@ -162,7 +162,7 @@ d_delete_line (Dobject *obj)
|
|||
* pos = -1 = tail
|
||||
* 0 < pos = nth position
|
||||
*/
|
||||
|
||||
|
||||
void
|
||||
d_pnt_add_line (Dobject *obj,
|
||||
gint x,
|
||||
|
@ -212,7 +212,7 @@ d_update_line (GdkPoint *pnt)
|
|||
|
||||
/* Get start of segments */
|
||||
spnt = obj_creating->points;
|
||||
|
||||
|
||||
if (!spnt)
|
||||
return; /* No points */
|
||||
|
||||
|
@ -221,7 +221,7 @@ d_update_line (GdkPoint *pnt)
|
|||
/* undraw current */
|
||||
/* Draw square on point */
|
||||
draw_circle (&epnt->pnt);
|
||||
|
||||
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
/*gfig_context->preview->style->bg_gc[GTK_STATE_NORMAL],*/
|
||||
gfig_gc,
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_LINE_H__
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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"
|
||||
|
@ -114,7 +114,7 @@ d_draw_poly (Dobject *obj)
|
|||
GdkPoint calc_pnt;
|
||||
|
||||
ang_loop = (gdouble)loop * ang_grid + offset_angle;
|
||||
|
||||
|
||||
lx = radius * cos (ang_loop);
|
||||
ly = radius * sin (ang_loop);
|
||||
|
||||
|
@ -172,7 +172,7 @@ d_paint_poly (Dobject *obj)
|
|||
return; /* no-line */
|
||||
|
||||
line_pnts = g_new0 (gdouble, 2 * seg_count + 1);
|
||||
|
||||
|
||||
/* Go around all the points drawing a line from one to the next */
|
||||
|
||||
radius_pnt = center_pnt->next; /* this defines the vetices */
|
||||
|
@ -191,9 +191,9 @@ d_paint_poly (Dobject *obj)
|
|||
{
|
||||
gdouble lx, ly;
|
||||
GdkPoint calc_pnt;
|
||||
|
||||
|
||||
ang_loop = (gdouble)loop * ang_grid + offset_angle;
|
||||
|
||||
|
||||
lx = radius * cos (ang_loop);
|
||||
ly = radius * sin (ang_loop);
|
||||
|
||||
|
@ -276,7 +276,7 @@ d_poly2lines (Dobject *obj)
|
|||
if (!center_pnt)
|
||||
return; /* no-line */
|
||||
|
||||
/* Undraw it to start with - removes control points */
|
||||
/* Undraw it to start with - removes control points */
|
||||
obj->class->drawfunc (obj);
|
||||
|
||||
/* NULL out these points free later */
|
||||
|
@ -300,9 +300,9 @@ d_poly2lines (Dobject *obj)
|
|||
{
|
||||
gdouble lx, ly;
|
||||
GdkPoint calc_pnt;
|
||||
|
||||
|
||||
ang_loop = (gdouble)loop * ang_grid + offset_angle;
|
||||
|
||||
|
||||
lx = radius * cos (ang_loop);
|
||||
ly = radius * sin (ang_loop);
|
||||
|
||||
|
@ -370,7 +370,7 @@ d_star2lines (Dobject *obj)
|
|||
if (!center_pnt)
|
||||
return; /* no-line */
|
||||
|
||||
/* Undraw it to start with - removes control points */
|
||||
/* Undraw it to start with - removes control points */
|
||||
obj->class->drawfunc (obj);
|
||||
|
||||
/* NULL out these points free later */
|
||||
|
@ -416,7 +416,7 @@ d_star2lines (Dobject *obj)
|
|||
{
|
||||
gdouble lx, ly;
|
||||
GdkPoint calc_pnt;
|
||||
|
||||
|
||||
ang_loop = (gdouble)loop * ang_grid + offset_angle;
|
||||
|
||||
if (loop%2)
|
||||
|
@ -498,7 +498,7 @@ d_update_poly (GdkPoint *pnt)
|
|||
|
||||
/* Undraw last one then draw new one */
|
||||
center_pnt = obj_creating->points;
|
||||
|
||||
|
||||
if (!center_pnt)
|
||||
return; /* No points */
|
||||
|
||||
|
@ -507,7 +507,7 @@ d_update_poly (GdkPoint *pnt)
|
|||
* Only undraw if already have edge point.
|
||||
*/
|
||||
|
||||
/* Hack - turn off cnt points in draw routine
|
||||
/* Hack - turn off cnt points in draw routine
|
||||
* Looking back over the other update routines I could
|
||||
* use this trick again and cut down on code size!
|
||||
*/
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_POLY_H__
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_PREVIEW_H__
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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"
|
||||
|
@ -120,14 +120,14 @@ d_draw_spiral (Dobject *obj)
|
|||
ang_grid = 2.0*G_PI/(gdouble)180;
|
||||
|
||||
|
||||
for (loop = 0 ; loop <= abs (obj->type_data * 180) +
|
||||
for (loop = 0 ; loop <= abs (obj->type_data * 180) +
|
||||
clock_wise * (gint)RINT (offset_angle/ang_grid) ; loop++)
|
||||
{
|
||||
gdouble lx, ly;
|
||||
GdkPoint calc_pnt;
|
||||
|
||||
ang_loop = (gdouble)loop * ang_grid;
|
||||
|
||||
|
||||
lx = sp_cons * ang_loop * cos (ang_loop)*clock_wise;
|
||||
ly = sp_cons * ang_loop * sin (ang_loop);
|
||||
|
||||
|
@ -212,7 +212,7 @@ d_paint_spiral (Dobject *obj)
|
|||
GdkPoint calc_pnt;
|
||||
|
||||
ang_loop = (gdouble)loop * ang_grid;
|
||||
|
||||
|
||||
lx = sp_cons * ang_loop * cos (ang_loop)*clock_wise;
|
||||
ly = sp_cons * ang_loop * sin (ang_loop);
|
||||
|
||||
|
@ -297,7 +297,7 @@ d_update_spiral (GdkPoint *pnt)
|
|||
|
||||
/* Undraw last one then draw new one */
|
||||
center_pnt = obj_creating->points;
|
||||
|
||||
|
||||
if (!center_pnt)
|
||||
return; /* No points */
|
||||
|
||||
|
@ -306,7 +306,7 @@ d_update_spiral (GdkPoint *pnt)
|
|||
* Only undraw if already have edge point.
|
||||
*/
|
||||
|
||||
/* Hack - turn off cnt points in draw routine
|
||||
/* Hack - turn off cnt points in draw routine
|
||||
* Looking back over the other update routines I could
|
||||
* use this trick again and cut down on code size!
|
||||
*/
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_SPIRAL_H__
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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"
|
||||
|
@ -132,7 +132,7 @@ d_draw_star (Dobject *obj)
|
|||
GdkPoint calc_pnt;
|
||||
|
||||
ang_loop = (gdouble)loop * ang_grid + offset_angle;
|
||||
|
||||
|
||||
if (loop % 2)
|
||||
{
|
||||
lx = inner_radius * cos (ang_loop);
|
||||
|
@ -200,7 +200,7 @@ d_paint_star (Dobject *obj)
|
|||
return; /* no-line */
|
||||
|
||||
line_pnts = g_new0 (gdouble, 2 * seg_count + 1);
|
||||
|
||||
|
||||
/* Go around all the points drawing a line from one to the next */
|
||||
/* Next point defines the radius */
|
||||
outer_radius_pnt = center_pnt->next; /* this defines the vetices */
|
||||
|
@ -241,9 +241,9 @@ d_paint_star (Dobject *obj)
|
|||
{
|
||||
gdouble lx, ly;
|
||||
GdkPoint calc_pnt;
|
||||
|
||||
|
||||
ang_loop = (gdouble)loop * ang_grid + offset_angle;
|
||||
|
||||
|
||||
if (loop % 2)
|
||||
{
|
||||
lx = inner_radius * cos (ang_loop);
|
||||
|
@ -339,7 +339,7 @@ d_update_star (GdkPoint *pnt)
|
|||
|
||||
/* Undraw last one then draw new one */
|
||||
center_pnt = obj_creating->points;
|
||||
|
||||
|
||||
if (!center_pnt)
|
||||
return; /* No points */
|
||||
|
||||
|
@ -348,7 +348,7 @@ d_update_star (GdkPoint *pnt)
|
|||
* Only undraw if already have edge point.
|
||||
*/
|
||||
|
||||
/* Hack - turn off cnt points in draw routine
|
||||
/* Hack - turn off cnt points in draw routine
|
||||
* Looking back over the other update routines I could
|
||||
* use this trick again and cut down on code size!
|
||||
*/
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __GFIG_STAR_H__
|
||||
|
|
|
@ -59,7 +59,7 @@ add_stock_icon (const gchar *stock_id,
|
|||
GtkIconSource *source;
|
||||
GtkIconSet *set;
|
||||
GdkPixbuf *pixbuf;
|
||||
|
||||
|
||||
source = gtk_icon_source_new ();
|
||||
|
||||
gtk_icon_source_set_size (source, size);
|
||||
|
|
|
@ -119,7 +119,7 @@ typedef enum
|
|||
BRUSH_PATTERN_TYPE
|
||||
} BrushType;
|
||||
|
||||
typedef struct
|
||||
typedef struct
|
||||
{
|
||||
gchar *name;
|
||||
gchar *brush_name;
|
||||
|
@ -168,7 +168,7 @@ typedef struct DobjPoints
|
|||
gint found_me;
|
||||
} DobjPoints;
|
||||
|
||||
typedef struct
|
||||
typedef struct
|
||||
{
|
||||
DobjType type; /* the object type for this class */
|
||||
gchar *name;
|
||||
|
@ -192,7 +192,7 @@ typedef struct Dobject
|
|||
|
||||
typedef struct DAllObjs
|
||||
{
|
||||
struct DAllObjs *next;
|
||||
struct DAllObjs *next;
|
||||
Dobject *obj; /* Object on list */
|
||||
} DAllObjs;
|
||||
|
||||
|
@ -209,7 +209,7 @@ void d_pnt_add_line (Dobject *obj,
|
|||
gint pos);
|
||||
|
||||
DobjPoints *new_dobjpoint (gint x, gint y);
|
||||
void do_save_obj (Dobject *obj,
|
||||
void do_save_obj (Dobject *obj,
|
||||
GString *to);
|
||||
|
||||
DobjPoints *d_copy_dobjpoints (DobjPoints * pnts);
|
||||
|
|
Loading…
Reference in New Issue