Index: trunk/src/flag.h =================================================================== --- trunk/src/flag.h (revision 10729) +++ trunk/src/flag.h (revision 10730) @@ -72,7 +72,7 @@ PCB_FLAG_PININPOLY = 0x00010, /*!< For pins and pads, this flag is used internally to indicate that the pin or pad overlaps a polygon on some layer.*/ PCB_FLAG_CLEARPOLY = 0x00010, /*!< For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection). When clear, polygons will solidly connect to pins and vias. */ PCB_FLAG_HIDENAME = 0x00010, /*!< For elements, when set the name of the element is hidden. */ - PCB_FLAG_DISPLAYNAME = 0x00020, /*!< For elements, when set the names of pins are shown. */ + PCB_FLAG_DISPLAYNAME = 0x00020, /*!< OBSOLETE: For elements, when set the names of pins are shown. */ PCB_FLAG_CLEARLINE = 0x00020, /*!< For lines and arcs, the line/arc will clear polygons instead of connecting to them. */ PCB_FLAG_FULLPOLY = 0x00020, /*!< For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one). */ PCB_FLAG_SELECTED = 0x00040, /*!< Set when the object is selected. */ @@ -90,7 +90,8 @@ PCB_FLAG_VISIT = 0x08000, /*!< marker to avoid re-visiting an object */ PCB_FLAG_NONETLIST = 0x10000, /* element is not on the netlist and should not interfere with the netlist */ PCB_FLAG_MINCUT = 0x20000, /* used by the mincut short find code */ - PCB_FLAG_ONPOINT = 0x40000 /*!< crosshair is on line point or arc point */ + PCB_FLAG_ONPOINT = 0x40000, /*!< crosshair is on line point or arc point */ + PCB_FLAG_TERMNAME = 0x80000 /*!< when set the names of pins are shown. */ /* PCB_FLAG_NOCOPY = (PCB_FLAG_FOUND | CONNECTEDFLAG | PCB_FLAG_ONPOINT)*/ } pcb_flag_values_t; Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 10729) +++ trunk/src/flag_str.c (revision 10730) @@ -75,7 +75,8 @@ {PCB_FLAG_EDGE2, N("edge2"), PCB_TYPEMASK_ALL}, {PCB_FLAG_FULLPOLY, N("fullpoly"), PCB_TYPE_POLYGON}, {PCB_FLAG_NOPASTE, N("nopaste"), PCB_TYPE_PAD}, - {PCB_FLAG_NONETLIST, N("nonetlist"), PCB_TYPEMASK_ALL} + {PCB_FLAG_NONETLIST, N("nonetlist"), PCB_TYPEMASK_ALL}, + {PCB_FLAG_TERMNAME, N("termname"), PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_TEXT | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_SUBC} }; #undef N Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 10729) +++ trunk/src/gui_act.c (revision 10730) @@ -462,22 +462,22 @@ case PCB_TYPE_ELEMENT: PCB_PIN_LOOP((pcb_element_t *) ptr1); { - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, pin)) pcb_pin_name_invalidate_erase(pin); else pcb_pin_name_invalidate_draw(pin); pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, ptr1, pin, pin); - PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, pin); + PCB_FLAG_TOGGLE(PCB_FLAG_TERMNAME, pin); } PCB_END_LOOP; PCB_PAD_LOOP((pcb_element_t *) ptr1); { - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pad)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, pad)) pcb_pad_name_invalidate_erase(pad); else pcb_pad_name_invalidate_draw(pad); pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, ptr1, pad, pad); - PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, pad); + PCB_FLAG_TOGGLE(PCB_FLAG_TERMNAME, pad); } PCB_END_LOOP; pcb_board_set_changed_flag(pcb_true); @@ -486,12 +486,12 @@ break; case PCB_TYPE_PIN: - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, (pcb_pin_t *) ptr2)) pcb_pin_name_invalidate_erase((pcb_pin_t *) ptr2); else pcb_pin_name_invalidate_draw((pcb_pin_t *) ptr2); pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, ptr1, ptr2, ptr3); - PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_TERMNAME, (pcb_pin_t *) ptr2); pcb_board_set_changed_flag(pcb_true); pcb_undo_inc_serial(); pcb_draw(); @@ -498,23 +498,23 @@ break; case PCB_TYPE_PAD: - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, (pcb_pad_t *) ptr2)) pcb_pad_name_invalidate_erase((pcb_pad_t *) ptr2); else pcb_pad_name_invalidate_draw((pcb_pad_t *) ptr2); pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, ptr1, ptr2, ptr3); - PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_TERMNAME, (pcb_pad_t *) ptr2); pcb_board_set_changed_flag(pcb_true); pcb_undo_inc_serial(); pcb_draw(); break; case PCB_TYPE_VIA: - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, (pcb_pin_t *) ptr2)) pcb_via_name_invalidate_erase((pcb_pin_t *) ptr2); else pcb_via_name_invalidate_draw((pcb_pin_t *) ptr2); pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, ptr1, ptr2, ptr3); - PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_TERMNAME, (pcb_pin_t *) ptr2); pcb_board_set_changed_flag(pcb_true); pcb_undo_inc_serial(); pcb_draw(); @@ -545,7 +545,7 @@ } pcb_undo_add_obj_to_flag(type, ptr1, ptr2, ptr3); - PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, obj); + PCB_FLAG_TOGGLE(PCB_FLAG_TERMNAME, obj); pcb_board_set_changed_flag(pcb_true); pcb_undo_inc_serial(); pcb_draw(); Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 10729) +++ trunk/src/obj_pad.c (revision 10730) @@ -317,7 +317,7 @@ char *old = Pad->Name; Element = Element; /* get rid of 'unused...' warnings */ - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pad)) { pcb_pad_name_invalidate_erase(Pad); Pad->Name = ctx->chgname.new_name; pcb_pad_name_invalidate_draw(Pad); @@ -333,7 +333,7 @@ char *old = Pad->Number; Element = Element; /* get rid of 'unused...' warnings */ - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pad)) { pcb_pad_name_invalidate_erase(Pad); Pad->Number = ctx->chgname.new_name; pcb_pad_name_invalidate_draw(Pad); @@ -529,7 +529,7 @@ int *side = cl; if (PCB_ON_SIDE(pad, *side)) { - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pad)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, pad)) draw_pad_name(pad); } return PCB_R_DIR_FOUND_CONTINUE; @@ -596,7 +596,7 @@ void pcb_pad_invalidate_erase(pcb_pad_t *Pad) { pcb_draw_invalidate(Pad); - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pad)) pcb_pad_name_invalidate_erase(Pad); pcb_flag_erase(&Pad->Flags); } @@ -609,7 +609,7 @@ void pcb_pad_invalidate_draw(pcb_pad_t *Pad) { pcb_draw_invalidate(Pad); - if (pcb_draw_doing_pinout || PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) + if (pcb_draw_doing_pinout || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pad)) pcb_pad_name_invalidate_draw(Pad); } Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 10729) +++ trunk/src/obj_pinvia.c (revision 10730) @@ -574,7 +574,7 @@ { char *old = Via->Name; - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) { + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Via)) { pcb_pin_name_invalidate_erase(Via); Via->Name = ctx->chgname.new_name; pcb_pin_name_invalidate_draw(Via); @@ -590,7 +590,7 @@ char *old = Pin->Name; Element = Element; /* get rid of 'unused...' warnings */ - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pin)) { pcb_pin_name_invalidate_erase(Pin); Pin->Name = ctx->chgname.new_name; pcb_pin_name_invalidate_draw(Pin); @@ -606,7 +606,7 @@ char *old = Pin->Number; Element = Element; /* get rid of 'unused...' warnings */ - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pin)) { pcb_pin_name_invalidate_erase(Pin); Pin->Number = ctx->chgname.new_name; pcb_pin_name_invalidate_draw(Pin); @@ -907,7 +907,7 @@ void *pcb_pinop_invalidate_label(pcb_opctx_t *ctx, pcb_pin_t *pin) { - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, pin)) pcb_pin_name_invalidate_erase(pin); else pcb_pin_name_invalidate_draw(pin); @@ -1038,7 +1038,7 @@ static void draw_pin_name(pcb_pin_t *pin) { - if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) && PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pin)) + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) && PCB_FLAG_TEST(PCB_FLAG_TERMNAME, pin)) _draw_pv_name(pin); } @@ -1147,7 +1147,7 @@ void pcb_via_invalidate_erase(pcb_pin_t *Via) { pcb_draw_invalidate(Via); - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Via)) pcb_via_name_invalidate_erase(Via); pcb_flag_erase(&Via->Flags); } @@ -1160,7 +1160,7 @@ void pcb_pin_invalidate_erase(pcb_pin_t *Pin) { pcb_draw_invalidate(Pin); - if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pin)) pcb_pin_name_invalidate_erase(Pin); pcb_flag_erase(&Pin->Flags); } @@ -1173,7 +1173,7 @@ void pcb_via_invalidate_draw(pcb_pin_t *Via) { pcb_draw_invalidate(Via); - if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Via)) pcb_via_name_invalidate_draw(Via); } @@ -1185,7 +1185,7 @@ void pcb_pin_invalidate_draw(pcb_pin_t *Pin) { pcb_draw_invalidate(Pin); - if ((!PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) && PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) + if ((!PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) && PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pin)) || pcb_draw_doing_pinout) pcb_pin_name_invalidate_draw(Pin); }