Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 38209) +++ trunk/src/rats_patch.c (revision 38210) @@ -204,8 +204,8 @@ case RATP_DEL_CONN: seek_op = RATP_ADD_CONN; break; - case RATP_CHANGE_ATTRIB: - seek_op = RATP_CHANGE_ATTRIB; + case RATP_CHANGE_COMP_ATTRIB: + seek_op = RATP_CHANGE_COMP_ATTRIB; break; } @@ -213,7 +213,7 @@ for (n = pcb->NetlistPatchLast; n != NULL; n = n->prev) { if ((n->op == seek_op) && (strcmp(n->id, id) == 0)) { switch (op) { - case RATP_CHANGE_ATTRIB: + case RATP_CHANGE_COMP_ATTRIB: if (strcmp(n->arg1.attrib_name, a1) != 0) break; rats_patch_remove(pcb, n, 1); @@ -313,7 +313,7 @@ return rats_patch_apply_conn(pcb, patch, 0); case RATP_DEL_CONN: return rats_patch_apply_conn(pcb, patch, 1); - case RATP_CHANGE_ATTRIB: + case RATP_CHANGE_COMP_ATTRIB: return rats_patch_apply_attrib(pcb, patch); } return 0; @@ -347,7 +347,7 @@ return 1; } break; - case RATP_CHANGE_ATTRIB: + case RATP_CHANGE_COMP_ATTRIB: { pcb_subc_t *subc = pcb_subc_by_refdes(pcb->Data, n->id); if (subc != NULL) { @@ -414,7 +414,7 @@ } } } - case RATP_CHANGE_ATTRIB: + case RATP_CHANGE_COMP_ATTRIB: break; } } @@ -430,7 +430,7 @@ case RATP_DEL_CONN: cb(ctx, PCB_RPE_CONN_DEL, n->arg1.net_name, NULL, n->id); break; - case RATP_CHANGE_ATTRIB: + case RATP_CHANGE_COMP_ATTRIB: cb(ctx, PCB_RPE_COMP_ATTR_CHG, n->id, n->arg1.attrib_name, n->arg2.attrib_val); break; } @@ -737,7 +737,7 @@ placed = pcb_subc_replace(PCB, subc, news, rnd_true, dumb); if (placed != NULL) { if (!dumb) - pcb_ratspatch_append_optimize(PCB, RATP_CHANGE_ATTRIB, placed->refdes, "footprint", fpname); + pcb_ratspatch_append_optimize(PCB, RATP_CHANGE_COMP_ATTRIB, placed->refdes, "footprint", fpname); changed = 1; } } @@ -747,7 +747,7 @@ placed = pcb_subc_replace(PCB, olds, news, rnd_true, dumb); if (placed != NULL) { if (!dumb) - pcb_ratspatch_append_optimize(PCB, RATP_CHANGE_ATTRIB, placed->refdes, "footprint", fpname); + pcb_ratspatch_append_optimize(PCB, RATP_CHANGE_COMP_ATTRIB, placed->refdes, "footprint", fpname); changed = 1; } break; Index: trunk/src/rats_patch.h =================================================================== --- trunk/src/rats_patch.h (revision 38209) +++ trunk/src/rats_patch.h (revision 38210) @@ -35,7 +35,7 @@ typedef enum { RATP_ADD_CONN, RATP_DEL_CONN, - RATP_CHANGE_ATTRIB + RATP_CHANGE_COMP_ATTRIB } pcb_rats_patch_op_t; struct pcb_ratspatch_line_s { Index: trunk/src_plugins/dialogs/dlg_netlist_patch.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist_patch.c (revision 38209) +++ trunk/src_plugins/dialogs/dlg_netlist_patch.c (revision 38210) @@ -71,16 +71,16 @@ rnd_hid_row_t *r; switch(n->op) { - case RATP_ADD_CONN: cell[0] = rnd_strdup("add conn"); break; - case RATP_DEL_CONN: cell[0] = rnd_strdup("del conn"); break; - case RATP_CHANGE_ATTRIB: cell[0] = rnd_strdup("chg attrib"); break; - default: cell[0] = rnd_strdup("unknown"); break; + case RATP_ADD_CONN: cell[0] = rnd_strdup("add conn"); break; + case RATP_DEL_CONN: cell[0] = rnd_strdup("del conn"); break; + case RATP_CHANGE_COMP_ATTRIB: cell[0] = rnd_strdup("chg attrib"); break; + default: cell[0] = rnd_strdup("unknown"); break; } switch(n->op) { case RATP_ADD_CONN: - case RATP_DEL_CONN: cell[1] = rnd_strdup_printf("%s, %s", n->arg1.net_name, n->id); break; - case RATP_CHANGE_ATTRIB: cell[1] = rnd_strdup_printf("%s, %s, %s", n->id, n->arg1.attrib_name, n->arg2.attrib_val); break; - default: cell[1] = rnd_strdup("?"); break; + case RATP_DEL_CONN: cell[1] = rnd_strdup_printf("%s, %s", n->arg1.net_name, n->id); break; + case RATP_CHANGE_COMP_ATTRIB: cell[1] = rnd_strdup_printf("%s, %s, %s", n->id, n->arg1.attrib_name, n->arg2.attrib_val); break; + default: cell[1] = rnd_strdup("?"); break; } r = rnd_dad_tree_append(attr, NULL, cell); r->user_data = n; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 38209) +++ trunk/src_plugins/io_lihata/read.c (revision 38210) @@ -2415,7 +2415,7 @@ nval = lht_dom_hash_get(np, "val"); if ((nval == NULL) || (nval->type != LHT_TEXT)) return iolht_error(nval, "netlist patch attrib value must be a non-empty string (change_attrib)\n"); - pcb_ratspatch_append(pcb, RATP_CHANGE_ATTRIB, nnet->data.text.value, nkey->data.text.value, nval->data.text.value, 0); + pcb_ratspatch_append(pcb, RATP_CHANGE_COMP_ATTRIB, nnet->data.text.value, nkey->data.text.value, nval->data.text.value, 0); } } return 0; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 38209) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 38210) @@ -2966,7 +2966,7 @@ case 201: #line 1360 "parse_y.y" /* yacc.c:1652 */ - { pcb_ratspatch_append(yyPCB, RATP_CHANGE_ATTRIB, (yyvsp[-3].string), (yyvsp[-2].string), (yyvsp[-1].string), 0); free((yyvsp[-3].string)); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } + { pcb_ratspatch_append(yyPCB, RATP_CHANGE_COMP_ATTRIB, (yyvsp[-3].string), (yyvsp[-2].string), (yyvsp[-1].string), 0); free((yyvsp[-3].string)); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } #line 2971 "parse_y.c" /* yacc.c:1652 */ break; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 38209) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 38210) @@ -1357,7 +1357,7 @@ /* name style pin pin ... */ : T_ADD_CONN '(' STRING STRING ')' { pcb_ratspatch_append(yyPCB, RATP_ADD_CONN, $3, $4, NULL, 0); free($3); free($4); } | T_DEL_CONN '(' STRING STRING ')' { pcb_ratspatch_append(yyPCB, RATP_DEL_CONN, $3, $4, NULL, 0); free($3); free($4); } - | T_CHANGE_ATTRIB '(' STRING STRING STRING ')' { pcb_ratspatch_append(yyPCB, RATP_CHANGE_ATTRIB, $3, $4, $5, 0); free($3); free($4); free($5); } + | T_CHANGE_ATTRIB '(' STRING STRING STRING ')' { pcb_ratspatch_append(yyPCB, RATP_CHANGE_COMP_ATTRIB, $3, $4, $5, 0); free($3); free($4); free($5); } ; attribute Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 38209) +++ trunk/src_plugins/propedit/propsel.c (revision 38210) @@ -660,7 +660,7 @@ return; st->set_cnt++; - pcb_ratspatch_append_optimize(st->pcb, RATP_CHANGE_ATTRIB, netname, key, st->s); + pcb_ratspatch_append_optimize(st->pcb, RATP_CHANGE_COMP_ATTRIB, netname, key, st->s); return; } } @@ -1224,7 +1224,7 @@ if ((net == NULL) || (pcb_attribute_get(&net->Attributes, key) == NULL)) return 0; - pcb_ratspatch_append_optimize(ctx->pcb, RATP_CHANGE_ATTRIB, netname, key, NULL); + pcb_ratspatch_append_optimize(ctx->pcb, RATP_CHANGE_COMP_ATTRIB, netname, key, NULL); return 1; }