Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5062) +++ trunk/doc-rnd/hacking/renames (revision 5063) @@ -1097,3 +1097,11 @@ NAMEONPCB_INDEX -> PCB_ELEMNAME_IDX_REFDES VALUE_INDEX -> PCB_ELEMNAME_IDX_VALUE NAME_INDEX -> PCB_ELEMNAME_IDX_VISIBLE +ELEMENT_NAME -> PCB_ELEM_NAME_VISIBLE +DESCRIPTION_NAME -> PCB_ELEM_NAME_DESCRIPTION +NAMEONPCB_NAME -> PCB_ELEM_NAME_REFDES +VALUE_NAME -> PCB_ELEM_NAME_VALUE +ELEMENT_TEXT -> PCB_ELEM_TEXT_VISIBLE +DESCRIPTION_TEXT -> PCB_ELEM_TEXT_DESCRIPTION +NAMEONPCB_TEXT -> PCB_ELEM_TEXT_REFDES +VALUE_TEXT -> PCB_ELEM_TEXT_VALUE Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 5062) +++ trunk/src/change.c (revision 5063) @@ -1204,7 +1204,7 @@ break; case PCB_TYPE_ELEMENT: - name = pcb_gui->prompt_for(_("Elementname:"), PCB_EMPTY(ELEMENT_NAME(PCB, (pcb_element_t *) Ptr2))); + name = pcb_gui->prompt_for(_("Elementname:"), PCB_EMPTY(PCB_ELEM_NAME_VISIBLE(PCB, (pcb_element_t *) Ptr2))); break; } if (name) { Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 5062) +++ trunk/src/change_act.c (revision 5063) @@ -570,7 +570,7 @@ PCB_ELEMENT_LOOP(PCB->Data); { - if (PCB_NSTRCMP(refdes, NAMEONPCB_NAME(element)) == 0) { + if (PCB_NSTRCMP(refdes, PCB_ELEM_NAME_REFDES(element)) == 0) { PCB_PIN_LOOP(element); { if (PCB_NSTRCMP(pinnum, pin->Number) == 0) { Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 5062) +++ trunk/src/data.c (revision 5063) @@ -292,7 +292,7 @@ box.X2 = MAX(box.X2, element->BoundingBox.X2); box.Y2 = MAX(box.Y2, element->BoundingBox.Y2); { - pcb_text_t *text = &NAMEONPCB_TEXT(element); + pcb_text_t *text = &PCB_ELEM_TEXT_REFDES(element); box.X1 = MIN(box.X1, text->BoundingBox.X1); box.Y1 = MIN(box.Y1, text->BoundingBox.Y1); box.X2 = MAX(box.X2, text->BoundingBox.X2); Index: trunk/src/find_debug.c =================================================================== --- trunk/src/find_debug.c (revision 5062) +++ trunk/src/find_debug.c (revision 5063) @@ -33,11 +33,11 @@ static void PrintElementNameList(pcb_element_t *Element, FILE * FP) { fputc('(', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(DESCRIPTION_NAME(Element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_DESCRIPTION(Element))); fputc(' ', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(NAMEONPCB_NAME(Element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_REFDES(Element))); fputc(' ', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(VALUE_NAME(Element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_VALUE(Element))); fputc(')', FP); fputc('\n', FP); } Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 5062) +++ trunk/src/find_drc.c (revision 5063) @@ -656,7 +656,7 @@ BuildObjectList(&object_count, &object_id_list, &object_type_list); title = _("Element %s has %i silk lines which are too thin"); - name = PCB_UNKNOWN(NAMEONPCB_NAME(element)); + name = PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)); /* -4 is for the %s and %i place-holders */ /* +11 is the max printed length for a 32 bit integer */ Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 5062) +++ trunk/src/gui_act.c (revision 5063) @@ -933,7 +933,7 @@ pcb_bool changed = pcb_false; PCB_ELEMENT_LOOP(PCB->Data); { - if ((PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) || PCB_FLAG_TEST(PCB_FLAG_SELECTED, &NAMEONPCB_TEXT(element))) + if ((PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) || PCB_FLAG_TEST(PCB_FLAG_SELECTED, &PCB_ELEM_TEXT_REFDES(element))) && (PCB_FRONT(element) || PCB->InvisibleObjectsOn)) { pcb_undo_add_obj_to_flag(PCB_TYPE_ELEMENT, element, element, element); EraseElementName(element); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 5062) +++ trunk/src/obj_elem.c (revision 5063) @@ -185,7 +185,7 @@ pcb_line_new(&Buffer->Data->SILKLAYER, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, 0, pcb_no_flags()); if (line) - line->Number = pcb_strdup_null(NAMEONPCB_NAME(element)); + line->Number = pcb_strdup_null(PCB_ELEM_NAME_REFDES(element)); } PCB_END_LOOP; PCB_ARC_LOOP(element); @@ -361,8 +361,8 @@ /* now add the silkscreen. NOTE: elements must have pads or pins too */ PCB_LINE_LOOP(&Buffer->Data->SILKLAYER); { - if (line->Number && !NAMEONPCB_NAME(Element)) - NAMEONPCB_NAME(Element) = pcb_strdup(line->Number); + if (line->Number && !PCB_ELEM_NAME_REFDES(Element)) + PCB_ELEM_NAME_REFDES(Element) = pcb_strdup(line->Number); pcb_element_line_new(Element, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness); hasParts = pcb_true; } @@ -516,11 +516,11 @@ /* both coordinates and flags are the same */ Dest = pcb_element_new(Data, Dest, &PCB->Font, pcb_flag_mask(Src->Flags, PCB_FLAG_FOUND), - DESCRIPTION_NAME(Src), NAMEONPCB_NAME(Src), - VALUE_NAME(Src), DESCRIPTION_TEXT(Src).X + dx, - DESCRIPTION_TEXT(Src).Y + dy, - DESCRIPTION_TEXT(Src).Direction, - DESCRIPTION_TEXT(Src).Scale, pcb_flag_mask(DESCRIPTION_TEXT(Src).Flags, PCB_FLAG_FOUND), uniqueName); + PCB_ELEM_NAME_DESCRIPTION(Src), PCB_ELEM_NAME_REFDES(Src), + PCB_ELEM_NAME_VALUE(Src), PCB_ELEM_TEXT_DESCRIPTION(Src).X + dx, + PCB_ELEM_TEXT_DESCRIPTION(Src).Y + dy, + PCB_ELEM_TEXT_DESCRIPTION(Src).Direction, + PCB_ELEM_TEXT_DESCRIPTION(Src).Scale, pcb_flag_mask(PCB_ELEM_TEXT_DESCRIPTION(Src).Flags, PCB_FLAG_FOUND), uniqueName); /* abort on error */ if (!Dest) @@ -576,14 +576,14 @@ /* copy values and set additional information */ TextScale = MAX(PCB_MIN_TEXTSCALE, TextScale); - pcb_element_text_set(&DESCRIPTION_TEXT(Element), PCBFont, TextX, TextY, Direction, Description, TextScale, TextFlags); + pcb_element_text_set(&PCB_ELEM_TEXT_DESCRIPTION(Element), PCBFont, TextX, TextY, Direction, Description, TextScale, TextFlags); if (uniqueName) NameOnPCB = pcb_element_uniq_name(Data, NameOnPCB); - pcb_element_text_set(&NAMEONPCB_TEXT(Element), PCBFont, TextX, TextY, Direction, NameOnPCB, TextScale, TextFlags); - pcb_element_text_set(&VALUE_TEXT(Element), PCBFont, TextX, TextY, Direction, Value, TextScale, TextFlags); - DESCRIPTION_TEXT(Element).Element = Element; - NAMEONPCB_TEXT(Element).Element = Element; - VALUE_TEXT(Element).Element = Element; + pcb_element_text_set(&PCB_ELEM_TEXT_REFDES(Element), PCBFont, TextX, TextY, Direction, NameOnPCB, TextScale, TextFlags); + pcb_element_text_set(&PCB_ELEM_TEXT_VALUE(Element), PCBFont, TextX, TextY, Direction, Value, TextScale, TextFlags); + PCB_ELEM_TEXT_DESCRIPTION(Element).Element = Element; + PCB_ELEM_TEXT_REFDES(Element).Element = Element; + PCB_ELEM_TEXT_VALUE(Element).Element = Element; Element->Flags = Flags; Element->ID = pcb_create_ID_get(); @@ -889,7 +889,7 @@ for (;;) { PCB_ELEMENT_LOOP(Data); { - if (NAMEONPCB_NAME(element) && PCB_NSTRCMP(NAMEONPCB_NAME(element), Name) == 0) { + if (PCB_ELEM_NAME_REFDES(element) && PCB_NSTRCMP(PCB_ELEM_NAME_REFDES(element), Name) == 0) { Name = BumpName(Name); unique = pcb_false; break; @@ -1346,7 +1346,7 @@ void *ChangeElementNameSize(pcb_opctx_t *ctx, pcb_element_t *Element) { int value = ctx->chgsize.absolute ? PCB_COORD_TO_MIL(ctx->chgsize.absolute) - : DESCRIPTION_TEXT(Element).Scale + PCB_COORD_TO_MIL(ctx->chgsize.delta); + : PCB_ELEM_TEXT_DESCRIPTION(Element).Scale + PCB_COORD_TO_MIL(ctx->chgsize.delta); if (PCB_FLAG_TEST(PCB_FLAG_LOCK, &Element->Name[0])) return (NULL); @@ -1664,7 +1664,7 @@ return; if (pcb_draw_doing_pinout || pcb_draw_doing_assy) pcb_gui->set_color(Output.fgGC, PCB->ElementColor); - else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element))) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &PCB_ELEM_TEXT_VISIBLE(PCB, element))) pcb_gui->set_color(Output.fgGC, PCB->ElementSelectedColor); else if (PCB_FRONT(element)) { #warning TODO: why do we test for Names flag here instead of elements flag? @@ -1676,7 +1676,7 @@ else pcb_gui->set_color(Output.fgGC, PCB->InvisibleObjectsColor); - DrawTextLowLevel(&ELEMENT_TEXT(PCB, element), PCB->minSlk); + DrawTextLowLevel(&PCB_ELEM_TEXT_VISIBLE(PCB, element), PCB->minSlk); } @@ -1834,7 +1834,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, Element)) { return; } - DrawText(NULL, &ELEMENT_TEXT(PCB, Element)); + DrawText(NULL, &PCB_ELEM_TEXT_VISIBLE(PCB, Element)); } void DrawElement(pcb_element_t *Element) @@ -1848,7 +1848,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, Element)) return; - DrawText(NULL, &ELEMENT_TEXT(PCB, Element)); + DrawText(NULL, &PCB_ELEM_TEXT_VISIBLE(PCB, Element)); } void DrawElementPackage(pcb_element_t *Element) Index: trunk/src/obj_elem.h =================================================================== --- trunk/src/obj_elem.h (revision 5062) +++ trunk/src/obj_elem.h (revision 5063) @@ -110,15 +110,16 @@ #define PCB_ELEMNAME_IDX_VISIBLE() (conf_core.editor.name_on_pcb ? PCB_ELEMNAME_IDX_REFDES :\ (conf_core.editor.description ? PCB_ELEMNAME_IDX_DESCRIPTION : PCB_ELEMNAME_IDX_VALUE)) -#define ELEMENT_NAME(p,e) ((e)->Name[PCB_ELEMNAME_IDX_VISIBLE()].TextString) -#define DESCRIPTION_NAME(e) ((e)->Name[PCB_ELEMNAME_IDX_DESCRIPTION].TextString) -#define NAMEONPCB_NAME(e) ((e)->Name[PCB_ELEMNAME_IDX_REFDES].TextString) -#define VALUE_NAME(e) ((e)->Name[PCB_ELEMNAME_IDX_VALUE].TextString) -#define ELEMENT_TEXT(p,e) ((e)->Name[PCB_ELEMNAME_IDX_VISIBLE()]) -#define DESCRIPTION_TEXT(e) ((e)->Name[PCB_ELEMNAME_IDX_DESCRIPTION]) -#define NAMEONPCB_TEXT(e) ((e)->Name[PCB_ELEMNAME_IDX_REFDES]) -#define VALUE_TEXT(e) ((e)->Name[PCB_ELEMNAME_IDX_VALUE]) +#define PCB_ELEM_NAME_VISIBLE(p,e) ((e)->Name[PCB_ELEMNAME_IDX_VISIBLE()].TextString) +#define PCB_ELEM_NAME_DESCRIPTION(e) ((e)->Name[PCB_ELEMNAME_IDX_DESCRIPTION].TextString) +#define PCB_ELEM_NAME_REFDES(e) ((e)->Name[PCB_ELEMNAME_IDX_REFDES].TextString) +#define PCB_ELEM_NAME_VALUE(e) ((e)->Name[PCB_ELEMNAME_IDX_VALUE].TextString) +#define PCB_ELEM_TEXT_VISIBLE(p,e) ((e)->Name[PCB_ELEMNAME_IDX_VISIBLE()]) +#define PCB_ELEM_TEXT_DESCRIPTION(e) ((e)->Name[PCB_ELEMNAME_IDX_DESCRIPTION]) +#define PCB_ELEM_TEXT_REFDES(e) ((e)->Name[PCB_ELEMNAME_IDX_REFDES]) +#define PCB_ELEM_TEXT_VALUE(e) ((e)->Name[PCB_ELEMNAME_IDX_VALUE]) + /*** loops ***/ #define PCB_ELEMENT_LOOP(top) do { \ Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 5062) +++ trunk/src/object_act.c (revision 5063) @@ -48,14 +48,14 @@ static pcb_element_t *find_element_by_refdes(const char *refdes) { - if (element_cache && NAMEONPCB_NAME(element_cache) - && strcmp(NAMEONPCB_NAME(element_cache), refdes) == 0) + if (element_cache && PCB_ELEM_NAME_REFDES(element_cache) + && strcmp(PCB_ELEM_NAME_REFDES(element_cache), refdes) == 0) return element_cache; PCB_ELEMENT_LOOP(PCB->Data); { - if (NAMEONPCB_NAME(element) - && strcmp(NAMEONPCB_NAME(element), refdes) == 0) { + if (PCB_ELEM_NAME_REFDES(element) + && strcmp(PCB_ELEM_NAME_REFDES(element), refdes) == 0) { element_cache = element; return element_cache; } @@ -169,9 +169,9 @@ } } - if (NAMEONPCB_NAME(e)) { - buf = (char *) malloc(strlen(NAMEONPCB_NAME(e)) + strlen("Element X Attributes")); - sprintf(buf, "Element %s Attributes", NAMEONPCB_NAME(e)); + if (PCB_ELEM_NAME_REFDES(e)) { + buf = (char *) malloc(strlen(PCB_ELEM_NAME_REFDES(e)) + strlen("Element X Attributes")); + sprintf(buf, "Element %s Attributes", PCB_ELEM_NAME_REFDES(e)); } else { buf = pcb_strdup("Unnamed Element Attributes"); @@ -506,7 +506,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_FOUND, element)) { PCB_FLAG_CLEAR(PCB_FLAG_FOUND, element); } - else if (!PCB_EMPTY_STRING_P(NAMEONPCB_NAME(element))) { + else if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_REFDES(element))) { /* Unnamed elements should remain untouched */ PCB_FLAG_SET(PCB_FLAG_SELECTED, element); } @@ -581,7 +581,7 @@ pcb_board_set_changed_flag(pcb_true); } - else if (e && strcmp(DESCRIPTION_NAME(e), footprint) != 0) { + else if (e && strcmp(PCB_ELEM_NAME_DESCRIPTION(e), footprint) != 0) { #ifdef DEBUG printf(" ... Footprint on board, but different from footprint loaded.\n"); #endif @@ -669,7 +669,7 @@ PCB_ELEMENT_LOOP(PCB->Data); { - if (PCB_NSTRCMP(refdes, NAMEONPCB_NAME(element)) == 0) { + if (PCB_NSTRCMP(refdes, PCB_ELEM_NAME_REFDES(element)) == 0) { e = element; break; } @@ -985,7 +985,7 @@ { PCB_ELEMENT_LOOP(PCB->Data); { - printf("%d %s\n", pcb_element_get_orientation(element), NAMEONPCB_NAME(element)); + printf("%d %s\n", pcb_element_get_orientation(element), PCB_ELEM_NAME_REFDES(element)); } PCB_END_LOOP; Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 5062) +++ trunk/src/rats.c (revision 5063) @@ -235,7 +235,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.ptr2)) pcb_message(PCB_MSG_DEFAULT, _ ("Error! Element %s pin %s appears multiple times in the netlist file.\n"), - NAMEONPCB_NAME((pcb_element_t *) LastPoint.ptr1), + PCB_ELEM_NAME_REFDES((pcb_element_t *) LastPoint.ptr1), (LastPoint.type == PCB_TYPE_PIN) ? ((pcb_pin_t *) LastPoint.ptr2)->Number : ((pcb_pad_t *) LastPoint.ptr2)->Number); else { @@ -327,7 +327,7 @@ warn = pcb_true; if (!pin->Spare) { pcb_message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to %s pin %s\n"), - &theNet->Name[2], PCB_UNKNOWN(NAMEONPCB_NAME(element)), PCB_UNKNOWN(pin->Number)); + &theNet->Name[2], PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(pin->Number)); pcb_stub_rat_found_short(pin, NULL, &theNet->Name[2]); continue; } @@ -358,7 +358,7 @@ warn = pcb_true; if (!pad->Spare) { pcb_message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to %s pad %s\n"), - &theNet->Name[2], PCB_UNKNOWN(NAMEONPCB_NAME(element)), PCB_UNKNOWN(pad->Number)); + &theNet->Name[2], PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(pad->Number)); pcb_stub_rat_found_short(NULL, pad, &theNet->Name[2]); continue; } @@ -828,7 +828,7 @@ pcb_message(PCB_MSG_DEFAULT, _("No pad/pin under rat line\n")); return (NULL); } - if (NAMEONPCB_NAME((pcb_element_t *) ptr1) == NULL || *NAMEONPCB_NAME((pcb_element_t *) ptr1) == 0) { + if (PCB_ELEM_NAME_REFDES((pcb_element_t *) ptr1) == NULL || *PCB_ELEM_NAME_REFDES((pcb_element_t *) ptr1) == 0) { pcb_message(PCB_MSG_DEFAULT, _("You must name the starting element first\n")); return (NULL); } @@ -843,7 +843,7 @@ pcb_message(PCB_MSG_DEFAULT, _("No pad/pin under rat line\n")); return (NULL); } - if (NAMEONPCB_NAME((pcb_element_t *) ptr1) == NULL || *NAMEONPCB_NAME((pcb_element_t *) ptr1) == 0) { + if (PCB_ELEM_NAME_REFDES((pcb_element_t *) ptr1) == NULL || *PCB_ELEM_NAME_REFDES((pcb_element_t *) ptr1) == 0) { pcb_message(PCB_MSG_DEFAULT, _("You must name the ending element first\n")); return (NULL); } @@ -919,7 +919,7 @@ default: return (NULL); } - strcpy(name, PCB_UNKNOWN(NAMEONPCB_NAME((pcb_element_t *) ptr1))); + strcpy(name, PCB_UNKNOWN(PCB_ELEM_NAME_REFDES((pcb_element_t *) ptr1))); strcat(name, "-"); strcat(name, PCB_UNKNOWN(num)); return (name); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 5062) +++ trunk/src/select.c (revision 5063) @@ -366,9 +366,9 @@ if ((PCB->ElementOn || !Flag) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == PCB_SWAP_IDENT || PCB->InvisibleObjectsOn)) { - if (PCB_BOX_NEAR_BOX(&ELEMENT_TEXT(PCB, element).BoundingBox, Box) - && !PCB_FLAG_TEST(PCB_FLAG_LOCK, &ELEMENT_TEXT(PCB, element)) - && PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element)) != Flag) { + if (PCB_BOX_NEAR_BOX(&PCB_ELEM_TEXT_VISIBLE(PCB, element).BoundingBox, Box) + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, &PCB_ELEM_TEXT_VISIBLE(PCB, element)) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, &PCB_ELEM_TEXT_VISIBLE(PCB, element)) != Flag) { /* select all names of element */ PCB_ELEMENT_PCB_TEXT_LOOP(element); { @@ -637,10 +637,10 @@ if (type & PCB_TYPE_ELEMENT_NAME && PCB->ElementOn && F->ElementName) PCB_ELEMENT_LOOP(PCB->Data); { - if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element))) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &PCB_ELEM_TEXT_VISIBLE(PCB, element))) { if (Reset) { - pcb_undo_add_obj_to_flag(PCB_TYPE_ELEMENT_NAME, element, &ELEMENT_TEXT(PCB, element), &ELEMENT_TEXT(PCB, element)); - PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element)); + pcb_undo_add_obj_to_flag(PCB_TYPE_ELEMENT_NAME, element, &PCB_ELEM_TEXT_VISIBLE(PCB, element), &PCB_ELEM_TEXT_VISIBLE(PCB, element)); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, &PCB_ELEM_TEXT_VISIBLE(PCB, element)); } F->ElementName(ctx, element); changed = pcb_true; @@ -906,7 +906,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == PCB_SWAP_IDENT || PCB->InvisibleObjectsOn) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) != Flag) { - const char* name = ELEMENT_NAME(PCB, element); + const char* name = PCB_ELEM_NAME_VISIBLE(PCB, element); if (name && REGEXEC(name)) { pcb_undo_add_obj_to_flag(PCB_TYPE_ELEMENT, element, element, element); PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, element); Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 5062) +++ trunk/src_plugins/export_bboard/bboard.c (revision 5063) @@ -407,10 +407,10 @@ *s2 = 0; offset_in_model = bboard_parse_offset(s2 + 1, &ox, &oy); } - if (!PCB_EMPTY_STRING_P(VALUE_NAME(element))) { - fname = bboard_get_model_filename(s, VALUE_NAME(element), pcb_true); + if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) { + fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_true); if (!fname) - fname = bboard_get_model_filename(s, VALUE_NAME(element), pcb_false); + fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_false); } if (!fname) fname = bboard_get_model_filename(s, NULL, pcb_false); @@ -424,10 +424,10 @@ s = pcb_attribute_get(&(element->Attributes), "Footprint::File"); if (s) { - if (!PCB_EMPTY_STRING_P(VALUE_NAME(element))) { - fname = bboard_get_model_filename(s, VALUE_NAME(element), pcb_true); + if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) { + fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_true); if (!fname) - fname = bboard_get_model_filename(s, VALUE_NAME(element), pcb_false); + fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_false); } if (!fname) fname = bboard_get_model_filename(s, NULL, pcb_false); @@ -434,16 +434,16 @@ } } if (!fname) { - s = DESCRIPTION_NAME(element); - if (!PCB_EMPTY_STRING_P(DESCRIPTION_NAME(element))) { - if (!PCB_EMPTY_STRING_P(VALUE_NAME(element))) { - fname = bboard_get_model_filename(DESCRIPTION_NAME(element), VALUE_NAME(element), pcb_true); + s = PCB_ELEM_NAME_DESCRIPTION(element); + if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_DESCRIPTION(element))) { + if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) { + fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), PCB_ELEM_NAME_VALUE(element), pcb_true); if (!fname) - fname = bboard_get_model_filename(DESCRIPTION_NAME(element), VALUE_NAME(element), pcb_false); + fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), PCB_ELEM_NAME_VALUE(element), pcb_false); } if (!fname) - fname = bboard_get_model_filename(DESCRIPTION_NAME(element), NULL, pcb_false); + fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), NULL, pcb_false); } } Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 5062) +++ trunk/src_plugins/export_bom/bom.c (revision 5063) @@ -240,8 +240,8 @@ PCB_ELEMENT_LOOP(PCB->Data); { /* insert this component into the bill of materials list */ - bom = bom_insert((char *) PCB_UNKNOWN(NAMEONPCB_NAME(element)), - (char *) PCB_UNKNOWN(DESCRIPTION_NAME(element)), (char *) PCB_UNKNOWN(VALUE_NAME(element)), bom); + bom = bom_insert((char *) PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), + (char *) PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)), (char *) PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element)), bom); } PCB_END_LOOP; Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 5062) +++ trunk/src_plugins/export_dsn/dsn.c (revision 5063) @@ -255,7 +255,7 @@ char *ename; pcb_point_t ecentroid = get_centroid(element); char *side = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? "back" : "front"; - ename = NAMEONPCB_NAME(element); + ename = PCB_ELEM_NAME_REFDES(element); if (ename != NULL) ename = pcb_strdup(ename); else Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 5062) +++ trunk/src_plugins/export_dxf/dxf.c (revision 5063) @@ -3963,7 +3963,7 @@ /* * insert the elements into the dxf list. */ - dxf = dxf_insert(PCB_UNKNOWN(NAMEONPCB_NAME(element)), PCB_UNKNOWN(DESCRIPTION_NAME(element)), PCB_UNKNOWN(VALUE_NAME(element)), dxf); + dxf = dxf_insert(PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)), PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element)), dxf); } PCB_END_LOOP; /* End of ELEMENT_LOOP */ /* @@ -4091,7 +4091,7 @@ " unable to figure out angle of element\n" " %s because pin #1 is at the centroid of the part\n" " and I could not find pin #2's location.\n" - " Setting to %g degrees.\n", PCB_UNKNOWN(NAMEONPCB_NAME(element)), theta); + " Setting to %g degrees.\n", PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), theta); } } else @@ -4104,9 +4104,9 @@ pcb_message(PCB_MSG_WARNING, "dxf.c|dxf_export_xref_file ():\n" " unable to figure out angle because I could\n" " not find pin #1 of element %s.\n" - " Setting to %g degrees.\n", PCB_UNKNOWN(NAMEONPCB_NAME(element)), theta); + " Setting to %g degrees.\n", PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), theta); } - dxf_block_name = pcb_strdup(dxf_clean_string(PCB_UNKNOWN(DESCRIPTION_NAME(element)))); + dxf_block_name = pcb_strdup(dxf_clean_string(PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)))); if (dxf_metric) { /* convert mils to mm */ dxf_x0 = PCB_COORD_TO_MM(x); @@ -4148,7 +4148,7 @@ pcb_message(PCB_MSG_WARNING, "dxf.c|dxf_export_xref_file ():\n" " unable to figure out angle of dxf block\n" " %s because pcb angle theta is not Cardinal [0.0, 90.0, 180.0, 270.0].\n" - " Setting dxf_rot_angle to %g degrees\n", PCB_UNKNOWN(NAMEONPCB_NAME(element)), dxf_rot_angle); + " Setting dxf_rot_angle to %g degrees\n", PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), dxf_rot_angle); } #endif dxf_write_insert(fp, dxf_id_code, dxf_block_name, DXF_DEFAULT_LINETYPE, /* dxf_linetype, */ Index: trunk/src_plugins/export_openscad/scadcomp.c =================================================================== --- trunk/src_plugins/export_openscad/scadcomp.c (revision 5062) +++ trunk/src_plugins/export_openscad/scadcomp.c (revision 5063) @@ -497,7 +497,7 @@ } else { /* still no model found, try model, based on description */ - model_name = DESCRIPTION_NAME(element); + model_name = PCB_ELEM_NAME_DESCRIPTION(element); if (model_name) { scad_writeout_element(element, model_name, SCAD_STANDARD, imported_model, simple); } Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 5062) +++ trunk/src_plugins/export_test/export_test.c (revision 5063) @@ -153,8 +153,8 @@ found_pin2 = 0; /* insert this component into the bill of materials list */ - export_test = export_test_insert((char *) PCB_UNKNOWN(NAMEONPCB_NAME(element)), - (char *) PCB_UNKNOWN(DESCRIPTION_NAME(element)), (char *) PCB_UNKNOWN(VALUE_NAME(element)), export_test); + export_test = export_test_insert((char *) PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), + (char *) PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)), (char *) PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element)), export_test); /* @@ -235,7 +235,7 @@ ("Printexport_test(): unable to figure out angle of element\n" " %s because pin #1 is at the centroid of the part.\n" " and I could not find pin #2's location\n" - " Setting to %g degrees\n", PCB_UNKNOWN(NAMEONPCB_NAME(element)), theta); + " Setting to %g degrees\n", PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), theta); } } else @@ -247,12 +247,12 @@ theta = 0.0; Message ("Printexport_test(): unable to figure out angle because I could\n" - " not find pin #1 of element %s\n" " Setting to %g degrees\n", PCB_UNKNOWN(NAMEONPCB_NAME(element)), theta); + " not find pin #1 of element %s\n" " Setting to %g degrees\n", PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), theta); } - name = Cleanexport_testString((char *) PCB_UNKNOWN(NAMEONPCB_NAME(element))); - descr = Cleanexport_testString((char *) PCB_UNKNOWN(DESCRIPTION_NAME(element))); - value = Cleanexport_testString((char *) PCB_UNKNOWN(VALUE_NAME(element))); + name = Cleanexport_testString((char *) PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element))); + descr = Cleanexport_testString((char *) PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element))); + value = Cleanexport_testString((char *) PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element))); y = PCB->MaxHeight - y; pcb_fprintf(fp, "%m+%s,\"%s\",\"%s\",%mS,%.2mS,%g,%s\n", Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 5062) +++ trunk/src_plugins/export_xy/xy.c (revision 5063) @@ -295,21 +295,21 @@ pcb_message (PCB_MSG_WARNING, "PrintBOM(): unable to figure out angle because I could\n" " not find a suitable reference pin of element %s\n" - " Setting to %g degrees\n", PCB_UNKNOWN(NAMEONPCB_NAME(element)), theta); + " Setting to %g degrees\n", PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), theta); } else if (!found_any_not_at_centroid) { pcb_message (PCB_MSG_WARNING, "PrintBOM(): unable to figure out angle of element\n" " %s because the reference pin(s) are at the centroid of the part.\n" - " Setting to %g degrees\n", PCB_UNKNOWN(NAMEONPCB_NAME(element)), theta); + " Setting to %g degrees\n", PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), theta); } } } - name = CleanBOMString((char *) PCB_UNKNOWN(NAMEONPCB_NAME(element))); - descr = CleanBOMString((char *) PCB_UNKNOWN(DESCRIPTION_NAME(element))); - value = CleanBOMString((char *) PCB_UNKNOWN(VALUE_NAME(element))); + name = CleanBOMString((char *) PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element))); + descr = CleanBOMString((char *) PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element))); + value = CleanBOMString((char *) PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element))); y = PCB->MaxHeight - y; pcb_fprintf(fp, "%m+%s,\"%s\",\"%s\",%mS,%.2mS,%g,%s\n", Index: trunk/src_plugins/hid_gtk/gui-output-events.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-output-events.c (revision 5062) +++ trunk/src_plugins/hid_gtk/gui-output-events.c (revision 5063) @@ -311,7 +311,7 @@ return NULL; if (type == PCB_TYPE_PIN || type == PCB_TYPE_PAD) - elename = (char *) PCB_UNKNOWN(NAMEONPCB_NAME((pcb_element_t *) ptr1)); + elename = (char *) PCB_UNKNOWN(PCB_ELEM_NAME_REFDES((pcb_element_t *) ptr1)); pinname = pcb_connection_name(type, ptr1, ptr2); Index: trunk/src_plugins/hid_gtk/gui-pinout-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-pinout-window.c (revision 5062) +++ trunk/src_plugins/hid_gtk/gui-pinout-window.c (revision 5063) @@ -55,7 +55,7 @@ if (!element) return; title = g_strdup_printf("%s [%s,%s]", - PCB_UNKNOWN(DESCRIPTION_NAME(element)), PCB_UNKNOWN(NAMEONPCB_NAME(element)), PCB_UNKNOWN(VALUE_NAME(element))); + PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)), PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element))); top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(top_window), title); Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 5062) +++ trunk/src_plugins/io_kicad/write.c (revision 5063) @@ -835,17 +835,17 @@ information fprintf(FP, "\nDS %s ", F2S(element, PCB_TYPE_ELEMENT)); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(DESCRIPTION_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_DESCRIPTION(element))); fputc(' ', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(NAMEONPCB_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_REFDES(element))); fputc(' ', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(VALUE_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_VALUE(element))); pcb_fprintf(FP, " %mm %mm %mm %mm %d %d %s]\n(\n", element->MarkX, element->MarkY, - DESCRIPTION_TEXT(element).X - element->MarkX, - DESCRIPTION_TEXT(element).Y - element->MarkY, - DESCRIPTION_TEXT(element).Direction, - DESCRIPTION_TEXT(element).Scale, F2S(&(DESCRIPTION_TEXT(element)), PCB_TYPE_ELEMENT_NAME)); + PCB_ELEM_TEXT_DESCRIPTION(element).X - element->MarkX, + PCB_ELEM_TEXT_DESCRIPTION(element).Y - element->MarkY, + PCB_ELEM_TEXT_DESCRIPTION(element).Direction, + PCB_ELEM_TEXT_DESCRIPTION(element).Scale, F2S(&(PCB_ELEM_TEXT_DESCRIPTION(element)), PCB_TYPE_ELEMENT_NAME)); */ Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 5062) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 5063) @@ -795,17 +795,17 @@ information fprintf(FP, "\nDS %s ", F2S(element, PCB_TYPE_ELEMENT)); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(DESCRIPTION_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_DESCRIPTION(element))); fputc(' ', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(NAMEONPCB_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_REFDES(element))); fputc(' ', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(VALUE_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_VALUE(element))); pcb_fprintf(FP, " %mm %mm %mm %mm %d %d %s]\n(\n", element->MarkX, element->MarkY, - DESCRIPTION_TEXT(element).X - element->MarkX, - DESCRIPTION_TEXT(element).Y - element->MarkY, - DESCRIPTION_TEXT(element).Direction, - DESCRIPTION_TEXT(element).Scale, F2S(&(DESCRIPTION_TEXT(element)), PCB_TYPE_ELEMENT_NAME)); + PCB_ELEM_TEXT_DESCRIPTION(element).X - element->MarkX, + PCB_ELEM_TEXT_DESCRIPTION(element).Y - element->MarkY, + PCB_ELEM_TEXT_DESCRIPTION(element).Direction, + PCB_ELEM_TEXT_DESCRIPTION(element).Scale, F2S(&(PCB_ELEM_TEXT_DESCRIPTION(element)), PCB_TYPE_ELEMENT_NAME)); */ Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 5062) +++ trunk/src_plugins/io_lihata/read.c (revision 5063) @@ -504,9 +504,9 @@ else if (el != NULL) { if (role == NULL) return -1; - if (strcmp(role->data.text.value, "desc") == 0) text = &DESCRIPTION_TEXT(el); - else if (strcmp(role->data.text.value, "name") == 0) text = &NAMEONPCB_TEXT(el); - else if (strcmp(role->data.text.value, "value") == 0) text = &VALUE_TEXT(el); + if (strcmp(role->data.text.value, "desc") == 0) text = &PCB_ELEM_TEXT_DESCRIPTION(el); + else if (strcmp(role->data.text.value, "name") == 0) text = &PCB_ELEM_TEXT_REFDES(el); + else if (strcmp(role->data.text.value, "value") == 0) text = &PCB_ELEM_TEXT_VALUE(el); else return -1; } Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 5062) +++ trunk/src_plugins/io_pcb/file.c (revision 5063) @@ -385,17 +385,17 @@ * both names of an element */ fprintf(FP, "\nElement[%s ", F2S(element, PCB_TYPE_ELEMENT)); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(DESCRIPTION_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_DESCRIPTION(element))); fputc(' ', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(NAMEONPCB_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_REFDES(element))); fputc(' ', FP); - pcb_print_quoted_string(FP, (char *) PCB_EMPTY(VALUE_NAME(element))); + pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB_ELEM_NAME_VALUE(element))); pcb_fprintf(FP, " %[0] %[0] %[0] %[0] %d %d %s]\n(\n", element->MarkX, element->MarkY, - DESCRIPTION_TEXT(element).X - element->MarkX, - DESCRIPTION_TEXT(element).Y - element->MarkY, - DESCRIPTION_TEXT(element).Direction, - DESCRIPTION_TEXT(element).Scale, F2S(&(DESCRIPTION_TEXT(element)), PCB_TYPE_ELEMENT_NAME)); + PCB_ELEM_TEXT_DESCRIPTION(element).X - element->MarkX, + PCB_ELEM_TEXT_DESCRIPTION(element).Y - element->MarkY, + PCB_ELEM_TEXT_DESCRIPTION(element).Direction, + PCB_ELEM_TEXT_DESCRIPTION(element).Scale, F2S(&(PCB_ELEM_TEXT_DESCRIPTION(element)), PCB_TYPE_ELEMENT_NAME)); WriteAttributeList(FP, &element->Attributes, "\t"); pinlist_foreach(&element->Pin, &it, pin) { pcb_fprintf(FP, "\tPin[%[0] %[0] %[0] %[0] %[0] %[0] ", Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 5062) +++ trunk/src_plugins/renumber/renumber.c (revision 5063) @@ -151,7 +151,7 @@ */ pcb_fprintf(out, "*WARN* Element \"%s\" at %$md is locked and will not be renumbered.\n", - PCB_UNKNOWN(NAMEONPCB_NAME(element)), element->MarkX, element->MarkY); + PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), element->MarkX, element->MarkY); locked_element_list[lock_cnt] = element; lock_cnt++; } @@ -199,9 +199,9 @@ cnt_list = (struct _cnt_list *) calloc(cnt_list_sz, sizeof(struct _cnt_list)); for (i = 0; i < cnt; i++) { /* If there is no refdes, maybe just spit out a warning */ - if (NAMEONPCB_NAME(element_list[i])) { + if (PCB_ELEM_NAME_REFDES(element_list[i])) { /* figure out the prefix */ - tmps = pcb_strdup(NAMEONPCB_NAME(element_list[i])); + tmps = pcb_strdup(PCB_ELEM_NAME_REFDES(element_list[i])); j = 0; while (tmps[j] && (tmps[j] < '0' || tmps[j] > '9') && tmps[j] != '?') @@ -262,7 +262,7 @@ * elements) names */ for (k = 0; k < lock_cnt; k++) { - if (strcmp(PCB_UNKNOWN(NAMEONPCB_NAME(locked_element_list[k])), tmps) == 0) { + if (strcmp(PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(locked_element_list[k])), tmps) == 0) { ok = 0; break; } @@ -271,15 +271,15 @@ } while (!ok); - if (strcmp(tmps, NAMEONPCB_NAME(element_list[i])) != 0) { - fprintf(out, "*RENAME* \"%s\" \"%s\"\n", NAMEONPCB_NAME(element_list[i]), tmps); + if (strcmp(tmps, PCB_ELEM_NAME_REFDES(element_list[i])) != 0) { + fprintf(out, "*RENAME* \"%s\" \"%s\"\n", PCB_ELEM_NAME_REFDES(element_list[i]), tmps); /* add this rename to our table of renames so we can update the netlist */ - was[c_cnt] = pcb_strdup(NAMEONPCB_NAME(element_list[i])); + was[c_cnt] = pcb_strdup(PCB_ELEM_NAME_REFDES(element_list[i])); is[c_cnt] = pcb_strdup(tmps); c_cnt++; - pcb_undo_add_obj_to_change_name(PCB_TYPE_ELEMENT, NULL, NULL, element_list[i], NAMEONPCB_NAME(element_list[i])); + pcb_undo_add_obj_to_change_name(PCB_TYPE_ELEMENT, NULL, NULL, element_list[i], PCB_ELEM_NAME_REFDES(element_list[i])); pcb_chg_obj_name(PCB_TYPE_ELEMENT, element_list[i], NULL, NULL, tmps); changed = pcb_true; Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 5062) +++ trunk/src_plugins/renumber/renumberblock.c (revision 5063) @@ -70,7 +70,7 @@ memcpy(new_ref, old_ref, refdes_split - old_ref); strcpy(new_ref + (refdes_split - old_ref), num_buf); - pcb_undo_add_obj_to_change_name(PCB_TYPE_ELEMENT, NULL, NULL, element, NAMEONPCB_NAME(element)); + pcb_undo_add_obj_to_change_name(PCB_TYPE_ELEMENT, NULL, NULL, element, PCB_ELEM_NAME_REFDES(element)); pcb_chg_obj_name(PCB_TYPE_ELEMENT, element, NULL, NULL, new_ref); } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 5062) +++ trunk/src_plugins/report/report.c (revision 5063) @@ -484,13 +484,13 @@ PCB_PIN_LOOP(element); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pin)) - pcb_append_printf(&list, "%s-%s,%c", NAMEONPCB_NAME(element), pin->Number, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' '); + pcb_append_printf(&list, "%s-%s,%c", PCB_ELEM_NAME_REFDES(element), pin->Number, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' '); } PCB_END_LOOP; PCB_PAD_LOOP(element); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pad)) - pcb_append_printf(&list, "%s-%s,%c", NAMEONPCB_NAME(element), pad->Number, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' '); + pcb_append_printf(&list, "%s-%s,%c", PCB_ELEM_NAME_REFDES(element), pad->Number, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' '); } PCB_END_LOOP; } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 5062) +++ trunk/src_plugins/teardrops/teardrops.c (revision 5063) @@ -212,7 +212,7 @@ fprintf(stderr, "Pin %s (%s) at %.6f, %.6f (element %s, %s, %s)\n", PCB_EMPTY(pin->Number), PCB_EMPTY(pin->Name), /* 0.01 * pin->X, 0.01 * pin->Y, */ PCB_COORD_TO_MM(pin->X), PCB_COORD_TO_MM(pin->Y), - PCB_EMPTY(NAMEONPCB_NAME(element)), PCB_EMPTY(VALUE_NAME(element)), PCB_EMPTY(DESCRIPTION_NAME(element))); + PCB_EMPTY(PCB_ELEM_NAME_REFDES(element)), PCB_EMPTY(PCB_ELEM_NAME_VALUE(element)), PCB_EMPTY(PCB_ELEM_NAME_DESCRIPTION(element))); for (layer = 0; layer < pcb_max_copper_layer; layer++) { pcb_layer_t *l = &(PCB->Data->Layer[layer]); @@ -259,7 +259,7 @@ PCB_EMPTY(pad->Number), PCB_EMPTY(pad->Name), PCB_COORD_TO_MM((pad->BoundingBox.X1 + pad->BoundingBox.X2) / 2), PCB_COORD_TO_MM((pad->BoundingBox.Y1 + pad->BoundingBox.Y2) / 2), - PCB_EMPTY(NAMEONPCB_NAME(element)), PCB_EMPTY(VALUE_NAME(element)), PCB_EMPTY(DESCRIPTION_NAME(element))); + PCB_EMPTY(PCB_ELEM_NAME_REFDES(element)), PCB_EMPTY(PCB_ELEM_NAME_VALUE(element)), PCB_EMPTY(PCB_ELEM_NAME_DESCRIPTION(element))); /* fprintf(stderr, */ /* "Pad %s (%s) at ((%.6f, %.6f), (%.6f, %.6f)) (element %s, %s, %s) \n", */ @@ -268,9 +268,9 @@ /* PCB_COORD_TO_MM(pad->BoundingBox.Y1), */ /* PCB_COORD_TO_MM(pad->BoundingBox.X2), */ /* PCB_COORD_TO_MM(pad->BoundingBox.Y2), */ - /* PCB_EMPTY(NAMEONPCB_NAME (element)), */ - /* PCB_EMPTY(VALUE_NAME (element)), */ - /* PCB_EMPTY(DESCRIPTION_NAME (element))); */ + /* PCB_EMPTY(PCB_ELEM_NAME_REFDES(element)), */ + /* PCB_EMPTY(PCB_ELEM_NAME_VALUE(element)), */ + /* PCB_EMPTY(PCB_ELEM_NAME_DESCRIPTION(element))); */ for (layer = 0; layer < pcb_max_copper_layer; layer++) { pcb_layer_t *l = &(PCB->Data->Layer[layer]); Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 5062) +++ trunk/src_plugins/vendordrill/vendor.c (revision 5063) @@ -361,7 +361,7 @@ "\t- new size would be too large or too small\n"), PCB_UNKNOWN(pin->Number), PCB_UNKNOWN(pin->Name), 0.01 * pin->X, 0.01 * pin->Y, - PCB_UNKNOWN(NAMEONPCB_NAME(element)), PCB_UNKNOWN(VALUE_NAME(element)), PCB_UNKNOWN(DESCRIPTION_NAME(element))); + PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element)), PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element))); } } else { @@ -577,17 +577,17 @@ noskip = 1; for (i = 0; i < n_refdes; i++) { - if ((PCB_NSTRCMP(PCB_UNKNOWN(NAMEONPCB_NAME(element)), ignore_refdes[i]) == 0) - || rematch(ignore_refdes[i], PCB_UNKNOWN(NAMEONPCB_NAME(element)))) { - pcb_message(PCB_MSG_DEFAULT, _("Vendor mapping skipped because refdes = %s matches %s\n"), PCB_UNKNOWN(NAMEONPCB_NAME(element)), ignore_refdes[i]); + if ((PCB_NSTRCMP(PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), ignore_refdes[i]) == 0) + || rematch(ignore_refdes[i], PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)))) { + pcb_message(PCB_MSG_DEFAULT, _("Vendor mapping skipped because refdes = %s matches %s\n"), PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), ignore_refdes[i]); noskip = 0; } } if (noskip) for (i = 0; i < n_value; i++) { - if ((PCB_NSTRCMP(PCB_UNKNOWN(VALUE_NAME(element)), ignore_value[i]) == 0) - || rematch(ignore_value[i], PCB_UNKNOWN(VALUE_NAME(element)))) { - pcb_message(PCB_MSG_DEFAULT, _("Vendor mapping skipped because value = %s matches %s\n"), PCB_UNKNOWN(VALUE_NAME(element)), ignore_value[i]); + if ((PCB_NSTRCMP(PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element)), ignore_value[i]) == 0) + || rematch(ignore_value[i], PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element)))) { + pcb_message(PCB_MSG_DEFAULT, _("Vendor mapping skipped because value = %s matches %s\n"), PCB_UNKNOWN(PCB_ELEM_NAME_VALUE(element)), ignore_value[i]); noskip = 0; } } @@ -594,18 +594,18 @@ if (noskip) for (i = 0; i < n_descr; i++) { - if ((PCB_NSTRCMP(PCB_UNKNOWN(DESCRIPTION_NAME(element)), ignore_descr[i]) + if ((PCB_NSTRCMP(PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)), ignore_descr[i]) == 0) - || rematch(ignore_descr[i], PCB_UNKNOWN(DESCRIPTION_NAME(element)))) { + || rematch(ignore_descr[i], PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)))) { pcb_message(PCB_MSG_DEFAULT, _ ("Vendor mapping skipped because descr = %s matches %s\n"), - PCB_UNKNOWN(DESCRIPTION_NAME(element)), ignore_descr[i]); + PCB_UNKNOWN(PCB_ELEM_NAME_DESCRIPTION(element)), ignore_descr[i]); noskip = 0; } } if (noskip && PCB_FLAG_TEST(PCB_FLAG_LOCK, element)) { - pcb_message(PCB_MSG_DEFAULT, _("Vendor mapping skipped because element %s is locked\n"), PCB_UNKNOWN(NAMEONPCB_NAME(element))); + pcb_message(PCB_MSG_DEFAULT, _("Vendor mapping skipped because element %s is locked\n"), PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element))); noskip = 0; }