Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 15519) +++ trunk/src/change.c (revision 15520) @@ -50,13 +50,13 @@ pcb_lineop_change_size, pcb_textop_change_size, pcb_polyop_change_clear, - pcb_viaop_change_size, - pcb_elemop_change_size, /* changes silk screen line width */ - pcb_elemop_change_name_size, - pcb_pinop_change_size, - pcb_padop_change_size, NULL, NULL, + NULL, + NULL, + NULL, + NULL, + NULL, pcb_arcop_change_size, NULL, NULL, @@ -68,13 +68,13 @@ pcb_lineop_change_size, pcb_textop_change_size, pcb_polyop_change_clear, - pcb_viaop_change_size, - pcb_elemop_change_1st_size, - pcb_elemop_change_name_size, - pcb_pinop_change_size, - pcb_padop_change_size, NULL, NULL, + NULL, + NULL, + NULL, + NULL, + NULL, pcb_arcop_change_size, NULL, NULL, @@ -86,10 +86,7 @@ NULL, NULL, NULL, - pcb_viaop_change_2nd_size, - pcb_elemop_change_2nd_size, NULL, - pcb_pinop_change_2nd_size, NULL, NULL, NULL, @@ -96,6 +93,9 @@ NULL, NULL, NULL, + NULL, + NULL, + NULL, pcb_subcop_change_2nd_size, pcb_pstkop_change_2nd_size }; @@ -104,10 +104,8 @@ NULL, NULL, NULL, - pcb_viaop_change_thermal, NULL, NULL, - pcb_pinop_change_thermal, NULL, NULL, NULL, @@ -114,6 +112,8 @@ NULL, NULL, NULL, + NULL, + NULL, NULL, /* subc */ pcb_pstkop_change_thermal }; @@ -122,13 +122,13 @@ pcb_lineop_change_clear_size, NULL, pcb_polyop_change_clear_size, /* just to tell the user not to :-) */ - pcb_viaop_change_clear_size, - pcb_elemop_change_clear_size, NULL, - pcb_pinop_change_clear_size, - pcb_padop_change_clear_size, NULL, NULL, + NULL, + NULL, + NULL, + NULL, pcb_arcop_change_clear_size, NULL, NULL, @@ -140,16 +140,16 @@ pcb_lineop_change_name, pcb_textop_change_name, NULL, - pcb_viaop_change_name, - pcb_elemop_change_name, NULL, - pcb_pinop_change_name, - pcb_padop_change_name, NULL, NULL, NULL, NULL, NULL, + NULL, + NULL, + NULL, + NULL, pcb_subcop_change_name, NULL /* padstack */ }; @@ -176,16 +176,16 @@ NULL, NULL, NULL, - pcb_viaop_change_square, - pcb_elemop_change_square, NULL, - pcb_pinop_change_square, - pcb_padop_change_square, NULL, NULL, NULL, NULL, NULL, + NULL, + NULL, + NULL, + NULL, pcb_subcop_change_square, NULL /* padstack */ }; @@ -230,10 +230,7 @@ NULL, NULL, NULL, - pcb_viaop_change_octagon, - pcb_elemop_change_octagon, NULL, - pcb_pinop_change_octagon, NULL, NULL, NULL, @@ -240,28 +237,28 @@ NULL, NULL, NULL, + NULL, + NULL, + NULL, pcb_subcop_change_octagon, NULL /* padstack */ }; +#warning padstack TODO: remove this code static pcb_opfunc_t ChangeMaskSizeFunctions = { NULL, NULL, NULL, - pcb_viaop_change_mask_size, -#if 0 - ChangeElementMaskSize, -#else NULL, -#endif NULL, - pcb_pinop_change_mask_size, - pcb_padop_change_mask_size, NULL, NULL, NULL, NULL, NULL, + NULL, + NULL, + NULL, NULL, /* subc */ NULL /* padstack */ }; @@ -271,15 +268,15 @@ NULL, NULL, NULL, - pcb_elemop_set_square, NULL, - pcb_pinop_set_square, - pcb_padop_set_square, NULL, NULL, NULL, NULL, NULL, + NULL, + NULL, + NULL, pcb_subcop_set_square, NULL /* padstack */ }; @@ -306,10 +303,7 @@ NULL, NULL, NULL, - pcb_viaop_set_octagon, - pcb_elemop_set_octagon, NULL, - pcb_pinop_set_octagon, NULL, NULL, NULL, @@ -316,6 +310,9 @@ NULL, NULL, NULL, + NULL, + NULL, + NULL, pcb_subcop_set_octagon, NULL /* padstack */ }; @@ -325,15 +322,15 @@ NULL, NULL, NULL, - pcb_elemop_clear_square, NULL, - pcb_pinop_clear_square, - pcb_padop_clear_square, NULL, NULL, NULL, NULL, NULL, + NULL, + NULL, + NULL, pcb_subcop_clear_square, NULL /* padstack */ }; @@ -360,10 +357,7 @@ NULL, NULL, NULL, - pcb_viaop_clear_octagon, - pcb_elemop_clear_octagon, NULL, - pcb_pinop_clear_octagon, NULL, NULL, NULL, @@ -370,6 +364,9 @@ NULL, NULL, NULL, + NULL, + NULL, + NULL, pcb_subcop_clear_octagon, /* subc */ NULL /* padstack */ }; @@ -414,13 +411,13 @@ pcb_lineop_change_flag, pcb_textop_change_flag, pcb_polyop_change_flag, - pcb_viaop_change_flag, NULL, NULL, - pcb_pinop_change_flag, - pcb_padop_change_flag, NULL, NULL, + NULL, + NULL, + NULL, pcb_arcop_change_flag, NULL, NULL, @@ -448,8 +445,8 @@ /* ---------------------------------------------------------------------- - * changes the thermals on all selected and visible pins - * and/or vias. Returns pcb_true if anything has changed + * changes the thermals on all selected and visible padstacks. + * Returns pcb_true if anything has changed */ pcb_bool pcb_chg_selected_thermals(int types, int therm_style, unsigned long lid) { @@ -595,7 +592,7 @@ } /* ---------------------------------------------------------------------- - * changes the nonetlist-flag of all selected and visible elements + * changes the nonetlist-flag of all selected and visible subcircuits * returns pcb_true if anything has changed */ pcb_bool pcb_chg_selected_nonetlist(int types) @@ -756,7 +753,7 @@ } /* ---------------------------------------------------------------------- - * changes the octagon-flag of all selected and visible pins and vias + * changes the octagon-flag of all selected and visible padstacks * returns pcb_true if anything has changed */ pcb_bool pcb_chg_selected_octagon(int types) @@ -775,7 +772,7 @@ } /* ---------------------------------------------------------------------- - * sets the octagon-flag of all selected and visible pins and vias + * sets the octagon-flag of all selected and visible padstacks * returns pcb_true if anything has changed */ pcb_bool pcb_set_selected_octagon(int types) @@ -794,7 +791,7 @@ } /* ---------------------------------------------------------------------- - * clears the octagon-flag of all selected and visible pins and vias + * clears the octagon-flag of all selected and visible padstacks * returns pcb_true if anything has changed */ pcb_bool pcb_clr_selected_octagon(int types) @@ -812,6 +809,7 @@ return change; } +#warning padstack TODO: remove this /* ---------------------------------------------------------------------- * changes the hole-flag of all selected and visible vias * returns pcb_true if anything has changed @@ -855,9 +853,9 @@ return change; } - +#warning subc TODO: check if it is true: /* --------------------------------------------------------------------------- - * changes the size of the passed object; element size is silk size + * changes the size of the passed object; subc size is silk size (TODO: check if it is true) * Returns pcb_true if anything is changed */ pcb_bool pcb_chg_obj_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) @@ -878,6 +876,7 @@ return change; } +#warning subc TODO: check if it is true: /* --------------------------------------------------------------------------- * changes the size of the passed object; element size is pin ring sizes * Returns pcb_true if anything is changed @@ -1271,13 +1270,6 @@ pcb_any_obj_t *obj = Ptr2; pcb_subc_t *parent_subc; - /* if passed an element name, make it an element reference instead */ - if (Type == PCB_TYPE_ELEMENT_NAME) { - Type = PCB_TYPE_ELEMENT; - Ptr2 = Ptr1; - Ptr3 = Ptr1; - } - parent_subc = pcb_obj_parent_subc(obj); if (parent_subc != NULL) { name = pcb_gui->prompt_for(_("Enter terminal ID:"), PCB_EMPTY(obj->term)); @@ -1293,34 +1285,10 @@ name = pcb_gui->prompt_for(_("Linename:"), PCB_EMPTY(((pcb_line_t *) Ptr2)->Number)); break; - case PCB_TYPE_VIA: - name = pcb_gui->prompt_for(_("Vianame:"), PCB_EMPTY(((pcb_pin_t *) Ptr2)->Name)); - break; - - case PCB_TYPE_PIN: - if (pinnum) - sprintf(msg, _("%s Pin Number:"), PCB_EMPTY(((pcb_pin_t *) Ptr2)->Number)); - else - sprintf(msg, _("%s Pin Name:"), PCB_EMPTY(((pcb_pin_t *) Ptr2)->Number)); - name = pcb_gui->prompt_for(msg, PCB_EMPTY(((pcb_pin_t *) Ptr2)->Name)); - break; - - case PCB_TYPE_PAD: - if (pinnum) - sprintf(msg, _("%s Pad Number:"), PCB_EMPTY(((pcb_pad_t *) Ptr2)->Number)); - else - sprintf(msg, _("%s Pad Name:"), PCB_EMPTY(((pcb_pad_t *) Ptr2)->Number)); - name = pcb_gui->prompt_for(msg, PCB_EMPTY(((pcb_pad_t *) Ptr2)->Name)); - break; - case PCB_TYPE_TEXT: name = pcb_gui->prompt_for(_("Enter text:"), PCB_EMPTY(((pcb_text_t *) Ptr2)->TextString)); break; - case PCB_TYPE_ELEMENT: - name = pcb_gui->prompt_for(_("Elementname:"), PCB_EMPTY(PCB_ELEM_NAME_VISIBLE(PCB, (pcb_element_t *) Ptr2))); - break; - case PCB_TYPE_SUBC: name = pcb_gui->prompt_for(_("Subcircuit refdes:"), PCB_EMPTY(((pcb_subc_t *)Ptr2)->refdes)); break;