Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 15627) +++ trunk/src/obj_pad.c (revision 15628) @@ -59,10 +59,8 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return pcb_false; - pcb_pad_invalidate_erase(Pad); pcb_undo_add_obj_to_flag(Pad); PCB_FLAG_TOGGLE(PCB_FLAG_NOPASTE, Pad); - pcb_pad_invalidate_draw(Pad); return pcb_true; } @@ -84,57 +82,3 @@ pcb_hash_coord(p->Mask); } -/*** draw ***/ -static void GatherPadName(pcb_pad_t *Pad) -{ - pcb_box_t box; - pcb_bool vert; - - /* should text be vertical ? */ - vert = (Pad->Point1.X == Pad->Point2.X); - - if (vert) { - box.X1 = Pad->Point1.X - Pad->Thickness / 2; - box.Y1 = MAX(Pad->Point1.Y, Pad->Point2.Y) + Pad->Thickness / 2; - box.X1 += conf_core.appearance.pinout.text_offset_y; - box.Y1 -= conf_core.appearance.pinout.text_offset_x; - box.X2 = box.X1; - box.Y2 = box.Y1; - } - else { - box.X1 = MIN(Pad->Point1.X, Pad->Point2.X) - Pad->Thickness / 2; - box.Y1 = Pad->Point1.Y - Pad->Thickness / 2; - box.X1 += conf_core.appearance.pinout.text_offset_x; - box.Y1 += conf_core.appearance.pinout.text_offset_y; - box.X2 = box.X1; - box.Y2 = box.Y1; - } - - pcb_draw_invalidate(&box); - return; -} - -void pcb_pad_invalidate_erase(pcb_pad_t *Pad) -{ - pcb_draw_invalidate(Pad); - if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pad)) - pcb_pad_name_invalidate_erase(Pad); - pcb_flag_erase(&Pad->Flags); -} - -void pcb_pad_name_invalidate_erase(pcb_pad_t *Pad) -{ - GatherPadName(Pad); -} - -void pcb_pad_invalidate_draw(pcb_pad_t *Pad) -{ - pcb_draw_invalidate(Pad); - if (pcb_draw_doing_pinout || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pad)) - pcb_pad_name_invalidate_draw(Pad); -} - -void pcb_pad_name_invalidate_draw(pcb_pad_t *Pad) -{ - GatherPadName(Pad); -} Index: trunk/src/obj_pad_draw.h =================================================================== --- trunk/src/obj_pad_draw.h (revision 15627) +++ trunk/src/obj_pad_draw.h (revision 15628) @@ -1,36 +0,0 @@ -/* - * COPYRIGHT - * - * pcb-rnd, interactive printed circuit board design - * (this file is based on PCB, interactive printed circuit board design) - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Contact: - * Project page: http://repo.hu/projects/pcb-rnd - * lead developer: email to pcb-rnd (at) igor2.repo.hu - * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") - * - */ - -/*** Standard draw on pads ***/ - - -/* Include rtree.h for these */ -void pcb_pad_invalidate_erase(pcb_pad_t *Pad); -void pcb_pad_name_invalidate_erase(pcb_pad_t *Pad); -void pcb_pad_invalidate_draw(pcb_pad_t *Pad); -void pcb_pad_name_invalidate_draw(pcb_pad_t *Pad); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 15627) +++ trunk/src/select.c (revision 15628) @@ -481,6 +481,7 @@ } PCB_ENDALL_LOOP; #warning padstack TODO: rewrite this to pstk +#if 0 if (pcb->PinOn && pcb_silk_on(pcb)) { PCB_PIN_ALL_LOOP(pcb->Data); { @@ -503,7 +504,6 @@ } PCB_ENDALL_LOOP; } - if (pcb->ViaOn) PCB_VIA_LOOP(pcb->Data); { @@ -515,6 +515,7 @@ } } PCB_END_LOOP; +#endif return changed; } @@ -650,6 +651,7 @@ PCB_END_LOOP; #warning padstack TODO: rewrite +#if 0 if (pcb->PinOn && (Type & PCB_TYPE_PIN)) PCB_PIN_ALL_LOOP(pcb->Data); { @@ -689,6 +691,7 @@ } } PCB_END_LOOP; +#endif if (Type & PCB_TYPE_NET) { pcb_conn_lookup_init(); changed = pcb_reset_conns(pcb_true) || changed; Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 15627) +++ trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 15628) @@ -107,6 +107,7 @@ int change = 0; #warning subc TODO: use data.h for this +#if 0 PCB_VIA_LOOP(PCB->Data); { if (PCB_FLAG_TEST(flag, via)) { @@ -141,6 +142,7 @@ PCB_END_LOOP; } PCB_END_LOOP; +#endif PCB_RAT_LOOP(PCB->Data); { if (PCB_FLAG_TEST(flag, line)) {