qi-hardware/fped
1
0
Fork 0
mirror of git://projects.qi-hardware.com/fped.git synced 2024-11-25 22:43:09 +02:00
Code

- measurements entered through the GUI were connected to the active frame, not

Browse Source 
the root frame



git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5420 99fdad57-331a-0410-800a-d7fa5415bdb3
This commit is contained in:
werner 2009-08-11 21:54:18 +00:00
parent fe5f824b9e
commit 3064b2abbb
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gui_meas.c
View File

@ -269,7 +269,8 @@ static int end_new_meas(struct inst *from, struct inst *to)
if (from == to) if (from == to)
return 0; return 0;
/* it's safe to pass "from" here, but we may change it later */ /* it's safe to pass "from" here, but we may change it later */
obj = new_obj(ot_meas, from); obj = new_obj_unconnected(ot_meas, from);
connect_obj(root_frame, obj);
meas = &obj->u.meas; meas = &obj->u.meas;
meas->label = NULL; meas->label = NULL;
switch (mode) { switch (mode) {

23
gui_tool.c
View File

@ -83,9 +83,9 @@ static struct vec *new_vec(struct inst *base)
} }
struct obj *new_obj(enum obj_type type, struct inst *base) struct obj *new_obj_unconnected(enum obj_type type, struct inst *base)
{ {
struct obj *obj, **walk; struct obj *obj;
obj = alloc_type(struct obj); obj = alloc_type(struct obj);
obj->type = type; obj->type = type;
@ -93,8 +93,25 @@ struct obj *new_obj(enum obj_type type, struct inst *base)
obj->base = inst_get_vec(base); obj->base = inst_get_vec(base);
obj->next = NULL; obj->next = NULL;
obj->lineno = 0; obj->lineno = 0;
for (walk = &active_frame->objs; *walk; walk = &(*walk)->next); return obj;
}
void connect_obj(struct frame *frame, struct obj *obj)
{
struct obj **walk;
for (walk = &frame->objs; *walk; walk = &(*walk)->next);
*walk = obj; *walk = obj;
}
static struct obj *new_obj(enum obj_type type, struct inst *base)
{
struct obj *obj;
obj = new_obj_unconnected(type, base);
connect_obj(active_frame, obj);
return obj; return obj;
} }

3
gui_tool.h
View File

@ -57,7 +57,8 @@ void tool_redraw(void);
* compilation unit. * compilation unit.
*/ */
struct obj *new_obj(enum obj_type type, struct inst *base); struct obj *new_obj_unconnected(enum obj_type type, struct inst *base);
void connect_obj(struct frame *frame, struct obj *obj);
struct pix_buf *draw_move_line_common(struct inst *inst, struct pix_buf *draw_move_line_common(struct inst *inst,
struct coord end, struct coord pos, int i); struct coord end, struct coord pos, int i);
struct pix_buf *drag_new_line(struct inst *from, struct coord to); struct pix_buf *drag_new_line(struct inst *from, struct coord to);